From 98a06a5c72641d0881864fca9df73a5dac9349dc Mon Sep 17 00:00:00 2001 From: "mport2004@gmail.com" Date: Wed, 3 Aug 2011 11:58:39 +0000 Subject: [PATCH] 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/game/gamemodes/gameticker.dm | 2 +- code/modules/chemical/Chemistry-Tools.dm | 2 +- code/modules/mob/living/silicon/robot/robot.dm | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 6204fff5124..78c0d18f5de 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -51,7 +51,7 @@ var/global/datum/controller/gameticker/ticker if (!src.mode.can_start()) del(mode) current_state = GAME_STATE_PREGAME - world << "Unable to start [master_mode]. Not enough players. Reverting to pre-game lobby." + world << "Unable to start [master_mode]. Not enough players, [master_mode.required_players] players needed. Reverting to pre-game lobby." ResetOccupations() return 0 diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index cd41f1849be..25e9828ab61 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/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() diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 03ed68eba2d..64622183639 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/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