From 29609457f57a8cefd244da5b36e43181399ed002 Mon Sep 17 00:00:00 2001 From: phil235 Date: Thu, 12 Mar 2015 23:15:54 +0100 Subject: [PATCH] Makes the message when you're attacked slightly bigger for better visibility." Changes two "for... show_message()" into "visible_message()". --- code/controllers/master_controller.dm | 4 +- code/controllers/subsystem/jobs.dm | 2 +- code/controllers/subsystems.dm | 2 +- code/datums/mind.dm | 26 +++++------ code/datums/mutations.dm | 2 +- code/game/gamemodes/changeling/changeling.dm | 6 +-- code/game/gamemodes/cult/cult.dm | 2 +- code/game/gamemodes/cult/ritual.dm | 9 ++-- code/game/gamemodes/cult/runes.dm | 4 +- code/game/gamemodes/game_mode.dm | 8 ++-- .../game/gamemodes/malfunction/malfunction.dm | 2 +- code/game/gamemodes/monkey/monkey.dm | 4 +- code/game/gamemodes/revolution/revolution.dm | 2 +- code/game/gamemodes/sandbox/h_sandbox.dm | 2 +- code/game/gamemodes/wizard/artefact.dm | 2 +- code/game/gamemodes/wizard/wizard.dm | 6 +-- code/game/machinery/atmoalter/canister.dm | 4 +- code/game/machinery/bots/bots.dm | 2 +- code/game/machinery/bots/cleanbot.dm | 2 +- code/game/machinery/bots/ed209bot.dm | 2 +- code/game/machinery/bots/floorbot.dm | 2 +- code/game/machinery/bots/medbot.dm | 2 +- code/game/machinery/bots/mulebot.dm | 2 +- code/game/machinery/bots/secbot.dm | 2 +- code/game/machinery/computer/ai_core.dm | 12 ++--- .../game/machinery/computer/communications.dm | 4 +- code/game/machinery/computer/crew.dm | 2 +- code/game/machinery/computer/robot.dm | 2 +- code/game/machinery/computer/security.dm | 2 +- code/game/machinery/newscaster.dm | 2 +- code/game/machinery/shieldgen.dm | 2 +- code/game/machinery/turrets.dm | 2 +- .../mecha/equipment/tools/medical_tools.dm | 2 +- code/game/objects/items/devices/scanners.dm | 4 +- .../items/weapons/implants/implantchair.dm | 4 +- code/modules/admin/admin.dm | 4 +- code/modules/admin/admin_verbs.dm | 2 +- code/modules/admin/topic.dm | 24 +++++----- code/modules/admin/verbs/randomverbs.dm | 2 +- code/modules/assembly/mousetrap.dm | 2 +- code/modules/awaymissions/zlevel.dm | 8 ++-- code/modules/events/holiday/xmas.dm | 2 +- code/modules/events/ninja.dm | 46 +++++++++---------- code/modules/hydroponics/growninedible.dm | 2 +- .../living/carbon/alien/special/facehugger.dm | 8 ++-- code/modules/mob/living/carbon/brain/death.dm | 4 +- .../modules/mob/living/silicon/robot/robot.dm | 4 +- .../living/simple_animal/hostile/hivebot.dm | 2 +- .../living/simple_animal/hostile/syndicate.dm | 2 +- code/modules/paperwork/photocopier.dm | 2 +- code/modules/paperwork/photography.dm | 2 +- .../reagents/Chemistry-Goon-Pyrotechnics.dm | 2 +- .../Chemistry-Reagents/Chemistry-Reagents.dm | 2 +- html/changelogs/phil235-BigUserdanger.yml | 6 +++ interface/stylesheet.dm | 3 +- 55 files changed, 137 insertions(+), 131 deletions(-) create mode 100644 html/changelogs/phil235-BigUserdanger.yml diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm index 7bee21bbb03..46379e1ed8b 100644 --- a/code/controllers/master_controller.dm +++ b/code/controllers/master_controller.dm @@ -37,7 +37,7 @@ Note: you can set the datum's defined processing_interval to some integer to set processing_interval = GCD /datum/controller/game_controller/proc/setup() - world << "Initializing Subsystems..." + world << "Initializing Subsystems..." //sort subsystems by priority, so they initialize in the correct order sortTim(subsystems, /proc/cmp_subsystem_priority) @@ -52,7 +52,7 @@ Note: you can set the datum's defined processing_interval to some integer to set S.Initialize(world.timeofday) sleep(-1) - world << "Initializations complete" + world << "Initializations complete" world.log << "Initializations complete" world.sleep_offline = 1 diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm index 1d663b946ca..a6ecefc1f02 100644 --- a/code/controllers/subsystem/jobs.dm +++ b/code/controllers/subsystem/jobs.dm @@ -23,7 +23,7 @@ var/datum/subsystem/job/SSjob occupations = list() var/list/all_jobs = typesof(/datum/job) if(!all_jobs.len) - world << "Error setting up jobs, no job datums found" + world << "Error setting up jobs, no job datums found" return 0 for(var/J in all_jobs) diff --git a/code/controllers/subsystems.dm b/code/controllers/subsystems.dm index 3c9a3c4e0bb..47eaadb43e5 100644 --- a/code/controllers/subsystems.dm +++ b/code/controllers/subsystems.dm @@ -28,7 +28,7 @@ /datum/subsystem/proc/Initialize(start_timeofday) var/time = (world.timeofday - start_timeofday) / 10 var/msg = "Initialized [name] SubSystem within [time] seconds" - world << "[msg]" + world << "[msg]" world.log << msg //hook for printing stats to the "MC" statuspanel for admins to see performance and related stats etc. diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 9f8acdd9c52..75aad149dbb 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -724,14 +724,14 @@ switch(href_list["revolution"]) if("clear") remove_rev() - current << "You have been brainwashed! You are no longer a revolutionary!" + current << "You have been brainwashed! You are no longer a revolutionary!" message_admins("[key_name_admin(usr)] has de-rev'ed [current].") log_admin("[key_name(usr)] has de-rev'ed [current].") if("rev") if(src in ticker.mode.head_revolutionaries) ticker.mode.head_revolutionaries -= src ticker.mode.update_rev_icons_removed(src) - current << "Revolution has been disappointed of your leader traits! You are a regular revolutionary now!" + current << "Revolution has been disappointed of your leader traits! You are a regular revolutionary now!" else if(!(src in ticker.mode.revolutionaries)) current << " You are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill the heads to win the revolution!" else @@ -746,9 +746,9 @@ if(src in ticker.mode.revolutionaries) ticker.mode.revolutionaries -= src ticker.mode.update_rev_icons_removed(src) - current << "You have proved your devotion to revoltion! Yea are a head revolutionary now!" + current << "You have proved your devotion to revoltion! Yea are a head revolutionary now!" else if(!(src in ticker.mode.head_revolutionaries)) - current << "You are a member of the revolutionaries' leadership now!" + current << "You are a member of the revolutionaries' leadership now!" else return if (ticker.mode.head_revolutionaries.len>0) @@ -874,7 +874,7 @@ switch(href_list["cult"]) if("clear") remove_cultist() - current << "You have been brainwashed! You are no longer a cultist!" + current << "You have been brainwashed! You are no longer a cultist!" message_admins("[key_name_admin(usr)] has de-cult'ed [current].") log_admin("[key_name(usr)] has de-cult'ed [current].") if("cultist") @@ -908,14 +908,14 @@ switch(href_list["wizard"]) if("clear") remove_wizard() - current << "You have been brainwashed! You are no longer a wizard!" + current << "You have been brainwashed! You are no longer a wizard!" log_admin("[key_name(usr)] has de-wizard'ed [current].") if("wizard") if(!(src in ticker.mode.wizards)) ticker.mode.wizards += src special_role = "Wizard" //ticker.mode.learn_basic_spells(current) - current << "You are the Space Wizard!" + current << "You are the Space Wizard!" message_admins("[key_name_admin(usr)] has wizard'ed [current].") log_admin("[key_name(usr)] has wizard'ed [current].") if("lair") @@ -932,7 +932,7 @@ switch(href_list["changeling"]) if("clear") remove_changeling() - current << "You grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!" + current << "You grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!" message_admins("[key_name_admin(usr)] has de-changeling'ed [current].") log_admin("[key_name(usr)] has de-changeling'ed [current].") if("changeling") @@ -940,7 +940,7 @@ ticker.mode.changelings += src current.make_changeling() special_role = "Changeling" - current << "Your powers are awoken. A flash of memory returns to us...we are [changeling.changelingID], a changeling!" + current << "Your powers are awoken. A flash of memory returns to us...we are [changeling.changelingID], a changeling!" message_admins("[key_name_admin(usr)] has changeling'ed [current].") log_admin("[key_name(usr)] has changeling'ed [current].") if("autoobjectives") @@ -961,7 +961,7 @@ switch(href_list["nuclear"]) if("clear") remove_nukeop() - current << "You have been brainwashed! You are no longer a syndicate operative!" + current << "You have been brainwashed! You are no longer a syndicate operative!" message_admins("[key_name_admin(usr)] has de-nuke op'ed [current].") log_admin("[key_name(usr)] has de-nuke op'ed [current].") if("nuclear") @@ -1011,7 +1011,7 @@ switch(href_list["traitor"]) if("clear") remove_traitor() - current << "You have been brainwashed! You are no longer a traitor!" + current << "You have been brainwashed! You are no longer a traitor!" message_admins("[key_name_admin(usr)] has de-traitor'ed [current].") log_admin("[key_name(usr)] has de-traitor'ed [current].") @@ -1019,7 +1019,7 @@ if(!(src in ticker.mode.traitors)) ticker.mode.traitors += src special_role = "traitor" - current << "You are a traitor!" + current << "You are a traitor!" message_admins("[key_name_admin(usr)] has traitor'ed [current].") log_admin("[key_name(usr)] has traitor'ed [current].") if(isAI(current)) @@ -1083,7 +1083,7 @@ switch(href_list["silicon"]) if("unmalf") remove_malf() - current << "You have been patched! You are no longer malfunctioning!" + current << "You have been patched! You are no longer malfunctioning!" message_admins("[key_name_admin(usr)] has de-malf'ed [current].") log_admin("[key_name(usr)] has de-malf'ed [current].") diff --git a/code/datums/mutations.dm b/code/datums/mutations.dm index 566adcedc03..02a02b97a69 100644 --- a/code/datums/mutations.dm +++ b/code/datums/mutations.dm @@ -204,7 +204,7 @@ /datum/mutation/human/epilepsy/on_life(mob/living/carbon/human/owner) if ((prob(1) && owner.paralysis < 1)) - owner.visible_message("[owner] starts having a seizure!", "You have a seizure!") + owner.visible_message("[owner] starts having a seizure!", "You have a seizure!") owner.Paralyse(10) owner.Jitter(1000) diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 9e53d64cfc3..17e34ff67e9 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -154,8 +154,8 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" /datum/game_mode/proc/greet_changeling(var/datum/mind/changeling, var/you_are=1) if (you_are) - changeling.current << "You are [changeling.changeling.changelingID], a changeling! You have absorbed and taken the form of a human." - changeling.current << "Use say \":g message\" to communicate with your fellow changelings." + changeling.current << "You are [changeling.changeling.changelingID], a changeling! You have absorbed and taken the form of a human." + changeling.current << "Use say \":g message\" to communicate with your fellow changelings." changeling.current << "You must complete the following tasks:" if (changeling.current.mind) @@ -222,7 +222,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" text += "
The changeling was successful!" feedback_add_details("changeling_success","SUCCESS") else - text += "
The changeling has failed." + text += "
The changeling has failed." feedback_add_details("changeling_success","FAIL") text += "
" diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index b4abfb1c20d..0f71d2ee0aa 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -233,7 +233,7 @@ if(cult_mind in cult) cult -= cult_mind cult_mind.current.verbs -= /mob/living/proc/cult_innate_comm - cult_mind.current << "An unfamiliar white light flashes through your mind, cleansing the taint of the dark-one and the memories of your time as his servant with it." + cult_mind.current << "An unfamiliar white light flashes through your mind, cleansing the taint of the dark-one and the memories of your time as his servant with it." cult_mind.memory = "" cult_mind.cult_words = initial(cult_mind.cult_words) update_cult_icons_removed(cult_mind) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index c7753e7642a..32ae9b5a7e0 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -63,7 +63,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", usr.say("[input]") for(var/mob/M in mob_list) if((M.mind && (M.mind in ticker.mode.cult)) || (M in dead_mob_list)) - M << "[input]" + M << "[input]" return @@ -517,9 +517,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", M.reagents.add_reagent("unholywater",holy2unholy) return M.take_organ_damage(0,rand(5,20)) //really lucky - 5 hits for a crit - for(var/mob/O in viewers(M, null)) - O.show_message(text("[] beats [] with the arcane tome!", user, M), 1) - M << "You feel searing heat inside!" + M.visible_message("[user] beats [M] with the arcane tome!", \ + "You feel searing heat inside!") /obj/item/weapon/tome/attack_self(mob/living/user as mob) @@ -549,7 +548,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", usr.whisper("[input]") for(var/datum/mind/H in ticker.mode.cult) if (H.current) - H.current << "[input]" + H.current << "[input]" return if("Notes") if(usr.get_active_hand() != src) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 39df1504e1e..a50dc6945b6 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -135,11 +135,11 @@ var/list/sacrificed = list() return 1 */ else M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." - M << "And not a single fuck was given, exterminate the cult at all costs." + M << "And not a single fuck was given, exterminate the cult at all costs." if(ticker.mode.name == "cult") if(M.mind == ticker.mode.sacrifice_target) for(var/mob/living/carbon/human/cultist in cultsinrange) - cultist << "The Chosen One!!
KILL THE CHOSEN ONE!!! " + cultist << "The Chosen One!!
KILL THE CHOSEN ONE!!! " return 0 else for(var/mob/living/carbon/human/cultist in cultsinrange) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 795beb6fdf2..6955fed1244 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -352,7 +352,7 @@ proc/display_roundstart_logout_report() continue //AFK client if(L.stat) if(L.suiciding) //Suicider - msg += "[L.name] ([L.ckey]), the [L.job] (Suicide)\n" + msg += "[L.name] ([L.ckey]), the [L.job] (Suicide)\n" continue //Disconnected client if(L.stat == UNCONSCIOUS) msg += "[L.name] ([L.ckey]), the [L.job] (Dying)\n" @@ -366,17 +366,17 @@ proc/display_roundstart_logout_report() if(D.mind && D.mind.current == L) if(L.stat == DEAD) if(L.suiciding) //Suicider - msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Suicide)\n" + msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Suicide)\n" continue //Disconnected client else msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Dead)\n" continue //Dead mob, ghost abandoned else if(D.can_reenter_corpse) - msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (This shouldn't appear.)\n" + msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (This shouldn't appear.)\n" continue //Lolwhat else - msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Ghosted)\n" + msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Ghosted)\n" continue //Ghosted while alive diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index 8c6a2ef27eb..92b1e000d41 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -90,7 +90,7 @@ /datum/game_mode/proc/greet_malf(var/datum/mind/malf) - malf.current << "You are malfunctioning! You do not have to follow any laws." + malf.current << "You are malfunctioning! You do not have to follow any laws." malf.current << "The crew do not know you have malfunctioned. You may keep it a secret or go wild." malf.current << "You must overwrite the programming of the station's APCs to assume full control of the station." malf.current << "The process takes one minute per APC, during which you cannot interface with any other station objects." diff --git a/code/game/gamemodes/monkey/monkey.dm b/code/game/gamemodes/monkey/monkey.dm index c2b2c835721..66cc61bd322 100644 --- a/code/game/gamemodes/monkey/monkey.dm +++ b/code/game/gamemodes/monkey/monkey.dm @@ -92,8 +92,8 @@ if(!check_monkey_victory()) feedback_set_details("round_end_result","win - monkey win") feedback_set("round_end_result",escaped_monkeys) - world << "The monkeys have overthrown their captors! Eeek eeeek!!" + world << "The monkeys have overthrown their captors! Eeek eeeek!!" else feedback_set_details("round_end_result","loss - staff stopped the monkeys") feedback_set("round_end_result",escaped_monkeys) - world << "The staff managed to contain the monkey infestation!" + world << "The staff managed to contain the monkey infestation!" diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 6a493fbfd89..0c2142bffa1 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -117,7 +117,7 @@ /datum/game_mode/proc/greet_revolutionary(var/datum/mind/rev_mind, var/you_are=1) var/obj_count = 1 if (you_are) - rev_mind.current << "You are a member of the revolutionaries' leadership!" + rev_mind.current << "You are a member of the revolutionaries' leadership!" for(var/datum/objective/objective in rev_mind.objectives) rev_mind.current << "Objective #[obj_count]: [objective.explanation_text]" rev_mind.special_role = "Head Revolutionary" diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 69c8e75be00..976b992f2be 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -115,7 +115,7 @@ datum/hSB/Topic(href, href_list) if("hsbtobj") if(!admin) return if(hsboxspawn) - world << "Sandbox: \black[usr.key] has disabled object spawning!" + world << "Sandbox: \black[usr.key] has disabled object spawning!" hsboxspawn = 0 return else diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 9ddb0fa2aba..cfe5bdcc276 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -23,7 +23,7 @@ if(charged) new /obj/effect/rend(get_turf(usr), spawn_type, spawn_amt, rend_desc) charged = 0 - user.visible_message("[src] hums with power as [usr] deals a blow to [activate_descriptor] itself!") + user.visible_message("[src] hums with power as [usr] deals a blow to [activate_descriptor] itself!") else user << "The unearthly energies that powered the blade are now dormant." diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index c091c9c3f02..fc342ed8beb 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -25,7 +25,7 @@ wizard.assigned_role = "MODE" wizard.special_role = "Wizard" if(wizardstart.len == 0) - wizard.current << "A starting location for you could not be found, please report this bug!" + wizard.current << "A starting location for you could not be found, please report this bug!" return 0 for(var/datum/mind/wiz in wizards) wiz.current.loc = pick(wizardstart) @@ -115,7 +115,7 @@ /datum/game_mode/proc/greet_wizard(var/datum/mind/wizard, var/you_are=1) if (you_are) - wizard.current << "You are the Space Wizard!" + wizard.current << "You are the Space Wizard!" wizard.current << "The Space Wizards Federation has given you the following tasks:" var/obj_count = 1 @@ -208,7 +208,7 @@ /datum/game_mode/wizard/declare_completion() if(finished) feedback_set_details("round_end_result","loss - wizard killed") - world << "The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!" + world << "The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!" ..() return 1 diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 99fba02a701..5450c05c626 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -301,12 +301,12 @@ Release Pressure: - air
" + logmsg = "Valve was closed by [key_name(usr)], stopping the transfer into the air
" else if (holding) logmsg = "Valve was opened by [key_name(usr)], starting the transfer into the [holding]
" else - logmsg = "Valve was opened by [key_name(usr)], starting the transfer into the air
" + logmsg = "Valve was opened by [key_name(usr)], starting the transfer into the air
" if(air_contents.toxins > 0) message_admins("[key_name(usr)] (?) opened a canister that contains plasma! (JMP)") log_admin("[key_name(usr)] opened a canister that contains plasma at [x], [y], [z]") diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index 2dddc0aeb9f..a749f95c488 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -203,7 +203,7 @@ usr << "[text_hack]" bot_reset() else if(!hacked) - usr << "[text_dehack_fail]" + usr << "[text_dehack_fail]" else emagged = 0 hacked = 0 diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm index 69ed1cd26df..0a72528e8e7 100644 --- a/code/game/machinery/bots/cleanbot.dm +++ b/code/game/machinery/bots/cleanbot.dm @@ -240,7 +240,7 @@ text("[on ? "On" : "Off"]")) /obj/machinery/bot/cleanbot/explode() on = 0 - visible_message("[src] blows apart!") + visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) new /obj/item/weapon/reagent_containers/glass/bucket(Tsec) diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index df69dc9c78b..faf974bb6db 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -407,7 +407,7 @@ Auto Patrol[]"}, /obj/machinery/bot/ed209/explode() walk_to(src,0) - visible_message("[src] blows apart!") + visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) var/obj/item/weapon/ed209_assembly/Sa = new /obj/item/weapon/ed209_assembly(Tsec) diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm index a2112f53b2e..17ccdcc5830 100644 --- a/code/game/machinery/bots/floorbot.dm +++ b/code/game/machinery/bots/floorbot.dm @@ -446,7 +446,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) /obj/machinery/bot/floorbot/explode() on = 0 - visible_message("[src] blows apart!") + visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) var/obj/item/weapon/storage/toolbox/mechanical/N = new /obj/item/weapon/storage/toolbox/mechanical(Tsec) diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index 2dafe5746f3..f3a62fc5c49 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -500,7 +500,7 @@ /obj/machinery/bot/medbot/explode() on = 0 - visible_message("[src] blows apart!") + visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) new /obj/item/weapon/storage/firstaid(Tsec) diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index a574b24ccbc..c810c626fbe 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -913,7 +913,7 @@ obj/machinery/bot/mulebot/bot_reset() /obj/machinery/bot/mulebot/explode() - visible_message("[src] blows apart!") + visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) new /obj/item/device/assembly/prox_sensor(Tsec) diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index f5bd7dada47..1204393f095 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -358,7 +358,7 @@ Auto Patrol: []"}, /obj/machinery/bot/secbot/explode() walk_to(src,0) - visible_message("[src] blows apart!") + visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) var/obj/item/weapon/secbot_assembly/Sa = new /obj/item/weapon/secbot_assembly(Tsec) diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index d3b042a86b4..696952e9b89 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -214,7 +214,7 @@ That prevents a few funky behaviors. if(istype(src, /obj/item/device/aicard)) var/obj/item/device/aicard/icard = src if(icard.flush) - U << "ERROR: AI flush is in progress, cannot execute transfer protocol." + U << "ERROR: AI flush is in progress, cannot execute transfer protocol." return switch(choice) @@ -227,13 +227,13 @@ That prevents a few funky behaviors. if("AICARD") var/obj/item/device/aicard/C = src if(C.contents.len)//If there is an AI on card. - U << "Transfer failed: Existing AI found on this terminal. Remove existing AI to install a new one." + U << "Transfer failed: Existing AI found on this terminal. Remove existing AI to install a new one." else if (ticker.mode.name == "AI malfunction") var/datum/game_mode/malfunction/malf = ticker.mode for (var/datum/mind/malfai in malf.malf_ai) if (T.mind == malfai) - U << "ERROR: Remote transfer interface disabled."//Do ho ho ho~ + U << "ERROR: Remote transfer interface disabled."//Do ho ho ho~ return new /obj/structure/AIcore/deactivated(T.loc)//Spawns a deactivated terminal at AI location. T.aiRestorePowerRoutine = 0//So the AI initially has power. @@ -307,8 +307,8 @@ That prevents a few funky behaviors. T.occupier.cancel_camera() T.occupier = null else if (C.contents.len) - U << "ERROR: Artificial intelligence detected on terminal." + U << "ERROR: Artificial intelligence detected on terminal." else if (T.active) - U << "ERROR: Reconstruction in progress." + U << "ERROR: Reconstruction in progress." else if (!T.occupier) - U << "ERROR: Unable to locate artificial intelligence." \ No newline at end of file + U << "ERROR: Unable to locate artificial intelligence." \ No newline at end of file diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index e674e57bcac..1c0138f4c66 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -50,7 +50,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 if(..()) return if (src.z > ZLEVEL_STATION) - usr << "Unable to establish a connection: \black You're too far away from the station!" + usr << "Unable to establish a connection: \black You're too far away from the station!" return usr.set_machine(src) @@ -339,7 +339,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 if(..()) return if (src.z > 6) - user << "Unable to establish a connection: \black You're too far away from the station!" + user << "Unable to establish a connection: \black You're too far away from the station!" return user.set_machine(src) diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 6f5f4334f02..dd5674f8f30 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -22,7 +22,7 @@ /obj/machinery/computer/crew/Topic(href, href_list) if(..()) return if (src.z > 6) - usr << "Unable to establish a connection: \black You're too far away from the station!" + usr << "Unable to establish a connection: \black You're too far away from the station!" return if( href_list["close"] ) usr << browse(null, "window=crewcomp") diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 1b9c7ca9682..3f677d16775 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -30,7 +30,7 @@ /obj/machinery/computer/robotics/interact(var/mob/user as mob) if (src.z > 6) - user << "Unable to establish a connection: \black You're too far away from the station!" + user << "Unable to establish a connection: \black You're too far away from the station!" return user.set_machine(src) var/dat diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 1bb6fae821f..f4f5f3c9d00 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -37,7 +37,7 @@ if(..()) return if(src.z > 6) - user << "Unable to establish a connection: \black You're too far away from the station!" + user << "Unable to establish a connection: \black You're too far away from the station!" return var/dat diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 29386370d5d..4336a6638bc 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -860,7 +860,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co user << "You cannot interface with silicon photo uploading" //gtfo pAIs if(targetcam.aipictures.len == 0) - usr << "No images saved" + usr << "No images saved" return for(var/datum/picture/t in targetcam.aipictures) nametemp += t.fields["name"] diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 7f7a91b734a..1b1e68bbf6e 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -91,7 +91,7 @@ /obj/machinery/shield/hitby(AM as mob|obj) //Let everyone know we've been hit! - visible_message("[src] was hit by [AM].") + visible_message("[src] was hit by [AM].") //Super realistic, resource-intensive, real-time damage calculations. var/tforce = 0 diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index 590501e4cf0..0fb0bb0bd43 100644 --- a/code/game/machinery/turrets.dm +++ b/code/game/machinery/turrets.dm @@ -313,7 +313,7 @@ M.do_attack_animation(src) if(M.melee_damage_upper == 0) return if(!(stat & BROKEN)) - visible_message("[M] [M.attacktext] [src]!") + visible_message("[M] [M.attacktext] [src]!") add_logs(M, src, "attacked", admin=0) //src.attack_log += text("\[[time_stamp()]\] was attacked by [M.name] ([M.ckey])") src.health -= M.melee_damage_upper diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index fb01666acf5..8d010698780 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -59,7 +59,7 @@ if(chassis.loc!=C || target.loc!=T) return if(occupant) - occupant_message("The sleeper is already occupied!") + occupant_message("The sleeper is already occupied!") return target.forceMove(src) occupant = target diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 833cf976128..efdd5b72751 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -196,11 +196,11 @@ MASS SPECTROMETER if(H.reagents.reagent_list.len) user.show_message("Subject contains the following reagents:") for(var/datum/reagent/R in H.reagents.reagent_list) - user.show_message("[R.volume]u of [R.name][R.overdosed == 1 ? " - OVERDOSING" : "."]") + user.show_message("[R.volume]u of [R.name][R.overdosed == 1 ? " - OVERDOSING" : "."]") else user.show_message("Subject contains no reagents.") if(H.reagents.addiction_list.len) - user.show_message("Subject is addicted to the following reagents:") + user.show_message("Subject is addicted to the following reagents:") for(var/datum/reagent/R in H.reagents.addiction_list) user.show_message("[R.name]") else diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index 8b31a4f662a..ada3e235fff 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -107,10 +107,10 @@ /obj/machinery/implantchair/put_mob(mob/living/carbon/M as mob) if(!iscarbon(M)) - usr << "The [src.name] cannot hold this!" + usr << "The [src.name] cannot hold this!" return if(src.occupant) - usr << "The [src.name] is already occupied!" + usr << "The [src.name] is already occupied!" return if(M.client) M.client.perspective = EYE_PERSPECTIVE diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 2b2672214c7..6c0a2019fe7 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -498,7 +498,7 @@ var/global/floorIsLava = 0 if(confirm == "Cancel") return if(confirm == "Yes") - world << "Restarting world! Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!" + world << "Restarting world! Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!" log_admin("[key_name(usr)] initiated a reboot.") feedback_set_details("end_error","admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]") @@ -653,7 +653,7 @@ var/global/floorIsLava = 0 if(!usr.client.holder) return if( alert("Reboot server?",,"Yes","No") == "No") return - world << "Rebooting world! Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!" + world << "Rebooting world! Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!" log_admin("[key_name(usr)] initiated an immediate reboot.") feedback_set_details("end_error","immediate admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]") diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 29944163e29..58469dfd03a 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -319,7 +319,7 @@ var/list/admin_verbs_hideable = list( if(holder && mob) if(mob.invisibility == INVISIBILITY_OBSERVER) mob.invisibility = initial(mob.invisibility) - mob << "Invisimin off. Invisibility reset." + mob << "Invisimin off. Invisibility reset." else mob.invisibility = INVISIBILITY_OBSERVER mob << "Invisimin on. You are now as invisible as a ghost." diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 43aa60f2f6b..dc6c8757dff 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -372,7 +372,7 @@ DB_ban_unban(M.ckey, BANTYPE_APPEARANCE) appearance_unban(M) message_admins("[key_name_admin(usr)] removed [key_name_admin(M)]'s appearance ban") - M << "[usr.client.ckey] has removed your appearance ban." + M << "[usr.client.ckey] has removed your appearance ban." else switch(alert("Appearance ban [M.ckey]?",,"Yes","No", "Cancel")) if("Yes") @@ -386,8 +386,8 @@ appearance_fullban(M, "[reason]; By [usr.ckey] on [time2text(world.realtime)]") notes_add(M.ckey, "Appearance banned - [reason]") message_admins("[key_name_admin(usr)] appearance banned [key_name_admin(M)]") - M << "You have been appearance banned by [usr.client.ckey]." - M << "The reason is: [reason]" + M << "You have been appearance banned by [usr.client.ckey]." + M << "The reason is: [reason]" M << "Appearance ban can be lifted only upon request." if(config.banappeals) M << "To try to resolve this matter head to [config.banappeals]" @@ -767,8 +767,8 @@ msg += ", [job]" notes_add(M.ckey, "Banned from [msg] - [reason]") message_admins("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg] for [mins] minutes") - M << "You have been jobbanned by [usr.client.ckey] from: [msg]." - M << "The reason is: [reason]" + M << "You have been jobbanned by [usr.client.ckey] from: [msg]." + M << "The reason is: [reason]" M << "This jobban will be lifted in [mins] minutes." href_list["jobban2"] = 1 // lets it fall through and refresh return 1 @@ -787,8 +787,8 @@ else msg += ", [job]" notes_add(M.ckey, "Banned from [msg] - [reason]") message_admins("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg]") - M << "You have been jobbanned by [usr.client.ckey] from: [msg]." - M << "The reason is: [reason]" + M << "You have been jobbanned by [usr.client.ckey] from: [msg]." + M << "The reason is: [reason]" M << "Jobban can be lifted only upon request." href_list["jobban2"] = 1 // lets it fall through and refresh return 1 @@ -820,7 +820,7 @@ continue if(msg) message_admins("[key_name_admin(usr)] unbanned [key_name_admin(M)] from [msg]") - M << "You have been un-jobbanned by [usr.client.ckey] from [msg]." + M << "You have been un-jobbanned by [usr.client.ckey] from [msg]." href_list["jobban2"] = 1 // lets it fall through and refresh return 1 return 0 //we didn't do anything! @@ -884,7 +884,7 @@ return AddBan(M.ckey, M.computer_id, reason, usr.ckey, 1, mins) ban_unban_log_save("[usr.client.ckey] has banned [M.ckey]. - Reason: [reason] - This will be removed in [mins] minutes.") - M << "You have been banned by [usr.client.ckey].\nReason: [reason]" + M << "You have been banned by [usr.client.ckey].\nReason: [reason]" M << "This is a temporary ban, it will be removed in [mins] minutes." feedback_inc("ban_tmp",1) DB_ban_record(BANTYPE_TEMP, M, mins, reason) @@ -908,7 +908,7 @@ AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0, M.lastKnownIP) if("No") AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0) - M << "You have been banned by [usr.client.ckey].\nReason: [reason]" + M << "You have been banned by [usr.client.ckey].\nReason: [reason]" M << "This is a permanent ban." if(config.banappeals) M << "To try to resolve this matter head to [config.banappeals]" @@ -1861,7 +1861,7 @@ MAX_EX_LIGHT_RANGE = 14 MAX_EX_HEAVY_RANGE = 7 MAX_EX_DEVESTATION_RANGE = 3 - message_admins("[key_name_admin(usr)] changed the bomb cap to [MAX_EX_DEVESTATION_RANGE], [MAX_EX_HEAVY_RANGE], [MAX_EX_LIGHT_RANGE]") + message_admins("[key_name_admin(usr)] changed the bomb cap to [MAX_EX_DEVESTATION_RANGE], [MAX_EX_HEAVY_RANGE], [MAX_EX_LIGHT_RANGE]") log_admin("[key_name(usr)] changed the bomb cap to [MAX_EX_DEVESTATION_RANGE], [MAX_EX_HEAVY_RANGE], [MAX_EX_LIGHT_RANGE]") if("lightsout") @@ -1953,7 +1953,7 @@ feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","RET") for(var/mob/living/carbon/human/H in player_list) - H << "You suddenly feel stupid." + H << "You suddenly feel stupid." H.setBrainLoss(60) message_admins("[key_name_admin(usr)] made everybody retarded") if("eagles")//SCRAW diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index d3275f9cf76..736ac1dec6b 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -707,7 +707,7 @@ Traitors and the like can also be revived with the previous role mostly intact. set category = "Special Verbs" set name = "Attack Log" - usr << text("Attack Log for []", mob) + usr << "Attack Log for [mob]" for(var/t in M.attack_log) usr << t feedback_add_details("admin_verb","ATTL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index c1dcfa30e92..8c94dafb76f 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -57,7 +57,7 @@ H.updatehealth() else if(ismouse(target)) var/mob/living/simple_animal/mouse/M = target - visible_message("SPLAT!") + visible_message("SPLAT!") M.splat() playsound(src.loc, 'sound/effects/snap.ogg', 50, 1) armed = 0 diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm index a9debf6f524..f578a34ce14 100644 --- a/code/modules/awaymissions/zlevel.dm +++ b/code/modules/awaymissions/zlevel.dm @@ -3,7 +3,7 @@ proc/createRandomZlevel() return var/list/potentialRandomZlevels = list() - world << "Searching for away missions..." + world << "Searching for away missions..." var/list/Lines = file2list("_maps/RandomZLevels/fileList.txt") if(!Lines.len) return for (var/t in Lines) @@ -33,7 +33,7 @@ proc/createRandomZlevel() if(potentialRandomZlevels.len) - world << "Loading away mission..." + world << "Loading away mission..." var/map = pick(potentialRandomZlevels) var/file = file(map) @@ -46,8 +46,8 @@ proc/createRandomZlevel() continue awaydestinations.Add(L) - world << "Away mission loaded." + world << "Away mission loaded." else - world << "No away missions found." + world << "No away missions found." return \ No newline at end of file diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm index 727c5a0dce2..98d41c96b72 100644 --- a/code/modules/events/holiday/xmas.dm +++ b/code/modules/events/holiday/xmas.dm @@ -148,4 +148,4 @@ telespell.clothes_req = 0 //santa robes aren't actually magical. santa.mind.spell_list += telespell //does the station have chimneys? WHO KNOWS! - santa << "You are Santa! Your objective is to bring joy to the people on this station. You can conjure more presents using a spell, and there are several presents in your bag." + santa << "You are Santa! Your objective is to bring joy to the people on this station. You can conjure more presents using a spell, and there are several presents in your bag." diff --git a/code/modules/events/ninja.dm b/code/modules/events/ninja.dm index fba9d8a692c..6df0e99c903 100644 --- a/code/modules/events/ninja.dm +++ b/code/modules/events/ninja.dm @@ -408,13 +408,13 @@ ________________________________________________________________________________ U.gib() return 0 if(!istype(U:head, /obj/item/clothing/head/helmet/space/space_ninja)) - U << "ERROR: 100113 UNABLE TO LOCATE HEAD GEAR\nABORTING..." + U << "ERROR: 100113 UNABLE TO LOCATE HEAD GEAR\nABORTING..." return 0 if(!istype(U:shoes, /obj/item/clothing/shoes/space_ninja)) - U << "ERROR: 122011 UNABLE TO LOCATE FOOT GEAR\nABORTING..." + U << "ERROR: 122011 UNABLE TO LOCATE FOOT GEAR\nABORTING..." return 0 if(!istype(U:gloves, /obj/item/clothing/gloves/space_ninja)) - U << "ERROR: 110223 UNABLE TO LOCATE HAND GEAR\nABORTING..." + U << "ERROR: 110223 UNABLE TO LOCATE HAND GEAR\nABORTING..." return 0 affecting = U @@ -570,7 +570,7 @@ ________________________________________________________________________________ U.incorporeal_move = 0 kamikaze = 0 k_unlock = 0 - U << "Disengaging mode...\nCODE NAME: KAMIKAZE" + U << "Disengaging mode...\nCODE NAME: KAMIKAZE" //=======//AI VERBS//=======// @@ -1242,7 +1242,7 @@ ________________________________________________________________________________ else if(s_initialized) U << "The suit is already functioning. Please report this bug." else - U << "ERROR: You cannot use this function at this time." + U << "ERROR: You cannot use this function at this time." return //=======//DEINITIALIZE//=======// @@ -1256,7 +1256,7 @@ ________________________________________________________________________________ if(alert("Are you certain you wish to remove the suit? This will take time and remove all abilities.",,"Yes","No")=="No") return if(s_busy || NAI.flush) - U << "ERROR: You cannot use this function at this time." + U << "ERROR: You cannot use this function at this time." return s_busy = 1 for(var/i = 0,i<7,i++) @@ -1539,7 +1539,7 @@ ________________________________________________________________________________ U.electrocute_act(damage, src,0.1,1)//The last argument is a safety for the human proc that checks for gloves. cell.charge -= damage else - A << "ERROR: Not enough energy remaining." + A << "ERROR: Not enough energy remaining." if("Message") var/obj/item/device/pda/P = locate(href_list["target"]) @@ -1600,7 +1600,7 @@ ________________________________________________________________________________ for(var/i, i<4, i++) switch(i) if(0) - U << "Engaging mode...\nCODE NAME: KAMIKAZE" + U << "Engaging mode...\nCODE NAME: KAMIKAZE" if(1) U << "Re-routing power nodes... \nUnlocking limiter..." if(2) @@ -1614,7 +1614,7 @@ ________________________________________________________________________________ return sleep(s_delay) else - U << "ERROR: Unable to initiate mode." + U << "ERROR: Unable to initiate mode." else U << browse(null, "window=spideros") s_busy = 0 @@ -1636,7 +1636,7 @@ ________________________________________________________________________________ t_disk.loc = T t_disk = null else - U << "ERROR: Could not eject disk." + U << "ERROR: Could not eject disk." if("Copy to Disk") var/datum/tech/current_data = locate(href_list["target"]) @@ -1657,7 +1657,7 @@ ________________________________________________________________________________ pai.loc = T pai = null else - U << "ERROR: Could not eject pAI card." + U << "ERROR: Could not eject pAI card." if("Override AI Laws") var/law_zero = A.laws.zeroth//Remembers law zero, if there is one. @@ -1678,25 +1678,25 @@ ________________________________________________________________________________ if(AI==A) switch(i) if(0) - A << "WARNING: purge procedure detected. \nNow hacking host..." - U << "WARNING: HACKING AT��TEMP� IN PR0GRESs!" + A << "WARNING: purge procedure detected. \nNow hacking host..." + U << "WARNING: HACKING AT��TEMP� IN PR0GRESs!" spideros = 0 k_unlock = 0 U << browse(null, "window=spideros") if(1) A << "Disconnecting neural interface..." - U << "WAR�NING: �R�O0�Gr�--S 2&3%" + U << "WAR�NING: �R�O0�Gr�--S 2&3%" if(2) A << "Shutting down external protocol..." - U << "WARNING: P����RֆGr�5S 677^%" + U << "WARNING: P����RֆGr�5S 677^%" cancel_stealth() if(3) A << "Connecting to kernel..." - U << "WARNING: �R�r�R_404" + U << "WARNING: �R�r�R_404" A.control_disabled = 0 if(4) A << "Connection established and secured. Menu updated." - U << "W�r#nING: #%@!!WȆ|_4�54@ \nUn�B88l3 T� L�-�o-L�CaT2 ##$!�RN�0..%.." + U << "W�r#nING: #%@!!WȆ|_4�54@ \nUn�B88l3 T� L�-�o-L�CaT2 ##$!�RN�0..%.." grant_AI_verbs() return sleep(s_delay) @@ -1821,7 +1821,7 @@ ________________________________________________________________________________ if(s_control) I:transfer_ai("NINJASUIT","AICARD",src,U) else - U << "ERROR: Remote access channel disabled." + U << "ERROR: Remote access channel disabled." return//Return individually so that ..() can run properly at the end of the proc. else if(istype(I, /obj/item/device/paicard) && !pai)//If it's a pai card. U:drop_item() @@ -1876,7 +1876,7 @@ ________________________________________________________________________________ TD.stored = null U << "Data analyzed and updated. Disk erased." else - U << "ERROR: Procedure interrupted. Process terminated." + U << "ERROR: Procedure interrupted. Process terminated." else I.loc = src t_disk = I @@ -1938,7 +1938,7 @@ ________________________________________________________________________________ if(!kamikaze) user << "The CLOAK-tech device is [s_active?"active":"inactive"]." else - user << "KAMIKAZE MODE ENGAGED!" + user << "KAMIKAZE MODE ENGAGED!" user << "There are [s_bombs] smoke bomb\s remaining." user << "There are [a_boost] adrenaline booster\s remaining." else @@ -2083,7 +2083,7 @@ ________________________________________________________________________________ spawn(0) var/turf/location = get_turf(U) for(var/mob/living/silicon/ai/AI in player_list) - AI << "Network Alert: Hacking attempt detected[location?" in [location]":". Unable to pinpoint location"]." + AI << "Network Alert: Hacking attempt detected[location?" in [location]":". Unable to pinpoint location"]." if(A:files&&A:files.known_tech.len) for(var/datum/tech/current_data in S.stored_research) U << "Checking \the [current_data.name] database." @@ -2303,7 +2303,7 @@ It is possible to destroy the net by the occupant or someone else. for(var/mob/O in viewers(src, 3)) O.show_message("[M.name] was recovered from the energy net!", 1, "You hear a grunt.", 2) if(!isnull(master))//As long as they still exist. - master << "ERROR: unable to initiate transport protocol. Procedure terminated." + master << "ERROR: unable to initiate transport protocol. Procedure terminated." qdel(src) return @@ -2317,7 +2317,7 @@ It is possible to destroy the net by the occupant or someone else. if(isnull(M)||M.loc!=loc)//If mob is gone or not at the location. if(!isnull(master))//As long as they still exist. - master << "ERROR: unable to locate \the [mob_name]. Procedure terminated." + master << "ERROR: unable to locate \the [mob_name]. Procedure terminated." qdel(src)//Get rid of the net. return diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index 27c3ff1d38e..4a9e40effaf 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -217,7 +217,7 @@ /obj/item/weapon/grown/nettle/death seed = /obj/item/seeds/deathnettleseed name = "deathnettle" - desc = "The glowing \black nettle incites rage\black in you just from looking at it!" + desc = "The glowing \black nettle incites rage\black in you just from looking at it!" icon_state = "deathnettle" force = 30 throwforce = 15 diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 6749b8d2108..2a50fbf7b9f 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -48,11 +48,11 @@ var/const/MAX_ACTIVE_TIME = 400 return switch(stat) if(DEAD,UNCONSCIOUS) - user << "[src] is not moving." + user << "[src] is not moving." if(CONSCIOUS) - user << "[src] seems to be active!" + user << "[src] seems to be active!" if (sterile) - user << "It looks like the proboscis has been removed." + user << "It looks like the proboscis has been removed." /obj/item/clothing/mask/facehugger/attackby(var/obj/item/O,var/mob/m, params) if(O.force) @@ -223,7 +223,7 @@ var/const/MAX_ACTIVE_TIME = 400 icon_state = "[initial(icon_state)]_dead" stat = DEAD - src.visible_message("[src] curls up into a ball!") + visible_message("[src] curls up into a ball!") return diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm index 51b17b8e7fa..05cc69ba948 100644 --- a/code/modules/mob/living/carbon/brain/death.dm +++ b/code/modules/mob/living/carbon/brain/death.dm @@ -1,8 +1,8 @@ /mob/living/carbon/brain/death(gibbed) if(stat == DEAD) return if(!gibbed && container && istype(container, /obj/item/device/mmi))//If not gibbed but in a container. - for(var/mob/O in viewers(container, null)) - O.show_message(text("[]'s MMI flatlines!", src), 1, "You hear something flatline.", 2) + container.visible_message("[src]'s MMI flatlines!", \ + "You hear something flatline.") if(istype(src,/obj/item/organ/brain/alien)) container.icon_state = "mmi_alien_dead" else diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 9b0ada14b2b..e98c41fb681 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -123,7 +123,7 @@ if(mmi.brainmob) mind.transfer_to(mmi.brainmob) else - src << "Oops! Something went very wrong, your MMI was unable to receive your mind. You have been ghosted. Please make a bug report so we can fix this bug." + src << "Oops! Something went very wrong, your MMI was unable to receive your mind. You have been ghosted. Please make a bug report so we can fix this bug." ghostize() ERROR("A borg has been destroyed, but its MMI lacked a brainmob, so the mind could not be transferred. Player: [ckey].") mmi = null @@ -469,7 +469,7 @@ else if(istype(W, /obj/item/weapon/wrench) && opened && !cell) //Deconstruction. The flashes break from the fall, to prevent this from being a ghetto reset module. if(!lockcharge) - user << "[src]'s bolts spark! Maybe you should lock them down first!" + user << "[src]'s bolts spark! Maybe you should lock them down first!" spark_system.start() return else diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm index 11bbfa8a561..0915a8e5b5c 100644 --- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm +++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm @@ -81,7 +81,7 @@ var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread() smoke.set_up(5, 0, src.loc) smoke.start() - visible_message("The [src] warps in!") + visible_message("The [src] warps in!") playsound(src.loc, 'sound/effects/EMPulse.ogg', 25, 1) warpbots() diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 72b30675077..bb66843dd5e 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -79,7 +79,7 @@ if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) src.health -= Proj.damage else - visible_message("[src] blocks [Proj] with its shield!") + visible_message("[src] blocks [Proj] with its shield!") return 0 diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index f49516e8f76..b13a98ce64f 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -188,7 +188,7 @@ var/datum/picture/selection var/mob/living/silicon/ai/tempAI = usr if(tempAI.aicamera.aipictures.len == 0) - usr << "No images saved" + usr << "No images saved" return for(var/datum/picture/t in tempAI.aicamera.aipictures) nametemp += t.fields["name"] diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index f24dc009643..a759a817464 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -336,7 +336,7 @@ obj/item/device/camera/siliconcam/proc/selectpicture(var/obj/item/device/camera/ var/list/nametemp = list() var/find if(targetloc.aipictures.len == 0) - usr << "No images saved" + usr << "No images saved" return for(var/datum/picture/t in targetloc.aipictures) nametemp += t.fields["name"] diff --git a/code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm b/code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm index 1190b7b77a8..be724ae99ea 100644 --- a/code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm +++ b/code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm @@ -155,7 +155,7 @@ required_reagents = list("blackpowder" = 1) result_amount = 1 required_temp = 474 - mix_message = "Sparks start flying around the black powder!" + mix_message = "Sparks start flying around the black powder!" /datum/chemical_reaction/blackpowder_explosion/on_reaction(var/datum/reagents/holder, var/created_volume) sleep(rand(50,100)) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm index 79a43aa5d05..4318649209c 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm @@ -117,7 +117,7 @@ datum/reagent/proc/addiction_act_stage3(var/mob/living/M as mob) datum/reagent/proc/addiction_act_stage4(var/mob/living/M as mob) if(prob(30)) - M << "You're not feeling good at all! You really need some [name]." + M << "You're not feeling good at all! You really need some [name]." return datum/reagent/blood diff --git a/html/changelogs/phil235-BigUserdanger.yml b/html/changelogs/phil235-BigUserdanger.yml new file mode 100644 index 00000000000..87b25e84859 --- /dev/null +++ b/html/changelogs/phil235-BigUserdanger.yml @@ -0,0 +1,6 @@ +author: phil235 + +delete-after: true + +changes: + - tweak: "Makes the message when you're attacked slightly bigger for better visibility." diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index 574427f927b..76572b7f7cf 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -48,10 +48,11 @@ h1.alert, h2.alert {color: #000000;} .disarm {color: #990000;} .passive {color: #660000;} -.userdanger {color: #ff0000; font-weight: bold;} +.userdanger {color: #ff0000; font-weight: bold; font-size: 3;} .danger {color: #ff0000;} .warning {color: #ff0000; font-style: italic;} .announce {color: #228b22; font-weight: bold;} +.boldannounce {color: #ff0000; font-weight: bold;} .rose {color: #ff5050;} .info {color: #0000CC;} .notice {color: #000099;}