From 0b279ec9439556688468d79ebd10c792540a2911 Mon Sep 17 00:00:00 2001 From: nevimer <77420409+nevimer@users.noreply.github.com> Date: Wed, 26 May 2021 05:26:40 -0400 Subject: [PATCH] softens chat colours for eye pleasure (#3123) --- code/controllers/subsystems/ticker.dm | 6 +- code/datums/mind.dm | 2 +- .../gamemodes/events/holidays/Holidays.dm | 4 +- code/game/gamemodes/technomancer/catalog.dm | 4 +- code/game/machinery/adv_med.dm | 2 +- .../game/machinery/computer/communications.dm | 4 +- code/game/machinery/computer/message.dm | 2 +- .../machinery/computer3/computers/crew.dm | 2 +- code/game/machinery/newscaster.dm | 2 +- code/game/machinery/requests_console.dm | 2 +- code/game/machinery/suit_storage_unit.dm | 16 +++--- .../mecha/equipment/tools/medical_tools.dm | 2 +- code/game/mecha/mecha.dm | 8 +-- code/game/mecha/mecha_actions.dm | 4 +- code/game/objects/structures/dancepole.dm | 4 +- code/game/verbs/advanced_who.dm | 2 +- code/modules/admin/DB ban/functions.dm | 2 +- code/modules/admin/IsBanned.dm | 6 +- code/modules/admin/NewBan.dm | 2 +- code/modules/admin/admin.dm | 14 ++--- code/modules/admin/admin_verbs.dm | 16 +++--- code/modules/admin/callproc/callproc.dm | 4 +- code/modules/admin/newbanjob.dm | 6 +- .../admin/permissionverbs/permissionedit.dm | 8 +-- code/modules/admin/player_notes.dm | 4 +- code/modules/admin/topic.dm | 56 +++++++++---------- code/modules/admin/verbs/adminhelp.dm | 4 +- code/modules/admin/verbs/adminpm.dm | 18 +++--- code/modules/admin/verbs/debug.dm | 10 ++-- code/modules/admin/verbs/pray.dm | 6 +- code/modules/admin/verbs/randomverbs.dm | 26 ++++----- code/modules/admin/verbs/tripAI.dm | 4 +- code/modules/admin/view_variables/topic.dm | 2 +- code/modules/artifice/deadringer.dm | 12 ++-- code/modules/awaymissions/gateway.dm | 2 +- code/modules/clothing/gloves/miscellaneous.dm | 4 +- code/modules/clothing/head/helmet.dm | 12 ++-- code/modules/clothing/shoes/boots.dm | 4 +- .../clothing/spacesuits/rig/modules/combat.dm | 4 +- .../spacesuits/rig/modules/computer.dm | 12 ++-- .../clothing/spacesuits/rig/modules/ninja.dm | 2 +- .../spacesuits/rig/modules/utility.dm | 12 ++-- .../clothing/spacesuits/rig/modules/vision.dm | 6 +- code/modules/clothing/spacesuits/rig/rig.dm | 18 +++--- .../clothing/spacesuits/rig/rig_verbs.dm | 10 ++-- .../clothing/spacesuits/rig/suits/ert.dm | 4 +- .../modules/clothing/spacesuits/spacesuits.dm | 4 +- code/modules/clothing/suits/armor.dm | 8 +-- .../detectivework/microscope/dnascanner.dm | 2 +- code/modules/economy/ATM.dm | 4 +- code/modules/economy/cash.dm | 2 +- code/modules/flufftext/Dreaming.dm | 2 +- code/modules/food/food/sandwich.dm | 6 +- code/modules/food/food/snacks.dm | 12 ++-- code/modules/hydroponics/trays/tray.dm | 6 +- code/modules/mining/coins.dm | 2 +- code/modules/mining/machine_processing.dm | 2 +- code/modules/mining/mint.dm | 2 +- code/modules/mining/money_bag.dm | 4 +- code/modules/mob/dead/observer/observer.dm | 14 ++--- code/modules/mob/living/carbon/brain/MMI.dm | 6 +- code/modules/mob/living/carbon/brain/emote.dm | 2 +- .../mob/living/carbon/brain/posibrain.dm | 6 +- code/modules/mob/living/carbon/carbon.dm | 4 +- .../living/carbon/human/MedicalSideEffects.dm | 2 +- .../living/carbon/human/chem_side_effects.dm | 2 +- code/modules/mob/living/carbon/human/emote.dm | 2 +- .../mob/living/carbon/human/examine.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 10 ++-- .../mob/living/carbon/human/human_powers.dm | 2 +- .../mob/living/carbon/metroid/emote.dm | 2 +- code/modules/mob/living/living.dm | 4 +- code/modules/mob/living/living_defense.dm | 2 +- code/modules/mob/living/silicon/ai/ai.dm | 14 ++--- code/modules/mob/living/silicon/pai/pai.dm | 2 +- .../mob/living/silicon/robot/analyzer.dm | 20 +++---- .../modules/mob/living/silicon/robot/emote.dm | 2 +- .../modules/mob/living/silicon/robot/robot.dm | 2 +- .../mob/living/silicon/robot/robot_items.dm | 8 +-- .../mob/living/simple_animal/aliens/drone.dm | 6 +- .../mob/living/simple_animal/animals/mouse.dm | 2 +- .../subtypes/animal/borer/borer_powers.dm | 8 +-- .../subtypes/animal/farm animals/chicken.dm | 4 +- .../subtypes/animal/passive/mouse.dm | 2 +- .../simple_mob/subtypes/animal/pets/dog.dm | 2 +- .../subtypes/animal/space/mouse_army.dm | 2 +- code/modules/mob/login.dm | 4 +- code/modules/mob/mob.dm | 6 +- code/modules/mob/mob_movement.dm | 2 +- code/modules/mob/new_player/poll.dm | 6 +- code/modules/paperwork/paper.dm | 2 +- code/modules/power/antimatter/fuel.dm | 2 +- code/modules/power/cable.dm | 2 +- code/modules/power/cable_heavyduty.dm | 4 +- code/modules/power/pacman2.dm | 12 ++-- code/modules/power/singularity/collector.dm | 2 +- code/modules/power/solar.dm | 4 +- code/modules/projectiles/ammunition.dm | 6 +- code/modules/projectiles/gun.dm | 2 +- .../projectiles/guns/launcher/rocket.dm | 6 +- .../projectiles/guns/projectile/dartgun.dm | 10 ++-- .../modules/projectiles/projectile/special.dm | 4 +- code/modules/recycling/disposal.dm | 6 +- code/modules/recycling/sortingmachinery.dm | 6 +- code/modules/research/message_server.dm | 2 +- code/modules/shieldgen/emergency_shield.dm | 18 +++--- code/modules/shieldgen/shield_capacitor.dm | 2 +- code/modules/shieldgen/shield_gen.dm | 2 +- code/modules/shuttles/shuttles_web.dm | 2 +- code/modules/surgery/bones.dm | 40 ++++++------- code/modules/surgery/encased.dm | 24 ++++---- code/modules/surgery/face.dm | 20 +++---- code/modules/surgery/generic.dm | 36 ++++++------ code/modules/surgery/implant.dm | 32 +++++------ code/modules/surgery/neck.dm | 24 ++++---- code/modules/surgery/other.dm | 12 ++-- code/modules/surgery/slimes.dm | 12 ++-- code/modules/vehicles/train.dm | 6 +- code/modules/vehicles/vehicle.dm | 2 +- code/modules/virus2/biohazard destroyer.dm | 2 +- code/modules/virus2/items_devices.dm | 2 +- code/modules/vore/eating/living_vr.dm | 16 +++--- .../fluffstuff/guns/cell_loaded/ml3m_cells.dm | 6 +- code/modules/vore/resizing/sizegun_vr.dm | 2 +- .../xenoarcheaology/artifacts/replicator.dm | 2 +- .../xenoarcheaology/effects/cellcharge.dm | 6 +- .../xenoarcheaology/effects/celldrain.dm | 2 +- code/modules/xenoarcheaology/effects/cold.dm | 2 +- .../xenoarcheaology/effects/goodfeeling.dm | 6 +- code/modules/xenoarcheaology/effects/heal.dm | 6 +- .../xenoarcheaology/effects/roboheal.dm | 6 +- .../modules/xenoarcheaology/effects/sleepy.dm | 6 +- code/modules/xenoarcheaology/finds/talking.dm | 4 +- .../tools/ano_device_battery.dm | 14 ++--- .../tools/artifact_harvester.dm | 2 +- .../tools/geosample_scanner.dm | 8 +-- .../tools/suspension_generator.dm | 10 ++-- 137 files changed, 484 insertions(+), 484 deletions(-) diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index 9c67f3fe891..bdecd9f676c 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -245,7 +245,7 @@ SUBSYSTEM_DEF(ticker) //Deleting Startpoints but we need the ai point to AI-ize people later if (S.name != "AI") qdel(S) - to_chat(world, "Enjoy the game!") + to_chat(world, "Enjoy the game!") SEND_SOUND(world, sound('sound/AI/welcome.ogg')) // Skie //Holiday Round-start stuff ~Carn Holiday_Game_Start() @@ -496,7 +496,7 @@ SUBSYSTEM_DEF(ticker) var/turf/playerTurf = get_turf(Player) if(SSemergencyshuttle.departed && SSemergencyshuttle.evac) if(isNotAdminLevel(playerTurf.z)) - to_chat(Player, "You survived the round, but remained on [station_name()] as [Player.real_name].") + to_chat(Player, "You survived the round, but remained on [station_name()] as [Player.real_name].") else to_chat(Player, "You managed to survive the events on [station_name()] as [Player.real_name].") else if(isAdminLevel(playerTurf.z)) @@ -504,7 +504,7 @@ SUBSYSTEM_DEF(ticker) else if(issilicon(Player)) to_chat(Player, "You remain operational after the events on [station_name()] as [Player.real_name].") else - to_chat(Player, "You missed the crew transfer after the events on [station_name()] as [Player.real_name].") + to_chat(Player, "You missed the crew transfer after the events on [station_name()] as [Player.real_name].") else if(istype(Player,/mob/observer/dead)) var/mob/observer/dead/O = Player diff --git a/code/datums/mind.dm b/code/datums/mind.dm index c25a06580c6..51ac27d15db 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -413,7 +413,7 @@ else if (href_list["obj_announce"]) var/obj_count = 1 - to_chat(current, "Your current objectives:") + to_chat(current, "Your current objectives:") for(var/datum/objective/objective in objectives) to_chat(current, "Objective #[obj_count]: [objective.explanation_text]") obj_count++ diff --git a/code/game/gamemodes/events/holidays/Holidays.dm b/code/game/gamemodes/events/holidays/Holidays.dm index cde50070c32..aebe2f05f9d 100644 --- a/code/game/gamemodes/events/holidays/Holidays.dm +++ b/code/game/gamemodes/events/holidays/Holidays.dm @@ -237,11 +237,11 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t holidays.Add(p) holiday_blurbs.Add("[Holiday[p]]") var/holidays_string = english_list(holidays, nothing_text = "nothing", and_text = " and ", comma_text = ", ", final_comma_text = "" ) - to_chat(world, "and...") + to_chat(world, "and...") to_chat(world, "

Happy [holidays_string] Everybody!

") if(holiday_blurbs.len != 0) for(var/blurb in holiday_blurbs) - to_chat(world, "
[blurb]
") + to_chat(world, "
[blurb]
") switch(Holiday) //special holidays if("Easter") //do easter stuff diff --git a/code/game/gamemodes/technomancer/catalog.dm b/code/game/gamemodes/technomancer/catalog.dm index 0b53098381b..d6f19b5f692 100644 --- a/code/game/gamemodes/technomancer/catalog.dm +++ b/code/game/gamemodes/technomancer/catalog.dm @@ -135,7 +135,7 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) - if(spell.spell_power_desc) dat += "Spell Power: [spell.spell_power_desc]
" if(spell.enhancement_desc) - dat += "Scepter Effect: [spell.enhancement_desc]
" + dat += "Scepter Effect: [spell.enhancement_desc]
" if(spell.cost <= budget) dat += "Purchase ([spell.cost])

" else @@ -253,7 +253,7 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) - a target of your choice.
" dat += "Some functions can have their abilities enhanced by a special rod called the Scepter of Enhancement. \ If a function is able to be boosted with it, it will be shown underneath the description of the function as \ - 'Scepter Effect:'. Note that you must hold the scepter for it to work, so try to avoid losing it.
" + 'Scepter Effect:'. Note that you must hold the scepter for it to work, so try to avoid losing it.
" dat += "Functions can also be boosted with the core itself. A function that is able to benefit \ from this will have 'Spell Power:' underneath. Different Cores have different \ amounts of spell power.
" diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 41f63ba04aa..dbf635fbe6e 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -454,7 +454,7 @@ if(scanner) var/mob/living/carbon/human/occupant = scanner.occupant - dat = "Occupant Statistics:
" //Blah obvious + dat = "Occupant Statistics:
" //Blah obvious if(istype(occupant)) //is there REALLY someone in there? var/t1 switch(occupant.stat) // obvious, see what their status is diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 658cfbe30e0..10dc92e79a1 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -192,7 +192,7 @@ if(!input || !(usr in view(1,src))) return CentCom_announce(input, usr) - to_chat(usr, "Message transmitted.") + to_chat(usr, "Message transmitted.") log_game("[key_name(usr)] has made an IA [GLOB.using_map.boss_short] announcement: [input]") centcomm_message_cooldown = 1 spawn(300)//10 minute cooldown @@ -209,7 +209,7 @@ if(!input || !(usr in view(1,src))) return Syndicate_announce(input, usr) - to_chat(usr, "Message transmitted.") + to_chat(usr, "Message transmitted.") log_game("[key_name(usr)] has made an illegal announcement: [input]") centcomm_message_cooldown = 1 spawn(300)//10 minute cooldown diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 6989dde4323..ff107afcf97 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -122,7 +122,7 @@ dat += "
[++i]. Modify Spam Filter
" else for(var/n = ++i; n <= optioncount; n++) - dat += "
[n]. ---------------
" + dat += "
[n]. ---------------
" if((istype(user, /mob/living/silicon/ai) || istype(user, /mob/living/silicon/robot)) && (user.mind.special_role && user.mind.original == user)) //Malf/Traitor AIs can bruteforce into the system to gain the Key. dat += "
*&@#. Bruteforce Key
" diff --git a/code/game/machinery/computer3/computers/crew.dm b/code/game/machinery/computer3/computers/crew.dm index e0112532ddd..59e135dc51a 100644 --- a/code/game/machinery/computer3/computers/crew.dm +++ b/code/game/machinery/computer3/computers/crew.dm @@ -32,7 +32,7 @@ var/dam4 = round(H.getBruteLoss(),1) var/life_status = "[H.stat > 1 ? "Deceased" : "Living"]" - var/damage_report = "([dam1]/[dam2]/[dam3]/[dam4])" + var/damage_report = "([dam1]/[dam2]/[dam3]/[dam4])" log += "[H.get_authentification_name()] ([H.get_assignment()])" diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index ae79ad51f4e..5bf2c8a5823 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -924,7 +924,7 @@ obj/item/newspaper/Topic(href, href_list) obj/item/newspaper/attackby(obj/item/W as obj, mob/user as mob) if(istype(W, /obj/item/pen)) if(scribble_page == curr_page) - to_chat(user, "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?") + to_chat(user, "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?") else var/s = sanitize(input(user, "Write something", "Newspaper", "")) s = sanitize(s) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index a6ad6b22d02..62acdf0c7ab 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -252,7 +252,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() if(inoperable(MAINT)) return if(screen == RCS_MESSAUTH) var/obj/item/stamp/T = O - msgStamped = text("Stamped with the [T.name]") + msgStamped = text("Stamped with the [T.name]") updateUsrDialog() return diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 0fae9d543ed..7fdebd147ca 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -91,7 +91,7 @@ dat+= "Suit storage unit: Maintenance panel" dat+= "Maintenance panel controls
" dat+= "The panel is ridden with controls, button and meters, labeled in strange signs and symbols that
you cannot understand. Probably the manufactoring world's language.
Among other things, a few controls catch your eye.

" - dat+= text("A small dial with a small lambda symbol on it. It's pointing towards a gauge that reads [].
Turn towards []
",(issuperUV ? "15nm" : "185nm"),src,(issuperUV ? "185nm" : "15nm")) + dat+= text("A small dial with a small lambda symbol on it. It's pointing towards a gauge that reads [].
Turn towards []
",(issuperUV ? "15nm" : "185nm"),src,(issuperUV ? "185nm" : "15nm")) dat+= text("A thick old-style button, with 2 grimy LED lights next to it. The [] LED is on.
Press button",(safetieson? "GREEN" : "RED"),src) dat+= text("

Close panel", user) //user << browse(dat, "window=ssu_m_panel;size=400x500") @@ -106,7 +106,7 @@ else if(!isbroken) dat+= "Suit storage unit" - dat+= "U-Stor-It Suit Storage Unit, model DS1900
" + dat+= "U-Stor-It Suit Storage Unit, model DS1900
" dat+= "Welcome to the Unit control panel.
" dat+= text("Helmet storage compartment: []
",(HELMET ? HELMET.name : "No helmet detected.")) if(HELMET && isopen) @@ -398,9 +398,9 @@ if(OCCUPANT.client) if(user != OCCUPANT) - to_chat(OCCUPANT, "The machine kicks you out!") + to_chat(OCCUPANT, "The machine kicks you out!") if(user.loc != src.loc) - to_chat(OCCUPANT, "You leave the not-so-cozy confines of the SSU.") + to_chat(OCCUPANT, "You leave the not-so-cozy confines of the SSU.") OCCUPANT.client.eye = OCCUPANT.client.mob OCCUPANT.client.perspective = MOB_PERSPECTIVE @@ -470,7 +470,7 @@ if(I.is_screwdriver()) panelopen = !panelopen playsound(src, I.usesound, 100, 1) - to_chat(user, "You [panelopen ? "open up" : "close"] the unit's maintenance panel.") + to_chat(user, "You [panelopen ? "open up" : "close"] the unit's maintenance panel.") updateUsrDialog() return if(istype(I, /obj/item/grab)) @@ -510,7 +510,7 @@ return var/obj/item/clothing/suit/space/S = I if(SUIT) - to_chat(user, "The unit already contains a suit.") + to_chat(user, "The unit already contains a suit.") return to_chat(user, "You load the [S.name] into the storage compartment.") user.drop_item() @@ -524,7 +524,7 @@ return var/obj/item/clothing/head/helmet/H = I if(HELMET) - to_chat(user, "The unit already contains a helmet.") + to_chat(user, "The unit already contains a helmet.") return to_chat(user, "You load the [H.name] into the storage compartment.") user.drop_item() @@ -538,7 +538,7 @@ return var/obj/item/clothing/mask/M = I if(MASK) - to_chat(user, "The unit already contains a mask.") + to_chat(user, "The unit already contains a mask.") return to_chat(user, "You load the [M.name] into the storage compartment.") user.drop_item() diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index 638c9732b33..58af9694c0c 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -63,7 +63,7 @@ */ set_ready_state(0) pr_mech_sleeper.start() - occupant_message("[target] successfully loaded into [src]. Life support functions engaged.") + occupant_message("[target] successfully loaded into [src]. Life support functions engaged.") chassis.visible_message("[chassis] loads [target] into [src].") log_message("[target] loaded. Life support functions engaged.") return diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index b23d1461188..6cdb6b830e2 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -645,12 +645,12 @@ internal_damage &= ~int_dam_flag switch(int_dam_flag) if(MECHA_INT_TEMP_CONTROL) - occupant_message("Life support system reactivated.") + occupant_message("Life support system reactivated.") pr_int_temp_processor.start() if(MECHA_INT_FIRE) - occupant_message("Internal fire extinquished.") + occupant_message("Internal fire extinquished.") if(MECHA_INT_TANK_BREACH) - occupant_message("Damaged internal tank has been sealed.") + occupant_message("Damaged internal tank has been sealed.") return @@ -1988,7 +1988,7 @@ if(do_after(100)) if(T == src.loc) src.clearInternalDamage(MECHA_INT_CONTROL_LOST) - src.occupant_message("Recalibration successful.") + src.occupant_message("Recalibration successful.") src.log_message("Recalibration of coordination system finished with 0 errors.") else src.occupant_message("Recalibration failed.") diff --git a/code/game/mecha/mecha_actions.dm b/code/game/mecha/mecha_actions.dm index 3c23a8d6e86..f9bbef182e5 100644 --- a/code/game/mecha/mecha_actions.dm +++ b/code/game/mecha/mecha_actions.dm @@ -263,7 +263,7 @@ defence_mode = !defence_mode if(defence_mode) deflect_chance = defence_deflect - src.occupant_message("You enable [src] defence mode.") + src.occupant_message("You enable [src] defence mode.") else deflect_chance = initial(deflect_chance) src.occupant_message("You disable [src] defence mode.") @@ -292,7 +292,7 @@ overload = 0 step_in = initial(step_in) step_energy_drain = initial(step_energy_drain) - src.occupant_message("You disable leg actuators overload.") + src.occupant_message("You disable leg actuators overload.") else overload = 1 step_in = min(1, round(step_in/2)) diff --git a/code/game/objects/structures/dancepole.dm b/code/game/objects/structures/dancepole.dm index 9c7392d317e..0c59613a7d5 100644 --- a/code/game/objects/structures/dancepole.dm +++ b/code/game/objects/structures/dancepole.dm @@ -12,9 +12,9 @@ anchored = !anchored playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(anchored) - to_chat(user, "You secure \the [src].") + to_chat(user, "You secure \the [src].") else - to_chat(user, "You unsecure \the [src].") + to_chat(user, "You unsecure \the [src].") if(istype(O, /obj/item/weldingtool)) var/obj/item/weldingtool/WT = O diff --git a/code/game/verbs/advanced_who.dm b/code/game/verbs/advanced_who.dm index 25016efd073..fa1040db7bc 100644 --- a/code/game/verbs/advanced_who.dm +++ b/code/game/verbs/advanced_who.dm @@ -62,7 +62,7 @@ if(isobserver(C.mob)) entry += " - Observing" else if(istype(C.mob, /mob/new_player)) - entry += " - In Lobby" + entry += " - In Lobby" else entry += " - Playing" Lines += entry diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm index 796bc3cd299..365ca5e2f52 100644 --- a/code/modules/admin/DB ban/functions.dm +++ b/code/modules/admin/DB ban/functions.dm @@ -72,7 +72,7 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = var/sql = "INSERT INTO erro_ban (`id`,`bantime`,`serverip`,`bantype`,`reason`,`job`,`duration`,`rounds`,`expiration_time`,`ckey`,`computerid`,`ip`,`a_ckey`,`a_computerid`,`a_ip`,`who`,`adminwho`,`edits`,`unbanned`,`unbanned_datetime`,`unbanned_ckey`,`unbanned_computerid`,`unbanned_ip`) VALUES (null, Now(), '[serverip]', '[bantype_str]', '[reason]', '[job]', [(duration)?"[duration]":"0"], [(rounds)?"[rounds]":"0"], Now() + INTERVAL [(duration>0) ? duration : 0] MINUTE, '[ckey]', '[computerid]', '[ip]', '[a_ckey]', '[a_computerid]', '[a_ip]', '[who]', '[adminwho]', '', null, null, null, null, null)" var/DBQuery/query_insert = dbcon.NewQuery(sql) query_insert.Execute() - to_chat(usr, "Ban saved to database.") + to_chat(usr, "Ban saved to database.") message_admins("[key_name_admin(usr)] has added a [bantype_str] for [ckey] [(job)?"([job])":""] [(duration > 0)?"([duration] minutes)":""] with the reason: \"[reason]\" to the ban database.",1) diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm index a2c9f80e13c..cc0bee6b678 100644 --- a/code/modules/admin/IsBanned.dm +++ b/code/modules/admin/IsBanned.dm @@ -38,14 +38,14 @@ world/IsBanned(key,address,computer_id,type,real_bans_only=FALSE) //Guest Checking if(!config_legacy.guests_allowed && IsGuestKey(key)) log_adminwarn("Failed Login: [key] - Guests not allowed") - message_admins("Failed Login: [key] - Guests not allowed") + message_admins("Failed Login: [key] - Guests not allowed") key_cache[key] = 0 return list("reason"="guest", "desc"="\nReason: Guests not allowed. Please sign in with a byond account.") //check if the IP address is a known TOR node if(config && config_legacy.ToRban && ToRban_isbanned(address)) log_adminwarn("Failed Login: [src] - Banned: ToR") - message_admins("Failed Login: [src] - Banned: ToR") + message_admins("Failed Login: [src] - Banned: ToR") //ban their computer_id and ckey for posterity AddBan(ckey, computer_id, "Use of ToR", "Automated Ban", 0, 0) key_cache[key] = 0 @@ -58,7 +58,7 @@ world/IsBanned(key,address,computer_id,type,real_bans_only=FALSE) . = CheckBan( ckey, computer_id, address ) if(.) log_adminwarn("Failed Login: [key] [computer_id] [address] - Banned [.["reason"]]") - message_admins("Failed Login: [key] id:[computer_id] ip:[address] - Banned [.["reason"]]") + message_admins("Failed Login: [key] id:[computer_id] ip:[address] - Banned [.["reason"]]") key_cache[key] = 0 return . key_cache[key] = 0 diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index b6802df23fc..f8de7199aae 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -168,7 +168,7 @@ var/savefile/Banlist /datum/admins/proc/unbanpanel() var/count = 0 var/dat - //var/dat = "
Unban Player: (U) = Unban , (E) = Edit Ban (Total
" + //var/dat = "
Unban Player:(U) = Unban , (E) = Edit Ban (Total
" Banlist.cd = "/base" for (var/A in Banlist.dir) count++ diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index b78555dad9d..de1c41ebee3 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -854,7 +854,7 @@ var/datum/announcement/minor/admin_min_announcer = new SSticker.current_state = GAME_STATE_SETTING_UP Master.SetRunLevel(RUNLEVEL_SETUP) log_admin("[usr.key] has started the game.") - message_admins("[usr.key] has started the game.") + message_admins("[usr.key] has started the game.") feedback_add_details("admin_verb","SN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return 1 else @@ -871,7 +871,7 @@ var/datum/announcement/minor/admin_min_announcer = new else to_chat(world, "New players may now enter the game.") log_admin("[key_name(usr)] toggled new player game entering.") - message_admins("[key_name_admin(usr)] toggled new player game entering.", 1) + message_admins("[key_name_admin(usr)] toggled new player game entering.", 1) world.update_status() feedback_add_details("admin_verb","TE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -897,7 +897,7 @@ var/datum/announcement/minor/admin_min_announcer = new to_chat(world, "Returning to menu as a ghost is now allowed.") else to_chat(world, "Returning to menu as a ghost is no longer allowed :(") - message_admins("[key_name_admin(usr)] toggled respawn to [config_legacy.abandon_allowed ? "On" : "Off"].", 1) + message_admins("[key_name_admin(usr)] toggled respawn to [config_legacy.abandon_allowed ? "On" : "Off"].", 1) log_admin("[key_name(usr)] toggled respawn to [config_legacy.abandon_allowed ? "On" : "Off"].") world.update_status() feedback_add_details("admin_verb","TR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -959,7 +959,7 @@ var/datum/announcement/minor/admin_min_announcer = new set desc="Toggle admin jumping" set name="Toggle Jump" config_legacy.allow_admin_jump = !(config_legacy.allow_admin_jump) - message_admins("Toggled admin jumping to [config_legacy.allow_admin_jump].") + message_admins("Toggled admin jumping to [config_legacy.allow_admin_jump].") feedback_add_details("admin_verb","TJ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/adspawn() @@ -967,7 +967,7 @@ var/datum/announcement/minor/admin_min_announcer = new set desc="Toggle admin spawning" set name="Toggle Spawn" config_legacy.allow_admin_spawning = !(config_legacy.allow_admin_spawning) - message_admins("Toggled admin item spawning to [config_legacy.allow_admin_spawning].") + message_admins("Toggled admin item spawning to [config_legacy.allow_admin_spawning].") feedback_add_details("admin_verb","TAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/adrev() @@ -975,7 +975,7 @@ var/datum/announcement/minor/admin_min_announcer = new set desc="Toggle admin revives" set name="Toggle Revive" config_legacy.allow_admin_rev = !(config_legacy.allow_admin_rev) - message_admins("Toggled reviving to [config_legacy.allow_admin_rev].") + message_admins("Toggled reviving to [config_legacy.allow_admin_rev].") feedback_add_details("admin_verb","TAR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/unprison(var/mob/M in GLOB.mob_list) @@ -1231,7 +1231,7 @@ var/datum/announcement/minor/admin_min_announcer = new else to_chat(world, "Guests may now enter the game.") log_admin("[key_name(usr)] toggled guests game entering [config_legacy.guests_allowed?"":"dis"]allowed.") - message_admins("[key_name_admin(usr)] toggled guests game entering [config_legacy.guests_allowed?"":"dis"]allowed.", 1) + message_admins("[key_name_admin(usr)] toggled guests game entering [config_legacy.guests_allowed?"":"dis"]allowed.", 1) feedback_add_details("admin_verb","TGU") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/output_ai_laws() diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 0c26656debb..86200c652b9 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -527,7 +527,7 @@ var/list/admin_verbs_event_manager = list( mob.alpha = max(mob.alpha + 100, 255) else mob.invisibility = INVISIBILITY_OBSERVER - to_chat(mob, "Invisimin on. You are now as invisible as a ghost.") + to_chat(mob, "Invisimin on. You are now as invisible as a ghost.") mob.alpha = max(mob.alpha - 100, 0) /* @@ -717,7 +717,7 @@ var/list/admin_verbs_event_manager = list( var/light_impact_range = input("Light impact range (in tiles):") as num var/flash_range = input("Flash range (in tiles):") as num explosion(epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range) - message_admins("[ckey] creating an admin explosion at [epicenter.loc].") + message_admins("[ckey] creating an admin explosion at [epicenter.loc].") feedback_add_details("admin_verb","DB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/give_disease2(mob/T as mob in GLOB.mob_list) // -- Giacom @@ -749,7 +749,7 @@ var/list/admin_verbs_event_manager = list( feedback_add_details("admin_verb","GD2") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] gave [key_name(T)] a [greater] disease2 with infection chance [D.infectionchance].") - message_admins("[key_name_admin(usr)] gave [key_name(T)] a [greater] disease2 with infection chance [D.infectionchance].", 1) + message_admins("[key_name_admin(usr)] gave [key_name(T)] a [greater] disease2 with infection chance [D.infectionchance].", 1) /client/proc/admin_give_modifier(var/mob/living/L) set category = "Debug" @@ -786,7 +786,7 @@ var/list/admin_verbs_event_manager = list( for (var/mob/V in hearers(O)) V.show_message(message, 2) log_admin("[key_name(usr)] made [O] at [O.x], [O.y], [O.z]. make a sound") - message_admins("[key_name_admin(usr)] made [O] at [O.x], [O.y], [O.z]. make a sound.", 1) + message_admins("[key_name_admin(usr)] made [O] at [O.x], [O.y], [O.z]. make a sound.", 1) feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -820,7 +820,7 @@ var/list/admin_verbs_event_manager = list( to_chat(usr, "Disabled air processing.") feedback_add_details("admin_verb","KA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] used 'kill air'.") - message_admins("[key_name_admin(usr)] used 'kill air'.", 1) + message_admins("[key_name_admin(usr)] used 'kill air'.", 1) /client/proc/readmin_self() set name = "Re-Admin self" @@ -1071,7 +1071,7 @@ var/list/admin_verbs_event_manager = list( to_chat(T, "Move along.") log_admin("[key_name(usr)] told [key_name(T)] to man up and deal with it.") - message_admins("[key_name_admin(usr)] told [key_name(T)] to man up and deal with it.", 1) + message_admins("[key_name_admin(usr)] told [key_name(T)] to man up and deal with it.", 1) /client/proc/global_man_up() set category = "Fun" @@ -1085,7 +1085,7 @@ var/list/admin_verbs_event_manager = list( SEND_SOUND(T, sound('sound/voice/ManUp1.ogg')) log_admin("[key_name(usr)] told everyone to man up and deal with it.") - message_admins("[key_name_admin(usr)] told everyone to man up and deal with it.", 1) + message_admins("[key_name_admin(usr)] told everyone to man up and deal with it.", 1) /client/proc/give_spell(mob/T as mob in GLOB.mob_list) // -- Urist set category = "Fun" @@ -1096,7 +1096,7 @@ var/list/admin_verbs_event_manager = list( T.spell_list += new S feedback_add_details("admin_verb","GS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] gave [key_name(T)] the spell [S].") - message_admins("[key_name_admin(usr)] gave [key_name(T)] the spell [S].", 1) + message_admins("[key_name_admin(usr)] gave [key_name(T)] the spell [S].", 1) /client/proc/toggle_AI_interact() set name = "Toggle Admin AI Interact" diff --git a/code/modules/admin/callproc/callproc.dm b/code/modules/admin/callproc/callproc.dm index 474a84366e5..4590b28971b 100644 --- a/code/modules/admin/callproc/callproc.dm +++ b/code/modules/admin/callproc/callproc.dm @@ -189,7 +189,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) . = "" if(islist(returnval)) var/list/returnedlist = returnval - . = "" + . = "" if(returnedlist.len) var/assoc_check = returnedlist[1] if(istext(assoc_check) && (returnedlist[assoc_check] != null)) @@ -206,4 +206,4 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) . += "" else - . = "[procname] returned: [!isnull(returnval) ? returnval : "null"]" + . = "[procname] returned: [!isnull(returnval) ? returnval : "null"]" diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm index 7d8897b2cb6..324e599a446 100644 --- a/code/modules/admin/newbanjob.dm +++ b/code/modules/admin/newbanjob.dm @@ -206,7 +206,7 @@ var/savefile/Banlistjob /datum/admins/proc/unjobbanpanel() var/count = 0 var/dat - //var/dat = "
Unban Player: (U) = Unban , (E) = Edit Ban (Total
>" + //var/dat = "
Unban Player: (U) = Unban , (E) = Edit Ban (Total
>" Banlistjob.cd = "/base" for (var/A in Banlistjob.dir) count++ @@ -226,7 +226,7 @@ var/savefile/Banlistjob else to_chat(M, "No ban appeals URL has been set.") log_admin("[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.") - message_admins("[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.") + message_admins("[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.") /datum/admins/proc/timejobban(ckey, computerid, reason, bannedby, temp, minutes, rank) if(AddBanjob(ckey, computerid, reason, usr.ckey, 1, mins, job)) to_chat(M, "You have been jobbanned from [job] by [usr.client.ckey].\nReason: [reason].") @@ -236,7 +236,7 @@ var/savefile/Banlistjob else to_chat(M, "No ban appeals URL has been set.") log_admin("[usr.client.ckey] has jobbanned from [job] [ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") - message_admins("[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")*/ + message_admins("[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")*/ //////////////////////////////////// DEBUG //////////////////////////////////// /proc/CreateBansjob() diff --git a/code/modules/admin/permissionverbs/permissionedit.dm b/code/modules/admin/permissionverbs/permissionedit.dm index 750f57481ca..9db3408ee8f 100644 --- a/code/modules/admin/permissionverbs/permissionedit.dm +++ b/code/modules/admin/permissionverbs/permissionedit.dm @@ -85,14 +85,14 @@ insert_query.Execute() var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.`erro_admin_log` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Added new admin [adm_ckey] to rank [new_rank]');") log_query.Execute() - to_chat(usr, "New admin added.") + to_chat(usr, "New admin added.") else if(!isnull(admin_id) && isnum(admin_id)) var/DBQuery/insert_query = dbcon.NewQuery("UPDATE `erro_admin` SET rank = '[new_rank]' WHERE id = [admin_id]") insert_query.Execute() var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.`erro_admin_log` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Edited the rank of [adm_ckey] to [new_rank]');") log_query.Execute() - to_chat(usr, "Admin rank changed.") + to_chat(usr, "Admin rank changed.") /datum/admins/proc/log_admin_permission_modification(var/adm_ckey, var/new_permission) if(config_legacy.admin_legacy_system) return @@ -140,10 +140,10 @@ insert_query.Execute() var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.`erro_admin_log` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Removed permission [rights2text(new_permission)] (flag = [new_permission]) to admin [adm_ckey]');") log_query.Execute() - to_chat(usr, "Permission removed.") + to_chat(usr, "Permission removed.") else //This admin doesn't have this permission, so we are adding it. var/DBQuery/insert_query = dbcon.NewQuery("UPDATE `erro_admin` SET flags = '[admin_rights | new_permission]' WHERE id = [admin_id]") insert_query.Execute() var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.`erro_admin_log` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Added permission [rights2text(new_permission)] (flag = [new_permission]) to admin [adm_ckey]')") log_query.Execute() - to_chat(usr, "Permission added.") + to_chat(usr, "Permission added.") diff --git a/code/modules/admin/player_notes.dm b/code/modules/admin/player_notes.dm index dee9a693664..d9f4f68a213 100644 --- a/code/modules/admin/player_notes.dm +++ b/code/modules/admin/player_notes.dm @@ -103,7 +103,7 @@ datum/admins/proc/notes_gethtml(var/ckey) infos += P info << infos - message_admins("[key_name_admin(user)] has edited [key]'s notes.") + message_admins("[key_name_admin(user)] has edited [key]'s notes.") log_admin("[key_name(user)] has edited [key]'s notes.") del(info) // savefile, so NOT qdel @@ -128,7 +128,7 @@ datum/admins/proc/notes_gethtml(var/ckey) infos.Remove(item) info << infos - message_admins("[key_name_admin(usr)] deleted one of [key]'s notes.") + message_admins("[key_name_admin(usr)] deleted one of [key]'s notes.") log_admin("[key_name(usr)] deleted one of [key]'s notes.") qdel(info) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 37d0c7beaf9..0e27779ece3 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -211,7 +211,7 @@ if (SSemergencyshuttle.can_call()) SSemergencyshuttle.call_evac() log_admin("[key_name(usr)] called the Emergency Shuttle") - message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station.", 1) + message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station.", 1) if("2") if (!( SSticker ) || !SSemergencyshuttle.location()) @@ -219,12 +219,12 @@ if (SSemergencyshuttle.can_call()) SSemergencyshuttle.call_evac() log_admin("[key_name(usr)] called the Emergency Shuttle") - message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station.", 1) + message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station.", 1) else if (SSemergencyshuttle.can_recall()) SSemergencyshuttle.recall() log_admin("[key_name(usr)] sent the Emergency Shuttle back") - message_admins("[key_name_admin(usr)] sent the Emergency Shuttle back.", 1) + message_admins("[key_name_admin(usr)] sent the Emergency Shuttle back.", 1) href_list["secretsadmin"] = "check_antagonist" @@ -237,14 +237,14 @@ SSemergencyshuttle.launch_time = world.time + new_time_left*10 log_admin("[key_name(usr)] edited the Emergency Shuttle's launch time to [new_time_left]") - message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's launch time to [new_time_left*10]", 1) + message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's launch time to [new_time_left*10]", 1) else if (SSemergencyshuttle.shuttle.has_arrive_time()) var/new_time_left = input("Enter new shuttle arrival time (seconds):","Edit Shuttle Arrival Time", SSemergencyshuttle.estimate_arrival_time() ) as num SSemergencyshuttle.shuttle.arrive_time = world.time + new_time_left*10 log_admin("[key_name(usr)] edited the Emergency Shuttle's arrival time to [new_time_left]") - message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's arrival time to [new_time_left*10]", 1) + message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's arrival time to [new_time_left*10]", 1) else alert("The shuttle is neither counting down to launch nor is it in transit. Please try again when it is.") @@ -255,7 +255,7 @@ SSticker.delay_end = !SSticker.delay_end log_admin("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].") - message_admins("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1) + message_admins("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1) href_list["secretsadmin"] = "check_antagonist" else if(href_list["simplemake"]) @@ -273,7 +273,7 @@ if("Yes") delmob = 1 log_admin("[key_name(usr)] has used rudimentary transformation on [key_name(M)]. Transforming to [href_list["simplemake"]]; deletemob=[delmob]") - message_admins("[key_name_admin(usr)] has used rudimentary transformation on [key_name_admin(M)]. Transforming to [href_list["simplemake"]]; deletemob=[delmob]", 1) + message_admins("[key_name_admin(usr)] has used rudimentary transformation on [key_name_admin(M)]. Transforming to [href_list["simplemake"]]; deletemob=[delmob]", 1) switch(href_list["simplemake"]) if("observer") M.change_mob_type( /mob/observer/dead , null, null, delmob ) @@ -353,7 +353,7 @@ log_admin("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]") ban_unban_log_save("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]") - message_admins("[key_name_admin(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]", 1) + message_admins("[key_name_admin(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]", 1) Banlist.cd = "/base/[banfolder]" Banlist["reason"] << reason Banlist["temp"] << temp @@ -754,7 +754,7 @@ else msg += ", [job]" notes_add(M.ckey, "Banned from [msg] - [reason]", usr) - message_admins("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg] for [mins] minutes", 1) + message_admins("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg] for [mins] minutes", 1) to_chat(M, "You have been jobbanned by [usr.client.ckey] from: [msg].") to_chat(M, "The reason is: [reason]") to_chat(M, "This jobban will be lifted in [mins] minutes.") @@ -775,7 +775,7 @@ if(!msg) msg = job else msg += ", [job]" notes_add(M.ckey, "Banned from [msg] - [reason]", usr) - message_admins("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg]", 1) + message_admins("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg]", 1) to_chat(M, "You have been jobbanned by [usr.client.ckey] from: [msg].") to_chat(M, "The reason is: [reason]") to_chat(M, "Jobban can be lifted only upon request.") @@ -808,7 +808,7 @@ else continue if(msg) - message_admins("[key_name_admin(usr)] unbanned [key_name_admin(M)] from [msg]", 1) + message_admins("[key_name_admin(usr)] unbanned [key_name_admin(M)] from [msg]", 1) to_chat(M, "You have been un-jobbanned by [usr.client.ckey] from [msg].") href_list["jobban2"] = 1 // lets it fall through and refresh return 1 @@ -825,7 +825,7 @@ to_chat(M, span("critical", "You have been kicked from the server: [reason]")) log_admin("[key_name(usr)] booted [key_name(M)] for reason: '[reason]'.") - message_admins("[key_name_admin(usr)] booted [key_name_admin(M)] for reason '[reason]'.", 1) + message_admins("[key_name_admin(usr)] booted [key_name_admin(M)] for reason '[reason]'.", 1) //M.client = null qdel(M.client) @@ -836,7 +836,7 @@ if(t) if((alert("Do you want to unjobban [t]?","Unjobban confirmation", "Yes", "No") == "Yes") && t) //No more misclicks! Unless you do it twice. log_admin("[key_name(usr)] removed [t]") - message_admins("[key_name_admin(usr)] removed [t]", 1) + message_admins("[key_name_admin(usr)] removed [t]", 1) jobban_remove(t) href_list["ban"] = 1 // lets it fall through and refresh var/t_split = splittext(t, " - ") @@ -883,7 +883,7 @@ else to_chat(M, "No ban appeals URL has been set.") log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") - message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") + message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") var/datum/admin_help/AH = M.client ? M.client.current_ticket : null if(AH) AH.Resolve() @@ -909,7 +909,7 @@ ban_unban_log_save("[usr.client.ckey] has permabanned [M.ckey]. - Reason: [reason] - This is a permanent ban.") notes_add(M.ckey,"[usr.client.ckey] has permabanned [M.ckey]. - Reason: [reason] - This is a permanent ban.",usr) log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.") - message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.") + message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.") feedback_inc("ban_perma",1) DB_ban_record(BANTYPE_PERMA, M, -1, reason) var/datum/admin_help/AH = M.client ? M.client.current_ticket : null @@ -967,8 +967,8 @@ return alert(usr, "The game has already started.", null, null, null, null) master_mode = href_list["c_mode2"] log_admin("[key_name(usr)] set the mode as [config_legacy.mode_names[master_mode]].") - message_admins("[key_name_admin(usr)] set the mode as [config_legacy.mode_names[master_mode]].", 1) - to_chat(world, "The mode is now: [config_legacy.mode_names[master_mode]]") + message_admins("[key_name_admin(usr)] set the mode as [config_legacy.mode_names[master_mode]].", 1) + to_chat(world, "The mode is now: [config_legacy.mode_names[master_mode]]") Game() // updates the main game menu world.save_mode(master_mode) .(href, list("c_mode"=1)) @@ -982,7 +982,7 @@ return alert(usr, "The game mode has to be secret!", null, null, null, null) secret_force_mode = href_list["f_secret2"] log_admin("[key_name(usr)] set the forced secret mode as [secret_force_mode].") - message_admins("[key_name_admin(usr)] set the forced secret mode as [secret_force_mode].", 1) + message_admins("[key_name_admin(usr)] set the forced secret mode as [secret_force_mode].", 1) Game() // updates the main game menu .(href, list("f_secret"=1)) @@ -995,7 +995,7 @@ return log_admin("[key_name(usr)] attempting to monkeyize [key_name(H)]") - message_admins("[key_name_admin(usr)] attempting to monkeyize [key_name_admin(H)]", 1) + message_admins("[key_name_admin(usr)] attempting to monkeyize [key_name_admin(H)]", 1) H.monkeyize() else if(href_list["corgione"]) @@ -1007,7 +1007,7 @@ return log_admin("[key_name(usr)] attempting to corgize [key_name(H)]") - message_admins("[key_name_admin(usr)] attempting to corgize [key_name_admin(H)]", 1) + message_admins("[key_name_admin(usr)] attempting to corgize [key_name_admin(H)]", 1) H.corgize() else if(href_list["forcespeech"]) @@ -1022,7 +1022,7 @@ M.say(speech) speech = sanitize(speech) // Nah, we don't trust them log_admin("[key_name(usr)] forced [key_name(M)] to say: [speech]") - message_admins("[key_name_admin(usr)] forced [key_name_admin(M)] to say: [speech]") + message_admins("[key_name_admin(usr)] forced [key_name_admin(M)] to say: [speech]") else if(href_list["sendtoprison"]) if(!check_rights(R_ADMIN)) return @@ -1062,7 +1062,7 @@ to_chat(M, "You have been sent to the prison station!") log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.") - message_admins("[key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1) + message_admins("[key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1) else if(href_list["tdome1"]) if(!check_rights(R_FUN)) return @@ -1085,7 +1085,7 @@ sleep(5) M.loc = pick(tdome1) spawn(50) - to_chat(M, "You have been sent to the Thunderdome.") + to_chat(M, "You have been sent to the Thunderdome.") log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 1)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 1)", 1) @@ -1110,7 +1110,7 @@ sleep(5) M.loc = pick(tdome2) spawn(50) - to_chat(M, "You have been sent to the Thunderdome.") + to_chat(M, "You have been sent to the Thunderdome.") log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 2)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 2)", 1) @@ -1132,7 +1132,7 @@ sleep(5) M.loc = pick(tdomeadmin) spawn(50) - to_chat(M, "You have been sent to the Thunderdome.") + to_chat(M, "You have been sent to the Thunderdome.") log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Admin.)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Admin.)", 1) @@ -1161,7 +1161,7 @@ sleep(5) M.loc = pick(tdomeobserve) spawn(50) - to_chat(M, "You have been sent to the Thunderdome.") + to_chat(M, "You have been sent to the Thunderdome.") log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Observer.)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Observer.)", 1) @@ -1386,7 +1386,7 @@ log_admin("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]") message_admins("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]") feedback_inc("admin_cookies_spawned",1) - to_chat(H, "Your prayers have been answered!! You received the best cookie!") + to_chat(H, "Your prayers have been answered!! You received the best cookie!") else if(href_list["adminspawntreat"]) if(!check_rights(R_ADMIN|R_FUN)) return @@ -1410,7 +1410,7 @@ log_admin("[key_name(H)] got their treat, spawned by [key_name(src.owner)]") message_admins("[key_name(H)] got their treat, spawned by [key_name(src.owner)]") feedback_inc("admin_cookies_spawned",1) - to_chat(H, "Your prayers have been answered!! You are the bestest!") + to_chat(H, "Your prayers have been answered!! You are the bestest!") else if(href_list["adminsmite"]) if(!check_rights(R_ADMIN|R_FUN)) return diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 1559a23fd03..5b8a1ac2e46 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -190,8 +190,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick/ticket_list) _interactions = list() if(is_bwoink) - AddInteraction("[key_name_admin(usr)] PM'd [LinkedReplyName()]") - message_admins("Ticket [TicketHref("#[id]")] created") + AddInteraction("[key_name_admin(usr)] PM'd [LinkedReplyName()]") + message_admins("Ticket [TicketHref("#[id]")] created") else MessageNoRecipient(parsed_message) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index c47dcb5162c..59e3454b341 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -70,7 +70,7 @@ if(!holder && !current_ticket) //no ticket? https://www.youtube.com/watch?v=iHSPf6x1Fdo to_chat(src, "You can no longer reply to this ticket, please open another one by using the Adminhelp verb if need be.") - to_chat(src, "Message: [msg]") + to_chat(src, "Message: [msg]") return var/client/recipient @@ -143,7 +143,7 @@ var/keywordparsedmsg = keywords_lookup(msg) if(irc) - to_chat(src, "PM to-Admins: [rawmsg]") + to_chat(src, "PM to-Admins: [rawmsg]") admin_ticket_log(src, "Reply PM from-[key_name(src, TRUE, TRUE)] to IRC: [keywordparsedmsg]") ircreplyamount-- send2irc("Reply: [ckey]",rawmsg) @@ -151,7 +151,7 @@ if(recipient.holder) if(holder) //both are admins to_chat(recipient, "Admin PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]") - to_chat(src, "Admin PM to-[key_name(recipient, src, 1)]: [keywordparsedmsg]") + to_chat(src, "Admin PM to-[key_name(recipient, src, 1)]: [keywordparsedmsg]") //omg this is dumb, just fill in both their tickets var/interaction_message = "PM from-[key_name(src, recipient, 1)] to-[key_name(recipient, src, 1)]: [keywordparsedmsg]" @@ -163,7 +163,7 @@ var/replymsg = "Reply PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]" admin_ticket_log(src, replymsg) to_chat(recipient, replymsg) - to_chat(src, "PM to-Admins: [msg]") + to_chat(src, "PM to-Admins: [msg]") //play the recieving admin the adminhelp sound (if they have them enabled) if(recipient.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping)) @@ -177,9 +177,9 @@ to_chat(recipient, "-- Administrator private message --") to_chat(recipient, "Admin PM from-[key_name(src, recipient, 0)]: [msg]") to_chat(recipient, "Click on the administrator's name to reply.") - to_chat(src, "Admin PM to-[key_name(recipient, src, 1)]: [msg]") + to_chat(src, "Admin PM to-[key_name(recipient, src, 1)]: [msg]") - admin_ticket_log(recipient, "PM From [key_name_admin(src)]: [keywordparsedmsg]") + admin_ticket_log(recipient, "PM From [key_name_admin(src)]: [keywordparsedmsg]") //always play non-admin recipients the adminhelp sound SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg')) @@ -204,13 +204,13 @@ if(irc) log_admin("PM: [key_name(src)]->IRC: [rawmsg]") for(var/client/X in admins) - to_chat(X, "PM: [key_name(src, X, 0)]->IRC: [keywordparsedmsg]") + to_chat(X, "PM: [key_name(src, X, 0)]->IRC: [keywordparsedmsg]") else log_admin("PM: [key_name(src)]->[key_name(recipient)]: [rawmsg]") //we don't use message_admins here because the sender/receiver might get it too for(var/client/X in admins) if(X.key!=key && X.key!=recipient.key) //check client/X is an admin and isn't the sender or recipient - to_chat(X, "PM: [key_name(src, X, 0)]->[key_name(recipient, X, 0)]: [keywordparsedmsg]" ) + to_chat(X, "PM: [key_name(src, X, 0)]->[key_name(recipient, X, 0)]: [keywordparsedmsg]" ) /proc/IrcPm(target,msg,sender) var/client/C = GLOB.directory[target] @@ -263,7 +263,7 @@ to_chat(C, "Admin PM from-[adminname]: [msg]") to_chat(C, "Click on the administrator's name to reply.") - admin_ticket_log(C, "PM From [irc_tagged]: [msg]") + admin_ticket_log(C, "PM From [irc_tagged]: [msg]") window_flash(C) //always play non-admin recipients the adminhelp sound diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 2fb5157f32b..943416656ad 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -84,11 +84,11 @@ var/datum/gas_mixture/env = T.return_air() - var/t = "Coordinates: [T.x],[T.y],[T.z]\n" + var/t = "Coordinates: [T.x],[T.y],[T.z]\n" t += "Temperature: [env.temperature]\n" t += "Pressure: [env.return_pressure()]kPa\n" for(var/g in env.gas) - t += "[g]: [env.gas[g]] / [env.gas[g] * R_IDEAL_GAS_EQUATION * env.temperature / env.volume]kPa\n" + t += "[g]: [env.gas[g]] / [env.gas[g] * R_IDEAL_GAS_EQUATION * env.temperature / env.volume]kPa\n" usr.show_message(t, 1) feedback_add_details("admin_verb","ASL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -327,7 +327,7 @@ alert("Invalid mob") feedback_add_details("admin_verb","GFA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(src)] has granted [M.key] full access.") - message_admins("[key_name_admin(usr)] has granted [M.key] full access.", 1) + message_admins("[key_name_admin(usr)] has granted [M.key] full access.", 1) /client/proc/cmd_assume_direct_control(var/mob/M in GLOB.mob_list) set category = "Admin" @@ -341,7 +341,7 @@ else var/mob/observer/dead/ghost = new/mob/observer/dead(M,1) ghost.ckey = M.ckey - message_admins("[key_name_admin(usr)] assumed direct control of [M].", 1) + message_admins("[key_name_admin(usr)] assumed direct control of [M].", 1) log_admin("[key_name(usr)] assumed direct control of [M].") var/mob/adminmob = src.mob M.ckey = src.ckey @@ -601,7 +601,7 @@ log_admin("[key_name(usr)] setup the supermatter engine [response == "Setup except coolant" ? "without coolant" : ""]") - message_admins("[key_name_admin(usr)] setup the supermatter engine [response == "Setup except coolant" ? "without coolant": ""]", 1) + message_admins("[key_name_admin(usr)] setup the supermatter engine [response == "Setup except coolant" ? "without coolant": ""]", 1) return diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 4534d4e5ac5..4dc6957de7f 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -17,7 +17,7 @@ return var/image/cross = image('icons/obj/storage.dmi',"bible") - msg = "[icon2html(thing = cross, target = world)] PRAY: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src, src)]) (CA) (SC) (ST) (SMITE): [msg]" + msg = "[icon2html(thing = cross, target = world)] PRAY: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src, src)]) (CA) (SC) (ST) (SMITE): [msg]" for(var/client/C in admins) if((R_ADMIN|R_MOD) & C.holder.rights) @@ -30,14 +30,14 @@ //log_admin("HELP: [key_name(src)]: [msg]") /proc/CentCom_announce(var/msg, var/mob/Sender, var/iamessage) - msg = "[uppertext(GLOB.using_map.boss_short)]M[iamessage ? " IA" : ""]:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender, null)]) (CA) (BSA) (RPLY): [msg]" + msg = "[uppertext(GLOB.using_map.boss_short)]M[iamessage ? " IA" : ""]:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender, null)]) (CA) (BSA) (RPLY): [msg]" for(var/client/C in admins) if((R_ADMIN|R_MOD) & C.holder.rights) to_chat(C, msg) SEND_SOUND(C, sound('sound/machines/signal.ogg')) /proc/Syndicate_announce(var/msg, var/mob/Sender) - msg = "ILLEGAL:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender, null)]) (CA) (BSA) (RPLY): [msg]" + msg = "ILLEGAL:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender, null)]) (CA) (BSA) (RPLY): [msg]" for(var/client/C in admins) if((R_ADMIN|R_MOD) & C.holder.rights) to_chat(C, msg) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 1282c26b7f9..f8db14c0247 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -40,7 +40,7 @@ spawn(50) to_chat(M, "You have been sent to the prison station!") log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.") - message_admins("[key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1) + message_admins("[key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1) feedback_add_details("admin_verb","PRISON") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //Allows staff to determine who the newer players are. @@ -170,7 +170,7 @@ to_chat(src, "Only administrators may use this command.") return M.status_flags ^= GODMODE - to_chat(usr, " Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"]") + to_chat(usr, " Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"]") log_admin("[key_name(usr)] has toggled [key_name(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]") var/msg = "[key_name_admin(usr)] has toggled [ADMIN_LOOKUPFLW(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]" @@ -338,10 +338,10 @@ Ccomp's first proc. for(var/mob/observer/dead/g in get_ghosts()) if(!g.client.holder) // Add the verb back for all non-admin ghosts g.verbs += /mob/observer/dead/verb/toggle_antagHUD - to_chat(g, "The Administrator has enabled AntagHUD ") // Notify all observers they can now use AntagHUD + to_chat(g, "The Administrator has enabled AntagHUD ") // Notify all observers they can now use AntagHUD config_legacy.antag_hud_allowed = 1 action = "enabled" - to_chat(src, "AntagHUD usage has been enabled") + to_chat(src, "AntagHUD usage has been enabled") log_admin("[key_name(usr)] has [action] antagHUD usage for observers") @@ -358,10 +358,10 @@ Ccomp's first proc. var/action="" if(config_legacy.antag_hud_restricted) for(var/mob/observer/dead/g in get_ghosts()) - to_chat(g, "The administrator has lifted restrictions on joining the round if you use AntagHUD") + to_chat(g, "The administrator has lifted restrictions on joining the round if you use AntagHUD") action = "lifted restrictions" config_legacy.antag_hud_restricted = 0 - to_chat(src, "AntagHUD restrictions have been lifted") + to_chat(src, "AntagHUD restrictions have been lifted") else for(var/mob/observer/dead/g in get_ghosts()) to_chat(g, "The administrator has placed restrictions on joining the round if you use AntagHUD") @@ -724,7 +724,7 @@ Traitors and the like can also be revived with the previous role mostly intact. mob.gib() log_admin("[key_name(usr)] used gibself.") - message_admins("[key_name_admin(usr)] used gibself.", 1) + message_admins("[key_name_admin(usr)] used gibself.", 1) feedback_add_details("admin_verb","GIBS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /* /client/proc/cmd_manual_ban() @@ -762,7 +762,7 @@ Traitors and the like can also be revived with the previous role mostly intact. to_chat(M, "This is a temporary ban, it will be removed in [mins] minutes.") to_chat(M, "To try to resolve this matter head to http://ss13.donglabs.com/forum/") log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") - message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") + message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") world.Export("http://216.38.134.132/adminlog.php?type=ban&key=[usr.client.key]&key2=[M.key]&msg=[html_decode(reason)]&time=[mins]&server=[replacetext(config_legacy.server_name, "#", "")]") del(M.client) qdel(M) @@ -777,7 +777,7 @@ Traitors and the like can also be revived with the previous role mostly intact. to_chat(M, "This is a permanent ban.") to_chat(M, "To try to resolve this matter head to http://ss13.donglabs.com/forum/") log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.") - message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.") + message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.") world.Export("http://216.38.134.132/adminlog.php?type=ban&key=[usr.client.key]&key2=[M.key]&msg=[html_decode(reason)]&time=perma&server=[replacetext(config_legacy.server_name, "#", "")]") del(M.client) qdel(M) @@ -842,7 +842,7 @@ Traitors and the like can also be revived with the previous role mostly intact. mob.set_viewsize(view) log_admin("[key_name(usr)] changed their view range to [view].") - //message_admins("[key_name_admin(usr)] changed their view range to [view].", 1) //why? removed by order of XSI + //message_admins("[key_name_admin(usr)] changed their view range to [view].", 1) //why? removed by order of XSI feedback_add_details("admin_verb","CVRA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -876,7 +876,7 @@ Traitors and the like can also be revived with the previous role mostly intact. feedback_add_details("admin_verb","CSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] admin-called the emergency shuttle.") - message_admins("[key_name_admin(usr)] admin-called the emergency shuttle.", 1) + message_admins("[key_name_admin(usr)] admin-called the emergency shuttle.", 1) return /client/proc/admin_cancel_shuttle() @@ -893,7 +893,7 @@ Traitors and the like can also be revived with the previous role mostly intact. SSemergencyshuttle.recall() feedback_add_details("admin_verb","CCSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] admin-recalled the emergency shuttle.") - message_admins("[key_name_admin(usr)] admin-recalled the emergency shuttle.", 1) + message_admins("[key_name_admin(usr)] admin-recalled the emergency shuttle.", 1) return @@ -947,7 +947,7 @@ Traitors and the like can also be revived with the previous role mostly intact. message_admins("Admin [key_name_admin(usr)] has forced the players to have random appearances.", 1) if(notifyplayers == "Yes") - to_chat(world, "Admin [usr.key] has forced the players to have completely random identities!") + to_chat(world, "Admin [usr.key] has forced the players to have completely random identities!") to_chat(usr, "Remember: you can always disable the randomness by using the verb again, assuming the round hasn't started yet.") diff --git a/code/modules/admin/verbs/tripAI.dm b/code/modules/admin/verbs/tripAI.dm index b58766ca11d..03e6f2815ce 100644 --- a/code/modules/admin/verbs/tripAI.dm +++ b/code/modules/admin/verbs/tripAI.dm @@ -14,9 +14,9 @@ if(SSticker.triai) SSticker.triai = 0 to_chat(usr, "Only one AI will be spawned at round start.") - message_admins("[key_name_admin(usr)] has toggled off triple AIs at round start.", 1) + message_admins("[key_name_admin(usr)] has toggled off triple AIs at round start.", 1) else SSticker.triai = 1 to_chat(usr, "There will be an AI Triumvirate at round start.") - message_admins("[key_name_admin(usr)] has toggled on triple AIs at round start.", 1) + message_admins("[key_name_admin(usr)] has toggled on triple AIs at round start.", 1) return diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm index e4520faf4dc..2bdb363bef2 100644 --- a/code/modules/admin/view_variables/topic.dm +++ b/code/modules/admin/view_variables/topic.dm @@ -121,7 +121,7 @@ var/log_msg = "[key_name(usr)] dealt [amount] amount of [Text] damage to [key_name(L)]" message_admins("[key_name(usr)] dealt [amount] amount of [Text] damage to [ADMIN_LOOKUPFLW(L)]") log_admin(log_msg) - admin_ticket_log(L, "[log_msg]") + admin_ticket_log(L, "[log_msg]") vv_update_display(L, Text, "[newamt]") diff --git a/code/modules/artifice/deadringer.dm b/code/modules/artifice/deadringer.dm index bd9277d1ebb..d1a863ed636 100644 --- a/code/modules/artifice/deadringer.dm +++ b/code/modules/artifice/deadringer.dm @@ -31,20 +31,20 @@ /obj/item/deadringer/attack_self(var/mob/living/user as mob) var/mob/living/H = src.loc if (!istype(H, /mob/living/carbon/human)) - to_chat(H,"You have no clue what to do with this thing.") + to_chat(H,"You have no clue what to do with this thing.") return if(!activated) if(timer == 0) - to_chat(H, "You press a small button on [src]'s side. It starts to hum quietly.") + to_chat(H, "You press a small button on [src]'s side. It starts to hum quietly.") bruteloss_prev = H.getBruteLoss() fireloss_prev = H.getFireLoss() activated = 1 return else - to_chat(H,"You press a small button on [src]'s side. It buzzes a little.") + to_chat(H,"You press a small button on [src]'s side. It buzzes a little.") return if(activated) - to_chat(H,"You press a small button on [src]'s side. It stops humming.") + to_chat(H,"You press a small button on [src]'s side. It stops humming.") activated = 0 return @@ -57,9 +57,9 @@ deathprevent() activated = 0 if(watchowner.isSynthetic()) - to_chat(watchowner, "You fade into nothingness! [src]'s screen blinks, being unable to copy your synthetic body!") + to_chat(watchowner, "You fade into nothingness! [src]'s screen blinks, being unable to copy your synthetic body!") else - to_chat(watchowner, "You fade into nothingness, leaving behind a fake body!") + to_chat(watchowner, "You fade into nothingness, leaving behind a fake body!") icon_state = "deadringer_cd" timer = 50 return diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index b1808aadb0a..73085bc9587 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -252,6 +252,6 @@ return // VOREStation Add End else - to_chat(user, "Recalibration successful!: This gate's systems have been fine tuned. Travel to this gate will now be on target.") + to_chat(user, "Recalibration successful!: This gate's systems have been fine tuned. Travel to this gate will now be on target.") calibrated = 1 return diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 08e2342b61b..7e4a4cd739c 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -188,11 +188,11 @@ if(user.mind.isholy && !blessed) blessed = TRUE siemens_coefficient = 0 - to_chat(user, "You repeat the incantations etched into the gloves.") + to_chat(user, "You repeat the incantations etched into the gloves.") else blessed = FALSE siemens_coefficient = 0.5 - to_chat(user, "You dispel the incantations eteched into the gloves for now.") + to_chat(user, "You dispel the incantations eteched into the gloves for now.") if(!user.mind.isholy) to_chat(user, "You're not sure what language this is.") diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 41b6bc18f36..0ee0249c643 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -262,18 +262,18 @@ blessed = FALSE flash_protection = FLASH_PROTECTION_NONE src.icon_state = "[icon_state]_up" - to_chat(user, "The helmet's protective sigil fades as you raise the OM visor.") + to_chat(user, "The helmet's protective sigil fades as you raise the OM visor.") else blessed = TRUE flash_protection = FLASH_PROTECTION_MAJOR src.icon_state = initial(icon_state) - to_chat(user, "The helmet's protective sigil glows as you lower the OM visor.") + to_chat(user, "The helmet's protective sigil glows as you lower the OM visor.") update_clothing_icon() //so our mob-overlays update if(!user.mind.isholy) flash_protection = FLASH_PROTECTION_NONE blessed = FALSE - to_chat(user, "The OM visor doesn't respond to you.") + to_chat(user, "The OM visor doesn't respond to you.") /obj/item/clothing/head/helmet/para/inquisitor name = "PMD Inquistor's Hat" @@ -287,13 +287,13 @@ if(user.mind.isholy && blessed) blessed = FALSE flash_protection = FLASH_PROTECTION_NONE - to_chat(user, "The hat's protective sigils fade as you dispel them.") + to_chat(user, "The hat's protective sigils fade as you dispel them.") else blessed = TRUE flash_protection = FLASH_PROTECTION_MAJOR - to_chat(user, "The hat's protective sigil glows as you visualize the activation word.") + to_chat(user, "The hat's protective sigil glows as you visualize the activation word.") if(!user.mind.isholy) flash_protection = FLASH_PROTECTION_NONE blessed = FALSE - to_chat(user, "The hat does not respond to you.") + to_chat(user, "The hat does not respond to you.") diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index 38293c367e8..c44a33d379a 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/code/modules/clothing/shoes/boots.dm @@ -216,11 +216,11 @@ if(user.mind.isholy && !blessed) blessed = TRUE item_flags |= NOSLIP - to_chat(user, "You repeat the incantations etched into the boots.") + to_chat(user, "You repeat the incantations etched into the boots.") else blessed = FALSE item_flags &= ~NOSLIP - to_chat(user, "You dispel the incantations etched into the boots for now.") + to_chat(user, "You dispel the incantations etched into the boots for now.") if(!user.mind.isholy) to_chat(user, "You're not sure what language this is.") diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm index 7614325099f..30821216465 100644 --- a/code/modules/clothing/spacesuits/rig/modules/combat.dm +++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm @@ -55,7 +55,7 @@ to_chat(user, "Another grenade of that type will not fit into the module.") return 0 - to_chat(user, "You slot \the [input_device] into the suit module.") + to_chat(user, "You slot \the [input_device] into the suit module.") user.drop_from_inventory(input_device) qdel(input_device) accepted_item.charges++ @@ -270,7 +270,7 @@ else var/obj/item/new_weapon = new fabrication_type() new_weapon.forceMove(H) - to_chat(H, "You quickly fabricate \a [new_weapon].") + to_chat(H, "You quickly fabricate \a [new_weapon].") H.put_in_hands(new_weapon) return 1 diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm index b9dafe55475..799652fe921 100644 --- a/code/modules/clothing/spacesuits/rig/modules/computer.dm +++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm @@ -208,8 +208,8 @@ user.drop_from_inventory(ai) ai.forceMove(src) ai_card = ai - to_chat(ai_mob, "You have been transferred to \the [holder]'s [src].") - to_chat(user, "You load [ai_mob] into \the [holder]'s [src].") + to_chat(ai_mob, "You have been transferred to \the [holder]'s [src].") + to_chat(user, "You load [ai_mob] into \the [holder]'s [src].") integrated_ai = ai_mob @@ -261,7 +261,7 @@ var/obj/item/disk/tech_disk/disk = input_device if(disk.stored) if(load_data(disk.stored)) - to_chat(user, "Download successful; disk erased.") + to_chat(user, "Download successful; disk erased.") disk.stored = null else to_chat(user, "The disk is corrupt. It is useless to you.") @@ -287,7 +287,7 @@ else // Maybe consider a way to drop all your data into a target repo in the future. if(load_data(incoming_files.known_tech)) - to_chat(user, "Download successful; local and remote repositories synchronized.") + to_chat(user, "Download successful; local and remote repositories synchronized.") else to_chat(user, "Scan complete. There is nothing useful stored on this terminal.") return 1 @@ -465,9 +465,9 @@ /obj/item/rig_module/power_sink/proc/drain_complete(var/mob/living/M) if(!interfaced_with) - if(M) to_chat(M, "Total power drained: [round(total_power_drained*CELLRATE)] cell units.") + if(M) to_chat(M, "Total power drained: [round(total_power_drained*CELLRATE)] cell units.") else - if(M) to_chat(M, "Total power drained from [interfaced_with]: [round(total_power_drained*CELLRATE)] cell units.") + if(M) to_chat(M, "Total power drained from [interfaced_with]: [round(total_power_drained*CELLRATE)] cell units.") interfaced_with.drain_power(0,1,0) // Damage the victim. drain_loc = null diff --git a/code/modules/clothing/spacesuits/rig/modules/ninja.dm b/code/modules/clothing/spacesuits/rig/modules/ninja.dm index c114e109e31..f562a4d85ef 100644 --- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm +++ b/code/modules/clothing/spacesuits/rig/modules/ninja.dm @@ -37,7 +37,7 @@ var/mob/living/carbon/human/H = holder.wearer - to_chat(H, "You are now nearly invisible to normal detection.") + to_chat(H, "You are now nearly invisible to normal detection.") H.alpha = 5 anim(get_turf(H), H, 'icons/effects/effects.dmi', "electricity",null,20,null) diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm index b54529730a3..1528abd0c72 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm @@ -198,7 +198,7 @@ break if(total_transferred) - to_chat(user, "You transfer [total_transferred] units into the suit reservoir.") + to_chat(user, "You transfer [total_transferred] units into the suit reservoir.") else to_chat(user, "None of the reagents seem suitable.") return 1 @@ -327,17 +327,17 @@ if("Enable") active = 1 voice_holder.active = 1 - to_chat(usr, "You enable the speech synthesiser.") + to_chat(usr, "You enable the speech synthesiser.") if("Disable") active = 0 voice_holder.active = 0 - to_chat(usr, "You disable the speech synthesiser.") + to_chat(usr, "You disable the speech synthesiser.") if("Set Name") var/raw_choice = sanitize(input(usr, "Please enter a new name.") as text|null, MAX_NAME_LEN) if(!raw_choice) return 0 voice_holder.voice = raw_choice - to_chat(usr, "You are now mimicking [voice_holder.voice].") + to_chat(usr, "You are now mimicking [voice_holder.voice].") return 1 /obj/item/rig_module/maneuvering_jets @@ -524,7 +524,7 @@ to_chat(user, "Another grenade of that type will not fit into the module.") return 0 - to_chat(user, "You slot \the [input_device] into the suit module.") + to_chat(user, "You slot \the [input_device] into the suit module.") user.drop_from_inventory(input_device) qdel(input_device) accepted_item.charges++ @@ -648,7 +648,7 @@ var/mob/living/carbon/human/H = holder.wearer - to_chat(H, "You activate the suit's sprint mode.") + to_chat(H, "You activate the suit's sprint mode.") holder.slowdown -= sprint_speed diff --git a/code/modules/clothing/spacesuits/rig/modules/vision.dm b/code/modules/clothing/spacesuits/rig/modules/vision.dm index f01cdb5bf7c..547bd944901 100644 --- a/code/modules/clothing/spacesuits/rig/modules/vision.dm +++ b/code/modules/clothing/spacesuits/rig/modules/vision.dm @@ -205,7 +205,7 @@ // Don't cycle if this engage() is being called by activate(). if(starting_up) - to_chat(holder.wearer, "You activate your visual sensors.") + to_chat(holder.wearer, "You activate your visual sensors.") return 1 if(vision_modes.len > 1) @@ -214,9 +214,9 @@ vision_index = 1 vision = vision_modes[vision_index] - to_chat(holder.wearer, "You cycle your sensors to [vision.mode] mode.") + to_chat(holder.wearer, "You cycle your sensors to [vision.mode] mode.") else - to_chat(holder.wearer, "Your sensors only have one mode.") + to_chat(holder.wearer, "Your sensors only have one mode.") return 1 /obj/item/rig_module/vision/activate() diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index 3301513e88b..7d862b9df61 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -270,7 +270,7 @@ if(!failed_to_seal) if(!instant) - M.visible_message("[M]'s suit emits a quiet hum as it begins to adjust its seals.","With a quiet hum, the suit begins running checks and adjusting components.") + M.visible_message("[M]'s suit emits a quiet hum as it begins to adjust its seals.","With a quiet hum, the suit begins running checks and adjusting components.") if(seal_delay && !do_after(M,seal_delay)) if(M) to_chat(M, "You must remain still while the suit is adjusting the components.") @@ -302,16 +302,16 @@ piece.icon_state = "[suit_state][!seal_target ? "_sealed" : ""]" switch(msg_type) if("boots") - to_chat(M, "\The [piece] [!seal_target ? "seal around your feet" : "relax their grip on your legs"].") + to_chat(M, "\The [piece] [!seal_target ? "seal around your feet" : "relax their grip on your legs"].") M.update_inv_shoes() if("gloves") - to_chat(M, "\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"].") + to_chat(M, "\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"].") M.update_inv_gloves() if("chest") - to_chat(M, "\The [piece] [!seal_target ? "cinches tight again your chest" : "releases your chest"].") + to_chat(M, "\The [piece] [!seal_target ? "cinches tight again your chest" : "releases your chest"].") M.update_inv_wear_suit() if("helmet") - to_chat(M, "\The [piece] hisses [!seal_target ? "closed" : "open"].") + to_chat(M, "\The [piece] hisses [!seal_target ? "closed" : "open"].") M.update_inv_head() if(helmet) helmet.update_light(wearer) @@ -351,7 +351,7 @@ QDEL_NULL(minihud) else minihud = new (M.hud_used, src) - to_chat(M, "Your entire suit [canremove ? "loosens as the components relax" : "tightens around you as the components lock into place"].") + to_chat(M, "Your entire suit [canremove ? "loosens as the components relax" : "tightens around you as the components lock into place"].") M.client.screen -= booting_L qdel(booting_L) booting_R.icon_state = "boot_done" @@ -744,7 +744,7 @@ return if(seal_delay > 0 && istype(M) && (M.back == src || M.belt == src)) - M.visible_message("[M] starts putting on \the [src]...", "You start putting on \the [src]...") + M.visible_message("[M] starts putting on \the [src]...", "You start putting on \the [src]...") if(!do_after(M,seal_delay)) if(M && (M.back == src || M.belt == src)) if(!M.unEquip(src)) @@ -753,7 +753,7 @@ return if(istype(M) && (M.back == src || M.belt == src)) - M.visible_message("[M] struggles into \the [src].", "You struggle into \the [src].") + M.visible_message("[M] struggles into \the [src].", "You struggle into \the [src].") wearer = M wearer.wearing_rig = src update_icon() @@ -803,7 +803,7 @@ holder = use_obj.loc if(istype(holder)) if(use_obj && check_slot == use_obj) - to_chat(H, "Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly.") + to_chat(H, "Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly.") use_obj.canremove = 1 holder.drop_from_inventory(use_obj) use_obj.forceMove(get_turf(src)) diff --git a/code/modules/clothing/spacesuits/rig/rig_verbs.dm b/code/modules/clothing/spacesuits/rig/rig_verbs.dm index 9f09e23dd26..3807d325a09 100644 --- a/code/modules/clothing/spacesuits/rig/rig_verbs.dm +++ b/code/modules/clothing/spacesuits/rig/rig_verbs.dm @@ -218,11 +218,11 @@ if(!istype(module)) selected_module = null - to_chat(usr, "Primary system is now: deselected.") + to_chat(usr, "Primary system is now: deselected.") return selected_module = module - to_chat(usr, "Primary system is now: [selected_module.interface_name].") + to_chat(usr, "Primary system is now: [selected_module.interface_name].") /obj/item/rig/verb/toggle_module() @@ -256,10 +256,10 @@ return if(module.active) - to_chat(usr, "You attempt to deactivate \the [module.interface_name].") + to_chat(usr, "You attempt to deactivate \the [module.interface_name].") module.deactivate() else - to_chat(usr, "You attempt to activate \the [module.interface_name].") + to_chat(usr, "You attempt to activate \the [module.interface_name].") module.activate() /obj/item/rig/verb/engage_module() @@ -293,5 +293,5 @@ if(!istype(module)) return - to_chat(usr, "You attempt to engage the [module.interface_name].") + to_chat(usr, "You attempt to engage the [module.interface_name].") module.engage() diff --git a/code/modules/clothing/spacesuits/rig/suits/ert.dm b/code/modules/clothing/spacesuits/rig/suits/ert.dm index ffbc82c7186..2239cb8abe8 100644 --- a/code/modules/clothing/spacesuits/rig/suits/ert.dm +++ b/code/modules/clothing/spacesuits/rig/suits/ert.dm @@ -120,12 +120,12 @@ anti_magic = TRUE blessed = TRUE emp_proof = TRUE - to_chat(user, "You enable the RIG's protective sigils.") + to_chat(user, "You enable the RIG's protective sigils.") else anti_magic = FALSE blessed = FALSE emp_proof = FALSE - to_chat(user, "You disable the RIG's protective sigils.") + to_chat(user, "You disable the RIG's protective sigils.") if(!user.mind.isholy) to_chat(user, "You can't figure out what these symbols do.") diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index 0c9182228db..538da8dfd63 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -46,11 +46,11 @@ if(camera.status == TRUE) camera.set_status(FALSE) - to_chat(usr, "Camera deactivated.") + to_chat(usr, "Camera deactivated.") else camera.set_status(TRUE) camera.c_tag = usr.name - to_chat(usr, "User scanned as [camera.c_tag]. Camera activated.") + to_chat(usr, "User scanned as [camera.c_tag]. Camera activated.") else to_chat(usr, "This helmet does not have a built-in camera.") diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index c2d47737284..723dc7e971c 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -204,10 +204,10 @@ /obj/item/clothing/suit/armor/reactive/attack_self(mob/user as mob) active = !( active ) if (active) - to_chat(user, "The reactive armor is now active.") + to_chat(user, "The reactive armor is now active.") icon_state = "reactive" else - to_chat(user, "The reactive armor is now inactive.") + to_chat(user, "The reactive armor is now inactive.") icon_state = "reactiveoff" add_fingerprint(user) return @@ -643,11 +643,11 @@ if(user.mind.isholy && !anti_magic && !blessed) anti_magic = TRUE blessed = TRUE - to_chat(user, "You enable the armor's protective sigils.") + to_chat(user, "You enable the armor's protective sigils.") else anti_magic = FALSE blessed = FALSE - to_chat(user, "You disable the armor's protective sigils.") + to_chat(user, "You disable the armor's protective sigils.") if(!user.mind.isholy) to_chat(user, "You can't figure out what these symbols do.") diff --git a/code/modules/detectivework/microscope/dnascanner.dm b/code/modules/detectivework/microscope/dnascanner.dm index b3f9701c4db..926beb2f2d3 100644 --- a/code/modules/detectivework/microscope/dnascanner.dm +++ b/code/modules/detectivework/microscope/dnascanner.dm @@ -127,7 +127,7 @@ if(bloodsamp.dna != null) data = "Spectometric analysis on provided sample has determined the presence of [bloodsamp.dna.len] strings of DNA.

" for(var/blood in bloodsamp.dna) - data += "Blood type: [bloodsamp.dna[blood]]
\nDNA: [blood]

" + data += "Blood type: [bloodsamp.dna[blood]]
\nDNA: [blood]

" else data += "No DNA found.
" P.info = "[src] analysis report #[report_num]
" diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index 9e60dd4b4da..97db41e5c2d 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -308,7 +308,7 @@ log transactions T.time = stationtime2text() authenticated_account.transaction_log.Add(T) - to_chat(usr, "[icon2html(thing = src, target = usr)] Access granted. Welcome user '[authenticated_account.owner_name].'") + to_chat(usr, "[icon2html(thing = src, target = usr)] Access granted. Welcome user '[authenticated_account.owner_name].'") previous_account_number = tried_account_num if("e_withdrawal") @@ -461,7 +461,7 @@ log transactions if(I) authenticated_account = attempt_account_access(I.associated_account_number) if(authenticated_account) - to_chat(human_user, "[icon2html(thing = src, target = human_user)] Access granted. Welcome user '[authenticated_account.owner_name].'") + to_chat(human_user, "[icon2html(thing = src, target = human_user)] Access granted. Welcome user '[authenticated_account.owner_name].'") //create a transaction log entry var/datum/transaction/T = new() diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm index 93d5c3ef439..f5217822737 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -163,4 +163,4 @@ proc/spawn_money(var/sum, spawnloc, mob/living/carbon/human/human_user as mob) . = ..() if (!(user in view(2)) && user!=src.loc) return - . += "Charge card's owner: [src.owner_name]. Thalers remaining: [src.worth]." + . += "Charge card's owner: [src.owner_name]. Thalers remaining: [src.worth]." diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index e5ffc523c4c..666dc588aaf 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -33,7 +33,7 @@ mob/living/carbon/proc/dream() spawn(0) for(var/i = rand(1,4),i > 0, i--) - to_chat(src, "... [pick(dreams)] ...") + to_chat(src, "... [pick(dreams)] ...") sleep(rand(40,70)) if(paralysis <= 0) dreaming = 0 diff --git a/code/modules/food/food/sandwich.dm b/code/modules/food/food/sandwich.dm index 4490e42962e..91e6d75464d 100644 --- a/code/modules/food/food/sandwich.dm +++ b/code/modules/food/food/sandwich.dm @@ -23,7 +23,7 @@ sandwich_limit += 4 if(istype(W,/obj/item/material/shard)) - to_chat(user, "You hide [W] in \the [src].") + to_chat(user, "You hide [W] in \the [src].") user.drop_item() W.loc = src update() @@ -32,7 +32,7 @@ if(src.contents.len > sandwich_limit) to_chat(user, "If you put anything else on \the [src] it's going to collapse.") return - to_chat(user, "You layer [W] over \the [src].") + to_chat(user, "You layer [W] over \the [src].") var/obj/item/reagent_containers/F = W F.reagents.trans_to_obj(src, F.reagents.total_volume) user.drop_item() @@ -81,7 +81,7 @@ /obj/item/reagent_containers/food/snacks/csandwich/examine(mob/user) . = ..() var/obj/item/O = pick(contents) - . += "You think you can see [O.name] in there." + . += "You think you can see [O.name] in there." /obj/item/reagent_containers/food/snacks/csandwich/attack(mob/M as mob, mob/user as mob, def_zone) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 8bc31692fcc..cf486839f49 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -155,11 +155,11 @@ if (bitecount==0) return else if (bitecount==1) - . += "\The [src] was bitten by someone!" + . += "\The [src] was bitten by someone!" else if (bitecount<=3) - . += "\The [src] was bitten [bitecount] times!" + . += "\The [src] was bitten [bitecount] times!" else - . += "\The [src] was bitten multiple times!" + . += "\The [src] was bitten multiple times!" /obj/item/reagent_containers/food/snacks/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/storage)) @@ -179,7 +179,7 @@ user.visible_message( \ "[user] scoops up some [src] with \the [U]!", \ - "You scoop up some [src] with \the [U]!" \ + "You scoop up some [src] with \the [U]!" \ ) src.bitecount++ @@ -595,10 +595,10 @@ var/clr = C.colourName if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow"))) - to_chat(usr, "The egg refuses to take on this color!") + to_chat(usr, "The egg refuses to take on this color!") return - to_chat(usr, "You color \the [src] [clr]") + to_chat(usr, "You color \the [src] [clr]") icon_state = "egg-[clr]" else . = ..() diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index 8cb9e550a94..83f64061b43 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -156,13 +156,13 @@ if(weedlevel > 0) nymph.reagents.add_reagent("glucose", weedlevel) weedlevel = 0 - nymph.visible_message("[nymph] begins rooting through [src], ripping out weeds and eating them noisily.","You begin rooting through [src], ripping out weeds and eating them noisily.") + nymph.visible_message("[nymph] begins rooting through [src], ripping out weeds and eating them noisily.","You begin rooting through [src], ripping out weeds and eating them noisily.") else if(nymph.nutrition > 100 && nutrilevel < 10) nymph.nutrition -= ((10-nutrilevel)*5) nutrilevel = 10 - nymph.visible_message("[nymph] secretes a trickle of green liquid, refilling [src].","You secrete a trickle of green liquid, refilling [src].") + nymph.visible_message("[nymph] secretes a trickle of green liquid, refilling [src].","You secrete a trickle of green liquid, refilling [src].") else - nymph.visible_message("[nymph] rolls around in [src] for a bit.","You roll around in [src] for a bit.") + nymph.visible_message("[nymph] rolls around in [src] for a bit.","You roll around in [src] for a bit.") return /obj/machinery/portable_atmospherics/hydroponics/Initialize(mapload) diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm index 60c3154b3a9..6e27c1c862b 100644 --- a/code/modules/mining/coins.dm +++ b/code/modules/mining/coins.dm @@ -69,7 +69,7 @@ CC.update_icon() overlays = list() string_attached = null - to_chat(user, "You detach the string from the coin.") + to_chat(user, "You detach the string from the coin.") else ..() /obj/item/coin/attack_self(mob/user as mob) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 0b668780222..b0b3efdaab6 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -82,7 +82,7 @@ if(PROCESS_SMELT) dat += "smelting" if(PROCESS_COMPRESS) - dat += "compressing" + dat += "compressing" if(PROCESS_ALLOY) dat += "alloying" else diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index b76d327f54a..4b421191448 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -124,7 +124,7 @@ usr.set_machine(src) src.add_fingerprint(usr) if(processing==1) - to_chat(usr, "The machine is processing.") + to_chat(usr, "The machine is processing.") return if(href_list["choose"]) chosen = href_list["choose"] diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm index eb63b20c794..13925b3cdf8 100644 --- a/code/modules/mining/money_bag.dm +++ b/code/modules/mining/money_bag.dm @@ -49,14 +49,14 @@ ..() if (istype(W, /obj/item/coin)) var/obj/item/coin/C = W - to_chat(user, "You add the [C.name] into the bag.") + to_chat(user, "You add the [C.name] into the bag.") usr.drop_item() contents += C if (istype(W, /obj/item/moneybag)) var/obj/item/moneybag/C = W for (var/obj/O in C.contents) contents += O; - to_chat(user, "You empty the [C.name] into the bag.") + to_chat(user, "You empty the [C.name] into the bag.") return /obj/item/moneybag/Topic(href, href_list) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 05dfbc65607..86002d00390 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -284,7 +284,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp medHUD = !medHUD plane_holder.set_vis(VIS_CH_HEALTH, medHUD) plane_holder.set_vis(VIS_CH_STATUS_OOC, medHUD) - to_chat(src,"Medical HUD [medHUD ? "Enabled" : "Disabled"]") + to_chat(src,"Medical HUD [medHUD ? "Enabled" : "Disabled"]") /mob/observer/dead/verb/toggle_antagHUD() set category = "Ghost" @@ -307,7 +307,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp antagHUD = !antagHUD plane_holder.set_vis(VIS_CH_SPECIAL, antagHUD) - to_chat(src,"AntagHUD [antagHUD ? "Enabled" : "Disabled"]") + to_chat(src,"AntagHUD [antagHUD ? "Enabled" : "Disabled"]") /mob/observer/dead/proc/dead_tele(var/area/A in GLOB.sortedAreas) set category = "Ghost" @@ -429,16 +429,16 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/pressure = environment.return_pressure() var/total_moles = environment.total_moles - to_chat(src, "Results:") + to_chat(src, "Results:") if(abs(pressure - ONE_ATMOSPHERE) < 10) - to_chat(src, "Pressure: [round(pressure,0.1)] kPa") + to_chat(src, "Pressure: [round(pressure,0.1)] kPa") else to_chat(src, "Pressure: [round(pressure,0.1)] kPa") if(total_moles) for(var/g in environment.gas) - to_chat(src, "[GLOB.meta_gas_names[g]]: [round((environment.gas[g] / total_moles) * 100)]% ([round(environment.gas[g], 0.01)] moles)") - to_chat(src, "Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)") - to_chat(src, "Heat Capacity: [round(environment.heat_capacity(),0.1)]") + to_chat(src, "[GLOB.meta_gas_names[g]]: [round((environment.gas[g] / total_moles) * 100)]% ([round(environment.gas[g], 0.01)] moles)") + to_chat(src, "Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)") + to_chat(src, "Heat Capacity: [round(environment.heat_capacity(),0.1)]") /mob/observer/dead/verb/check_radiation() set name = "Check Radiation" diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index fbd5ae2dc69..cc4e894f2a0 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -239,7 +239,7 @@ /obj/item/mmi/digital/attack_self(mob/user as mob) if(brainmob && !brainmob.key && searching == 0) //Start the process of searching for a new user. - to_chat(user, "You carefully locate the manual activation switch and start the [src]'s boot process.") + to_chat(user, "You carefully locate the manual activation switch and start the [src]'s boot process.") request_player() /obj/item/mmi/digital/proc/request_player() @@ -263,7 +263,7 @@ var/turf/T = get_turf_or_move(src.loc) for (var/mob/M in viewers(T)) - M.show_message("\The [src] buzzes quietly, and the golden lights fade away. Perhaps you could try again?") + M.show_message("\The [src] buzzes quietly, and the golden lights fade away. Perhaps you could try again?") /obj/item/mmi/digital/proc/transfer_personality(var/mob/candidate) announce_ghost_joinleave(candidate, 0, "They are occupying a synthetic brain now.") @@ -281,7 +281,7 @@ var/turf/T = get_turf_or_move(src.loc) for (var/mob/M in viewers(T)) - M.show_message("\The [src] chimes quietly.") + M.show_message("\The [src] chimes quietly.") /obj/item/mmi/digital/robot name = "robotic intelligence circuit" diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm index a82afef1e43..94136bfb347 100644 --- a/code/modules/mob/living/carbon/brain/emote.dm +++ b/code/modules/mob/living/carbon/brain/emote.dm @@ -60,7 +60,7 @@ if ("help") to_chat(src, "alarm,alert,notice,flash,blink,whistle,beep,boop") else - to_chat(src, "Unusable emote '[act]'. Say *help for a list.") + to_chat(src, "Unusable emote '[act]'. Say *help for a list.") if (message) log_emote(message, src) diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index eb057ebaf6e..0a88a4d0cf3 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -16,7 +16,7 @@ /obj/item/mmi/digital/posibrain/attack_self(mob/user as mob) if(brainmob && !brainmob.key && searching == 0) //Start the process of searching for a new user. - to_chat(user, "You carefully locate the manual activation switch and start the positronic brain's boot process.") + to_chat(user, "You carefully locate the manual activation switch and start the positronic brain's boot process.") icon_state = "posibrain-searching" src.searching = 1 src.request_player() @@ -68,7 +68,7 @@ var/turf/T = get_turf_or_move(src.loc) for (var/mob/M in viewers(T)) - M.show_message("The positronic brain beeps as it loads a personality.") + M.show_message("The positronic brain beeps as it loads a personality.") playsound(src, 'sound/misc/boobeebeep.ogg', 50, 1) icon_state = "posibrain-occupied" @@ -82,7 +82,7 @@ var/turf/T = get_turf_or_move(src.loc) for (var/mob/M in viewers(T)) - M.show_message("The positronic brain buzzes and beeps, and the golden lights fade away. Perhaps you could try again?") + M.show_message("The positronic brain buzzes and beeps, and the golden lights fade away. Perhaps you could try again?") playsound(src, 'sound/misc/buzzbeep.ogg', 50, 1) /obj/item/mmi/digital/posibrain/examine(mob/user) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 08222808e48..899b9332d5d 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -103,8 +103,8 @@ var/mob/living/carbon/human/H = src var/datum/gender/T = gender_datums[H.get_visible_gender()] src.visible_message( \ - "[src] examines [T.himself].", \ - "You check yourself for injuries." \ + "[src] examines [T.himself].", \ + "You check yourself for injuries." \ ) for(var/obj/item/organ/external/org in H.organs) diff --git a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm index 91622f806df..062f1369803 100644 --- a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm +++ b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm @@ -24,7 +24,7 @@ for(var/R in cures) if(H.reagents.has_reagent(R)) if (cure_message) - to_chat(H, "[cure_message]") + to_chat(H, "[cure_message]") return 1 return 0 diff --git a/code/modules/mob/living/carbon/human/chem_side_effects.dm b/code/modules/mob/living/carbon/human/chem_side_effects.dm index 91622f806df..062f1369803 100644 --- a/code/modules/mob/living/carbon/human/chem_side_effects.dm +++ b/code/modules/mob/living/carbon/human/chem_side_effects.dm @@ -24,7 +24,7 @@ for(var/R in cures) if(H.reagents.has_reagent(R)) if (cure_message) - to_chat(H, "[cure_message]") + to_chat(H, "[cure_message]") return 1 return 0 diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index fc10793403e..8bd4b354f6e 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -820,7 +820,7 @@ twitch_v, vomit, weh, whimper, wink, yawn. Moth: mchitter, mlaugh, mscream, msqueak. Synthetics: beep, buzz, yes, no, rcough, rsneeze, ping. Vox: shriekshort, shriekloud") else - to_chat(src, "Unusable emote '[act]'. Say *help for a list.") + to_chat(src, "Unusable emote '[act]'. Say *help for a list.") return if (message) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index ed489aa4106..637260a7763 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -637,7 +637,7 @@ /mob/living/carbon/human/proc/examine_pickup_size(mob/living/H) var/message if(istype(H) && (H.get_effective_size() - src.get_effective_size()) >= 0.50) - message = "They are small enough that you could easily pick them up!" + message = "They are small enough that you could easily pick them up!" return message return FALSE diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index f4339224f7d..36b04018bf8 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -745,7 +745,7 @@ /mob/living/carbon/human/proc/play_xylophone() if(!src.xylophone) var/datum/gender/T = gender_datums[get_visible_gender()] - visible_message("\The [src] begins playing [T.his] ribcage like a xylophone. It's quite spooky.","You begin to play a spooky refrain on your ribcage.","You hear a spooky xylophone melody.") + visible_message("\The [src] begins playing [T.his] ribcage like a xylophone. It's quite spooky.","You begin to play a spooky refrain on your ribcage.","You hear a spooky xylophone melody.") var/song = pick('sound/effects/xylophone1.ogg','sound/effects/xylophone2.ogg','sound/effects/xylophone3.ogg') playsound(loc, song, 50, 1, -1) xylophone = 1 @@ -836,7 +836,7 @@ regenerate_icons() check_dna() var/datum/gender/T = gender_datums[get_visible_gender()] - visible_message("\The [src] morphs and changes [T.his] appearance!", "You change your appearance!", "Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!") + visible_message("\The [src] morphs and changes [T.his] appearance!", "You change your appearance!", "Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!") /mob/living/carbon/human/proc/remotesay() set name = "Project mind" @@ -859,10 +859,10 @@ var/say = sanitize(input("What do you wish to say")) if(mRemotetalk in target.mutations) - target.show_message(" You hear [src.real_name]'s voice: [say]") + target.show_message(" You hear [src.real_name]'s voice: [say]") else - target.show_message(" You hear a voice that seems to echo around the room: [say]") - usr.show_message(" You project your mind into [target.real_name]: [say]") + target.show_message(" You hear a voice that seems to echo around the room: [say]") + usr.show_message(" You project your mind into [target.real_name]: [say]") log_say("(TPATH to [key_name(target)]) [say]",src) for(var/mob/observer/dead/G in GLOB.mob_list) G.show_message("Telepathic message from [src] to [target]: [say]") diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index 8372be4214e..c85d41df57e 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -108,7 +108,7 @@ log_say("(COMMUNE to [key_name(M)]) [text]",src) - to_chat(M, "Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]") + to_chat(M, "Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]") if(istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M if(H.species.name == src.species.name) diff --git a/code/modules/mob/living/carbon/metroid/emote.dm b/code/modules/mob/living/carbon/metroid/emote.dm index 3a38f7935cb..e4a5b302a9c 100644 --- a/code/modules/mob/living/carbon/metroid/emote.dm +++ b/code/modules/mob/living/carbon/metroid/emote.dm @@ -86,7 +86,7 @@ to_chat(src, "Help for slime emotes. You can use these emotes with say \"*emote\":\n\nbounce, custom, jiggle, light, moan, shiver, sway, twitch, vibrate. You can also set your face with: \n\nnomood, pout, sad, angry, frown, smile") else - to_chat(src, "Unusable emote '[act]'. Say *help for a list.") + to_chat(src, "Unusable emote '[act]'. Say *help for a list.") if ((message && src.stat == 0)) if (m_type & 1) for(var/mob/O in viewers(src, null)) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 42f37af3f04..924046f97e2 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -94,9 +94,9 @@ default behaviour is: set hidden = 1 if ((src.health < 0 && src.health > (5-src.getMaxHealth()))) // Health below Zero but above 5-away-from-death, as before, but variable src.death() - to_chat(src, "You have given up life and succumbed to death.") + to_chat(src, "You have given up life and succumbed to death.") else - to_chat(src, "You are not injured enough to succumb to death!") + to_chat(src, "You are not injured enough to succumb to death!") /mob/living/proc/updatehealth() if(status_flags & GODMODE) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 68431c72019..96bd642dc12 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -264,7 +264,7 @@ miss_chance = max(15*(distance-2), 0) if (prob(miss_chance)) - visible_message("\The [O] misses [src] narrowly!") + visible_message("\The [O] misses [src] narrowly!") return src.visible_message("[src] has been hit by [O].") diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 78d168f5ba7..4868a9acf5f 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -553,7 +553,7 @@ var/list/ai_verbs_default = list( if(network in C.network) eyeobj.setLoc(get_turf(C)) break - to_chat(src, "Switched to [network] camera network.") + to_chat(src, "Switched to [network] camera network.") //End of code by Mord_Sith /mob/living/silicon/ai/proc/ai_statuschange() @@ -764,20 +764,20 @@ var/list/ai_verbs_default = list( return if(anchored) playsound(src, W.usesound, 50, 1) - user.visible_message("\The [user] starts to unbolt \the [src] from the plating...") + user.visible_message("\The [user] starts to unbolt \the [src] from the plating...") if(!do_after(user,40 * W.toolspeed)) - user.visible_message("\The [user] decides not to unbolt \the [src].") + user.visible_message("\The [user] decides not to unbolt \the [src].") return - user.visible_message("\The [user] finishes unfastening \the [src]!") + user.visible_message("\The [user] finishes unfastening \the [src]!") anchored = 0 return else playsound(src, W.usesound, 50, 1) - user.visible_message("\The [user] starts to bolt \the [src] to the plating...") + user.visible_message("\The [user] starts to bolt \the [src] to the plating...") if(!do_after(user,40 * W.toolspeed)) - user.visible_message("\The [user] decides not to bolt \the [src].") + user.visible_message("\The [user] decides not to bolt \the [src].") return - user.visible_message("\The [user] finishes fastening down \the [src]!") + user.visible_message("\The [user] finishes fastening down \the [src]!") anchored = 1 return else diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index a64bab5c41a..186162726a4 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -236,7 +236,7 @@ cameralist[C.network] = C.network src.network = input(usr, "Which network would you like to view?") as null|anything in cameralist - to_chat(src, "Switched to [src.network] camera network.") + to_chat(src, "Switched to [src.network] camera network.") //End of code by Mord_Sith */ diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm index 9c6fb8857c5..c738c00e51c 100644 --- a/code/modules/mob/living/silicon/robot/analyzer.dm +++ b/code/modules/mob/living/silicon/robot/analyzer.dm @@ -24,10 +24,10 @@ to_chat(user, "You try to analyze the floor's vitals!") for(var/mob/O in viewers(M, null)) O.show_message(text("[user] has analyzed the floor's vitals!"), 1) - user.show_message(text("Analyzing Results for The floor:\n\t Overall Status: Healthy"), 1) - user.show_message(text("\t Damage Specifics: [0]-[0]-[0]-[0]"), 1) - user.show_message("Key: Suffocation/Toxin/Burns/Brute", 1) - user.show_message("Body Temperature: ???", 1) + user.show_message(text("Analyzing Results for The floor:\n\t Overall Status: Healthy"), 1) + user.show_message(text("\t Damage Specifics: [0]-[0]-[0]-[0]"), 1) + user.show_message("Key: Suffocation/Toxin/Burns/Brute", 1) + user.show_message("Body Temperature: ???", 1) return var/scan_type @@ -44,17 +44,17 @@ if("robot") var/BU = M.getFireLoss() > 50 ? "[M.getFireLoss()]" : M.getFireLoss() var/BR = M.getBruteLoss() > 50 ? "[M.getBruteLoss()]" : M.getBruteLoss() - user.show_message("Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health - M.halloss]% functional"]") + user.show_message("Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health - M.halloss]% functional"]") user.show_message("\t Key: Electronics/Brute", 1) user.show_message("\t Damage Specifics: [BU] - [BR]") if(M.tod && M.stat == DEAD) - user.show_message("Time of Disable: [M.tod]") + user.show_message("Time of Disable: [M.tod]") var/mob/living/silicon/robot/H = M var/list/damaged = H.get_damaged_components(1,1,1) - user.show_message("Localized Damage:",1) + user.show_message("Localized Damage:",1) if(length(damaged)>0) for(var/datum/robot_component/org in damaged) - user.show_message(text("\t []: [][] - [] - [] - []", \ + user.show_message(text("\t []: [][] - [] - [] - []", \ capitalize(org.name), \ (org.installed == -1) ? "DESTROYED " :"",\ (org.electronics_damage > 0) ? "[org.electronics_damage]" :0, \ @@ -62,10 +62,10 @@ (org.toggled) ? "Toggled ON" : "Toggled OFF",\ (org.powered) ? "Power ON" : "Power OFF"),1) else - user.show_message("\t Components are OK.",1) + user.show_message("\t Components are OK.",1) if(H.emagged && prob(5)) user.show_message("\t ERROR: INTERNAL SYSTEMS COMPROMISED",1) - user.show_message("Operating Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)", 1) + user.show_message("Operating Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)", 1) if("prosthetics") diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 45ff671441b..57cc1fa8a45 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -274,7 +274,7 @@ if ("help") to_chat(src, "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitch_s, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look, beep, ping, \nbuzz, law, halt, yes, no") else - to_chat(src, "Unusable emote '[act]'. Say *help for a list.") + to_chat(src, "Unusable emote '[act]'. Say *help for a list.") if ((message && src.stat == 0)) custom_emote(m_type,message) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 053f05e93ac..08a8fa699cc 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -478,7 +478,7 @@ C.brute_damage = WC.brute C.electronics_damage = WC.burn - to_chat(usr, "You install the [W.name].") + to_chat(usr, "You install the [W.name].") return diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index f6b305f1b1c..417e12fc471 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -214,7 +214,7 @@ overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = 30 + I.layer) addedSomething = 1 if ( addedSomething ) - user.visible_message("[user] load some items onto their service tray.") + user.visible_message("[user] load some items onto their service tray.") return @@ -254,9 +254,9 @@ sleep(rand(2,4)) if ( droppedSomething ) if ( foundtable ) - user.visible_message("[user] unloads their service tray.") + user.visible_message("[user] unloads their service tray.") else - user.visible_message("[user] drops all the items on their tray.") + user.visible_message("[user] drops all the items on their tray.") return ..() @@ -336,7 +336,7 @@ deploy_paper(get_turf(src)) /obj/item/form_printer/proc/deploy_paper(var/turf/T) - T.visible_message("\The [src.loc] dispenses a sheet of crisp white paper.") + T.visible_message("\The [src.loc] dispenses a sheet of crisp white paper.") new /obj/item/paper(T) diff --git a/code/modules/mob/living/simple_animal/aliens/drone.dm b/code/modules/mob/living/simple_animal/aliens/drone.dm index e0bfe0177b3..93b01b56494 100644 --- a/code/modules/mob/living/simple_animal/aliens/drone.dm +++ b/code/modules/mob/living/simple_animal/aliens/drone.dm @@ -99,7 +99,7 @@ //sometimes our targetting sensors malfunction, and we attack anyone nearby if(prob(disabled ? 0 : 1)) if(hostile) - src.visible_message("[icon2html(thing = src, target = world)] [src] retracts several targetting vanes, and dulls it's running lights.") + src.visible_message("[icon2html(thing = src, target = world)] [src] retracts several targetting vanes, and dulls it's running lights.") hostile = 0 else src.visible_message("[icon2html(thing = src, target = world)] [src] suddenly lights up, and additional targetting vanes slide into place.") @@ -123,9 +123,9 @@ exploding = 0 if(!disabled) if(prob(50)) - src.visible_message("[icon2html(thing = src, target = world)] [src] suddenly shuts down!") + src.visible_message("[icon2html(thing = src, target = world)] [src] suddenly shuts down!") else - src.visible_message("[icon2html(thing = src, target = world)] [src] suddenly lies still and quiet.") + src.visible_message("[icon2html(thing = src, target = world)] [src] suddenly lies still and quiet.") disabled = rand(150, 600) walk(src,0) diff --git a/code/modules/mob/living/simple_animal/animals/mouse.dm b/code/modules/mob/living/simple_animal/animals/mouse.dm index c487b145a62..f2d344d9498 100644 --- a/code/modules/mob/living/simple_animal/animals/mouse.dm +++ b/code/modules/mob/living/simple_animal/animals/mouse.dm @@ -96,7 +96,7 @@ if( ishuman(AM) ) if(!stat) var/mob/M = AM - M.visible_message("[icon2html(thing = src, target = world)] Squeek!") + M.visible_message("[icon2html(thing = src, target = world)] Squeek!") SEND_SOUND(M, sound('sound/effects/mouse_squeak.ogg')) ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm index 48760442b40..4fd65623e2a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm @@ -11,7 +11,7 @@ to_chat(src, "You cannot leave your host in your current state.") if(docile) - to_chat(src, "You are feeling far too docile to do that.") + to_chat(src, "You are feeling far too docile to do that.") return if(!host || !src) return @@ -143,7 +143,7 @@ to_chat(src, "You cannot do that in your current state.") if(docile) - to_chat(src, "You are feeling far too docile to do that.") + to_chat(src, "You are feeling far too docile to do that.") return @@ -211,7 +211,7 @@ to_chat(src, "You cannot secrete chemicals in your current state.") if(docile) - to_chat(src, "You are feeling far too docile to do that.") + to_chat(src, "You are feeling far too docile to do that.") return if(chemicals < 50) @@ -280,7 +280,7 @@ return if(docile) - to_chat(src, "You are feeling far too docile to do that.") + to_chat(src, "You are feeling far too docile to do that.") return to_chat(src, "You begin delicately adjusting your connection to the host brain...") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm index 31164728d64..cd0002afd0a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm @@ -50,12 +50,12 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have? var/obj/item/reagent_containers/food/snacks/grown/G = O if(G.seed && G.seed.kitchen_tag == "wheat") if(!stat && eggsleft < 8) - user.visible_message("[user] feeds [O] to [name]! It clucks happily.","You feed [O] to [name]! It clucks happily.") + user.visible_message("[user] feeds [O] to [name]! It clucks happily.","You feed [O] to [name]! It clucks happily.") user.drop_item() qdel(O) eggsleft += rand(1, 4) else - to_chat(user, "[name] doesn't seem hungry!") + to_chat(user, "[name] doesn't seem hungry!") else to_chat(user, "[name] doesn't seem interested in that.") else diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm index c41f28960a1..fb67a9c4ea2 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm @@ -65,7 +65,7 @@ if( ishuman(AM) ) if(!stat) var/mob/M = AM - M.visible_message("[icon2html(thing = src, target = world)] Squeek!") + M.visible_message("[icon2html(thing = src, target = world)] Squeek!") playsound(src, 'sound/effects/mouse_squeak.ogg', 35, 1) ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm index 7b63a9bf114..e0b899aa391 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm @@ -32,7 +32,7 @@ if(!stat) for(var/mob/M in viewers(user, null)) if ((M.client && !( M.blinded ))) - M.show_message("[user] baps [name] on the nose with the rolled up [O]") + M.show_message("[user] baps [name] on the nose with the rolled up [O]") spawn(0) for(var/i in list(1,2,4,8,4,2,1,2)) setDir(i) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army.dm index d8fccc3bd40..f4221aaf3fc 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army.dm @@ -91,7 +91,7 @@ if( ishuman(AM) ) if(!stat) var/mob/M = AM - M.visible_message("[icon2html(thing = src, target = world)] Squeek!") + M.visible_message("[icon2html(thing = src, target = world)] Squeek!") playsound(src, 'sound/effects/mouse_squeak.ogg', 35, 1) ..() diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index e546f30050e..34b7b27c562 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -17,10 +17,10 @@ spawn() alert("You have logged in already with another key this round, please log out of this one NOW or risk being banned!") if(matches) if(M.client) - message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)].", 1) + message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)].", 1) log_adminwarn("Notice: [key_name(src)] has the same [matches] as [key_name(M)].") else - message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). ", 1) + message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). ", 1) log_adminwarn("Notice: [key_name(src)] has the same [matches] as [key_name(M)] (no longer logged in).") /mob/Login() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 9250ea117e1..68068985bbb 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -353,9 +353,9 @@ if (flavor_text && flavor_text != "") var/msg = replacetext(flavor_text, "\n", " ") if(length(msg) <= 40) - return "[msg]" + return "[msg]" else - return "[copytext_preserve_html(msg, 1, 37)]... More..." + return "[copytext_preserve_html(msg, 1, 37)]... More..." /* /mob/verb/help() @@ -484,7 +484,7 @@ if(client.holder && (client.holder.rights & R_ADMIN)) is_admin = 1 else if(stat != DEAD || istype(src, /mob/new_player)) - to_chat(usr, "You must be observing to use this!") + to_chat(usr, "You must be observing to use this!") return if(is_admin && stat == DEAD) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index ec0c94f4a53..1440a2b7dc4 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -219,7 +219,7 @@ return FALSE if(length(mob.pinned)) - to_chat(src, "You're pinned to a wall by [mob.pinned[1]]!") + to_chat(src, "You're pinned to a wall by [mob.pinned[1]]!") return FALSE if(mob.pulledby || mob.buckled) // Wheelchair driving! //this is shitcode diff --git a/code/modules/mob/new_player/poll.dm b/code/modules/mob/new_player/poll.dm index 78fd673a66c..a3cf56bc201 100644 --- a/code/modules/mob/new_player/poll.dm +++ b/code/modules/mob/new_player/poll.dm @@ -402,7 +402,7 @@ var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_vote (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]')") insert_query.Execute() - to_chat(usr, "Vote successful.") + to_chat(usr, "Vote successful.") usr << browse(null,"window=playerpoll") @@ -460,7 +460,7 @@ var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_textreply (id ,datetime ,pollid ,ckey ,ip ,replytext ,adminrank) VALUES (null, Now(), [pollid], '[usr.ckey]', '[usr.client.address]', '[replytext]', '[adminrank]')") insert_query.Execute() - to_chat(usr, "Feedback logging successful.") + to_chat(usr, "Feedback logging successful.") usr << browse(null,"window=playerpoll") @@ -522,5 +522,5 @@ var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_vote (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank, rating) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]', [(isnull(rating)) ? "null" : rating])") insert_query.Execute() - to_chat(usr, "Vote successful.") + to_chat(usr, "Vote successful.") usr << browse(null,"window=playerpoll") diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index ea8a6044e1b..ab0f7e61924 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -431,7 +431,7 @@ // check for exploits for(var/bad in paper_blacklist) if(findtext(t,bad)) - to_chat(usr, "You think to yourself, \"Hm.. this is only paper...\"") + to_chat(usr, "You think to yourself, \"Hm.. this is only paper...\"") log_admin("PAPER: [usr] ([usr.ckey]) tried to use forbidden word in [src]: [bad].") message_admins("PAPER: [usr] ([usr.ckey]) tried to use forbidden word in [src]: [bad].") return diff --git a/code/modules/power/antimatter/fuel.dm b/code/modules/power/antimatter/fuel.dm index d7bc4be6d10..b21772769a3 100644 --- a/code/modules/power/antimatter/fuel.dm +++ b/code/modules/power/antimatter/fuel.dm @@ -76,7 +76,7 @@ if("Anti-Hydrogen") M.gib() //Yikes! if("Hydrogen") - to_chat(M, "You feel very light, as if you might just float away...") + to_chat(M, "You feel very light, as if you might just float away...") qdel(src) return diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 51f8359bb63..cc5bfcc43f1 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -984,7 +984,7 @@ obj/structure/cable/proc/cableColor(var/colorC) var/obj/item/stack/cable_coil/CC = new/obj/item/stack/cable_coil(user.loc) CC.amount = N CC.update_icon() - to_chat(user,"You take [N] units of wire from the [src].") + to_chat(user,"You take [N] units of wire from the [src].") if (CC) user.put_in_hands(CC) src.add_fingerprint(user) diff --git a/code/modules/power/cable_heavyduty.dm b/code/modules/power/cable_heavyduty.dm index 202ce5ef666..44a28ed9152 100644 --- a/code/modules/power/cable_heavyduty.dm +++ b/code/modules/power/cable_heavyduty.dm @@ -18,10 +18,10 @@ return if(W.is_wirecutter()) - to_chat(usr, "These cables are too tough to be cut with those [W.name].") + to_chat(usr, "These cables are too tough to be cut with those [W.name].") return else if(istype(W, /obj/item/stack/cable_coil)) - to_chat(usr, "You will need heavier cables to connect to these.") + to_chat(usr, "You will need heavier cables to connect to these.") return else ..() diff --git a/code/modules/power/pacman2.dm b/code/modules/power/pacman2.dm index a4a30b643c9..766bf7e6598 100644 --- a/code/modules/power/pacman2.dm +++ b/code/modules/power/pacman2.dm @@ -53,7 +53,7 @@ examine(mob/user) . = ..() - . += "The generator has [P.air_contents.phoron] units of fuel left, producing [power_gen] per cycle." + . += "The generator has [P.air_contents.phoron] units of fuel left, producing [power_gen] per cycle." handleInactive() heat -= 2 @@ -76,23 +76,23 @@ P = O user.drop_item() O.loc = src - to_chat(user, "You add the phoron tank to the generator.") + to_chat(user, "You add the phoron tank to the generator.") else if(!active) if(O.is_wrench()) anchored = !anchored playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(anchored) - to_chat(user, "You secure the generator to the floor.") + to_chat(user, "You secure the generator to the floor.") else - to_chat(user, "You unsecure the generator from the floor.") + to_chat(user, "You unsecure the generator from the floor.") SSmachines.makepowernets() else if(O.is_screwdriver()) open = !open playsound(loc, O.usesound, 50, 1) if(open) - to_chat(user, "You open the access panel.") + to_chat(user, "You open the access panel.") else - to_chat(user, "You close the access panel.") + to_chat(user, "You close the access panel.") else if(O.is_crowbar() && !open) playsound(loc, O.usesound, 50, 1) var/obj/machinery/constructable_frame/machine_frame/new_frame = new /obj/machinery/constructable_frame/machine_frame(src.loc) diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index a1ec1a85082..eb26cf7f3c1 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -77,7 +77,7 @@ var/global/list/rad_collectors = list() return 1 else if(W.is_wrench()) if(P) - to_chat(user, "Remove the phoron tank first.") + to_chat(user, "Remove the phoron tank first.") return 1 playsound(src, W.usesound, 75, 1) src.anchored = !src.anchored diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 7e1cdb765aa..d1c9d72b86e 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -436,7 +436,7 @@ GLOBAL_LIST_EMPTY(solars_list) playsound(src, I.usesound, 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) - to_chat(user, "The broken glass falls out.") + to_chat(user, "The broken glass falls out.") var/obj/structure/frame/A = new /obj/structure/frame/computer( src.loc ) new /obj/item/material/shard( src.loc ) var/obj/item/circuitboard/solar_control/M = new /obj/item/circuitboard/solar_control( A ) @@ -448,7 +448,7 @@ GLOBAL_LIST_EMPTY(solars_list) A.anchored = 1 qdel(src) else - to_chat(user, "You disconnect the monitor.") + to_chat(user, "You disconnect the monitor.") var/obj/structure/frame/A = new /obj/structure/frame/computer( src.loc ) var/obj/item/circuitboard/solar_control/M = new /obj/item/circuitboard/solar_control( A ) for (var/obj/C in src) diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 9cf4ca019e8..0a595f4deed 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -33,7 +33,7 @@ /obj/item/ammo_casing/attackby(obj/item/W as obj, mob/user as mob) if(W.is_screwdriver()) if(!BB) - to_chat(user, "There is no bullet in the casing to inscribe anything into.") + to_chat(user, "There is no bullet in the casing to inscribe anything into.") return var/tmp_label = "" @@ -41,10 +41,10 @@ if(length(label_text) > 20) to_chat(user, "The inscription can be at most 20 characters long.") else if(!label_text) - to_chat(user, "You scratch the inscription off of [initial(BB)].") + to_chat(user, "You scratch the inscription off of [initial(BB)].") BB.name = initial(BB.name) else - to_chat(user, "You inscribe \"[label_text]\" into \the [initial(BB.name)].") + to_chat(user, "You inscribe \"[label_text]\" into \the [initial(BB.name)].") BB.name = "[initial(BB.name)] (\"[label_text]\")" /obj/item/ammo_casing/update_icon() diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index dd330b524b7..b41a096e5b4 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -657,7 +657,7 @@ mouthshoot = 1 M.visible_message("[user] sticks their gun in their mouth, ready to pull the trigger...") if(!do_after(user, 40)) - M.visible_message("[user] decided life was worth living") + M.visible_message("[user] decided life was worth living") mouthshoot = 0 return var/obj/item/projectile/in_chamber = consume_next_projectile() diff --git a/code/modules/projectiles/guns/launcher/rocket.dm b/code/modules/projectiles/guns/launcher/rocket.dm index d6fa0f12c9a..ffb49d05063 100644 --- a/code/modules/projectiles/guns/launcher/rocket.dm +++ b/code/modules/projectiles/guns/launcher/rocket.dm @@ -18,7 +18,7 @@ /obj/item/gun/launcher/rocket/examine(mob/user) . = ..() - . += "[rockets.len] / [max_rockets] rockets." + . += "[rockets.len] / [max_rockets] rockets." /obj/item/gun/launcher/rocket/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/ammo_casing/rocket)) @@ -26,8 +26,8 @@ user.drop_item() I.loc = src rockets += I - to_chat(user, "You put the rocket in [src].") - to_chat(user, "[rockets.len] / [max_rockets] rockets.") + to_chat(user, "You put the rocket in [src].") + to_chat(user, "[rockets.len] / [max_rockets] rockets.") else to_chat(usr, "[src] cannot hold more rockets.") diff --git a/code/modules/projectiles/guns/projectile/dartgun.dm b/code/modules/projectiles/guns/projectile/dartgun.dm index e6cebe498c5..853c8d94a9a 100644 --- a/code/modules/projectiles/guns/projectile/dartgun.dm +++ b/code/modules/projectiles/guns/projectile/dartgun.dm @@ -105,25 +105,25 @@ // return . = ..() if (beakers.len) - to_chat(user, "[src] contains:") + to_chat(user, "[src] contains:") for(var/obj/item/reagent_containers/glass/beaker/B in beakers) if(B.reagents && B.reagents.reagent_list.len) for(var/datum/reagent/R in B.reagents.reagent_list) - . += "[R.volume] units of [R.name]" + . += "[R.volume] units of [R.name]" /obj/item/gun/projectile/dartgun/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/reagent_containers/glass)) if(!istype(I, container_type)) - to_chat(user, "[I] doesn't seem to fit into [src].") + to_chat(user, "[I] doesn't seem to fit into [src].") return if(beakers.len >= max_beakers) - to_chat(user, "[src] already has [max_beakers] beakers in it - another one isn't going to fit!") + to_chat(user, "[src] already has [max_beakers] beakers in it - another one isn't going to fit!") return var/obj/item/reagent_containers/glass/beaker/B = I user.drop_item() B.loc = src beakers += B - to_chat(user, "You slot [B] into [src].") + to_chat(user, "You slot [B] into [src].") src.updateUsrDialog() return 1 ..() diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 12d5c291f8e..8a79659099f 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -164,7 +164,7 @@ else if(istype(target, /mob/living/carbon/)) // for (var/mob/V in viewers(src)) // V.show_message("The radiation beam dissipates harmlessly through [M]", 3) - M.show_message("The radiation beam dissipates harmlessly through your body.") + M.show_message("The radiation beam dissipates harmlessly through your body.") else return 1 @@ -197,7 +197,7 @@ if((H.species.flags & IS_PLANT) && (M.nutrition < 500)) M.nutrition += 30 else if (istype(target, /mob/living/carbon/)) - M.show_message("The radiation beam dissipates harmlessly through your body.") + M.show_message("The radiation beam dissipates harmlessly through your body.") else return 1 diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 85f4c26ed93..54bd9062742 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -102,7 +102,7 @@ if(istype(I, /obj/item/storage/bag/trash)) var/obj/item/storage/bag/trash/T = I - to_chat(user, "You empty the bag.") + to_chat(user, "You empty the bag.") for(var/obj/item/O in T.contents) T.remove_from_storage(O,src) T.update_icon() @@ -1172,7 +1172,7 @@ if(O.currTag)// Tag set sort_tag = O.currTag playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1) - to_chat(user, "Changed tag to '[sort_tag]'.") + to_chat(user, "Changed tag to '[sort_tag]'.") updatename() updatedesc() @@ -1240,7 +1240,7 @@ if(O.currTag)// Tag set sortType = O.currTag playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1) - to_chat(user, "Changed filter to '[sortType]'.") + to_chat(user, "Changed filter to '[sortType]'.") updatename() updatedesc() diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index c2484d1ed56..844d2619741 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -234,7 +234,7 @@ if(user in target) //no wrapping closets that you are inside - it's not physically possible return - user.attack_log += text("\[[time_stamp()]\] Has used [src.name] on \ref[target]") + user.attack_log += text("\[[time_stamp()]\] Has used [src.name] on \ref[target]") if (istype(target, /obj/item) && !(istype(target, /obj/item/storage) && !istype(target,/obj/item/storage/box))) @@ -295,7 +295,7 @@ else if(src.amount < 3) to_chat(user, "You need more paper.") else - to_chat(user, "The object you are trying to wrap is unsuitable for the sorting machinery!") + to_chat(user, "The object you are trying to wrap is unsuitable for the sorting machinery!") if (src.amount <= 0) new /obj/item/c_tube( src.loc ) qdel(src) @@ -304,7 +304,7 @@ examine(mob/user) if(..(user, 0)) - to_chat(user, "There are [amount] units of package wrap left!") + to_chat(user, "There are [amount] units of package wrap left!") return diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 26c13aa55f7..e03d813ef07 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -135,7 +135,7 @@ var/global/list/obj/machinery/message_server/message_servers = list() /obj/machinery/message_server/attack_hand(user as mob) -// to_chat(user, "There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentCom delays.") +// to_chat(user, "There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentCom delays.") to_chat(user, "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]") active = !active update_icon() diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm index b5467d1f383..dfbf5b5d171 100644 --- a/code/modules/shieldgen/emergency_shield.dm +++ b/code/modules/shieldgen/emergency_shield.dm @@ -258,14 +258,14 @@ return if (src.active) - user.visible_message("[icon2html(thing = src, target = world)] [user] deactivated the shield generator.", \ - "[icon2html(thing = src, target = user)] You deactivate the shield generator.", \ + user.visible_message("[icon2html(thing = src, target = world)] [user] deactivated the shield generator.", \ + "[icon2html(thing = src, target = user)] You deactivate the shield generator.", \ "You hear heavy droning fade out.") src.shields_down() else if(anchored) - user.visible_message("[icon2html(thing = src, target = world)] [user] activated the shield generator.", \ - "[icon2html(thing = src, target = user)] You activate the shield generator.", \ + user.visible_message("[icon2html(thing = src, target = world)] [user] activated the shield generator.", \ + "[icon2html(thing = src, target = user)] You activate the shield generator.", \ "You hear heavy droning.") src.shields_up() else @@ -282,10 +282,10 @@ if(W.is_screwdriver()) playsound(src, W.usesound, 100, 1) if(is_open) - to_chat(user, "You close the panel.") + to_chat(user, "You close the panel.") is_open = 0 else - to_chat(user, "You open the panel and expose the wiring.") + to_chat(user, "You open the panel and expose the wiring.") is_open = 1 else if(istype(W, /obj/item/stack/cable_coil) && malfunction && is_open) @@ -305,15 +305,15 @@ return if(anchored) playsound(src, W.usesound, 100, 1) - to_chat(user, "You unsecure the [src] from the floor!") + to_chat(user, "You unsecure the [src] from the floor!") if(active) - to_chat(user, "The [src] shuts off!") + to_chat(user, "The [src] shuts off!") src.shields_down() anchored = 0 else if(istype(get_turf(src), /turf/space)) return //No wrenching these in space! playsound(src, W.usesound, 100, 1) - to_chat(user, "You secure the [src] to the floor!") + to_chat(user, "You secure the [src] to the floor!") anchored = 1 diff --git a/code/modules/shieldgen/shield_capacitor.dm b/code/modules/shieldgen/shield_capacitor.dm index 2df02c99f33..c782bce42eb 100644 --- a/code/modules/shieldgen/shield_capacitor.dm +++ b/code/modules/shieldgen/shield_capacitor.dm @@ -51,7 +51,7 @@ else if(W.is_wrench()) src.anchored = !src.anchored playsound(src, W.usesound, 75, 1) - src.visible_message("[icon2html(thing = src, target = world)] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].") + src.visible_message("[icon2html(thing = src, target = world)] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].") if(anchored) spawn(0) diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm index 0cfeb807d4b..747529de4bc 100644 --- a/code/modules/shieldgen/shield_gen.dm +++ b/code/modules/shieldgen/shield_gen.dm @@ -70,7 +70,7 @@ else if(W.is_wrench()) src.anchored = !src.anchored playsound(src, W.usesound, 75, 1) - src.visible_message("[icon2html(thing = src, target = world)] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user].") + src.visible_message("[icon2html(thing = src, target = world)] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user].") if(active) toggle() diff --git a/code/modules/shuttles/shuttles_web.dm b/code/modules/shuttles/shuttles_web.dm index a0ebe9c1d9d..0a8b95e2585 100644 --- a/code/modules/shuttles/shuttles_web.dm +++ b/code/modules/shuttles/shuttles_web.dm @@ -344,7 +344,7 @@ nano_ui_interact(usr) if (WS.moving_status != SHUTTLE_IDLE) - to_chat(usr, "[WS.visible_name] is busy moving.") + to_chat(usr, "[WS.visible_name] is busy moving.") return if(href_list["rename_command"]) diff --git a/code/modules/surgery/bones.dm b/code/modules/surgery/bones.dm index abcf0cfc02b..f3e951c2f85 100644 --- a/code/modules/surgery/bones.dm +++ b/code/modules/surgery/bones.dm @@ -29,15 +29,15 @@ /datum/surgery_step/glue_bone/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) if (affected.stage == 0) - user.visible_message("[user] starts applying medication to the damaged bones in [target]'s [affected.name] with \the [tool]." , \ - "You start applying medication to the damaged bones in [target]'s [affected.name] with \the [tool].") + user.visible_message("[user] starts applying medication to the damaged bones in [target]'s [affected.name] with \the [tool]." , \ + "You start applying medication to the damaged bones in [target]'s [affected.name] with \the [tool].") target.custom_pain("Something in your [affected.name] is causing you a lot of pain!", 50) ..() /datum/surgery_step/glue_bone/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] applies some [tool] to [target]'s bone in [affected.name]", \ - "You apply some [tool] to [target]'s bone in [affected.name] with \the [tool].") + user.visible_message("[user] applies some [tool] to [target]'s bone in [affected.name]", \ + "You apply some [tool] to [target]'s bone in [affected.name] with \the [tool].") affected.stage = 1 /datum/surgery_step/glue_bone/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -67,16 +67,16 @@ /datum/surgery_step/set_bone/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] is beginning to set the bone in [target]'s [affected.name] in place with \the [tool]." , \ - "You are beginning to set the bone in [target]'s [affected.name] in place with \the [tool].") + user.visible_message("[user] is beginning to set the bone in [target]'s [affected.name] in place with \the [tool]." , \ + "You are beginning to set the bone in [target]'s [affected.name] in place with \the [tool].") target.custom_pain("The pain in your [affected.name] is going to make you pass out!", 50) ..() /datum/surgery_step/set_bone/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) if (affected.status & ORGAN_BROKEN) - user.visible_message("[user] sets the bone in [target]'s [affected.name] in place with \the [tool].", \ - "You set the bone in [target]'s [affected.name] in place with \the [tool].") + user.visible_message("[user] sets the bone in [target]'s [affected.name] in place with \the [tool].", \ + "You set the bone in [target]'s [affected.name] in place with \the [tool].") affected.stage = 2 else user.visible_message("[user] sets the bone in [target]'s [affected.name] in the WRONG place with \the [tool].", \ @@ -110,14 +110,14 @@ return affected && affected.organ_tag == BP_HEAD && (affected.robotic < ORGAN_ROBOT) && affected.open >= 2 && affected.stage == 1 /datum/surgery_step/mend_skull/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] is beginning to piece together [target]'s skull with \the [tool]." , \ - "You are beginning to piece together [target]'s skull with \the [tool].") + user.visible_message("[user] is beginning to piece together [target]'s skull with \the [tool]." , \ + "You are beginning to piece together [target]'s skull with \the [tool].") ..() /datum/surgery_step/mend_skull/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] sets [target]'s skull with \the [tool]." , \ - "You set [target]'s skull with \the [tool].") + user.visible_message("[user] sets [target]'s skull with \the [tool]." , \ + "You set [target]'s skull with \the [tool].") affected.stage = 2 /datum/surgery_step/mend_skull/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -153,14 +153,14 @@ /datum/surgery_step/finish_bone/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts to finish mending the damaged bones in [target]'s [affected.name] with \the [tool].", \ - "You start to finish mending the damaged bones in [target]'s [affected.name] with \the [tool].") + user.visible_message("[user] starts to finish mending the damaged bones in [target]'s [affected.name] with \the [tool].", \ + "You start to finish mending the damaged bones in [target]'s [affected.name] with \the [tool].") ..() /datum/surgery_step/finish_bone/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has mended the damaged bones in [target]'s [affected.name] with \the [tool]." , \ - "You have mended the damaged bones in [target]'s [affected.name] with \the [tool]." ) + user.visible_message("[user] has mended the damaged bones in [target]'s [affected.name] with \the [tool]." , \ + "You have mended the damaged bones in [target]'s [affected.name] with \the [tool]." ) affected.status &= ~ORGAN_BROKEN affected.stage = 0 @@ -193,15 +193,15 @@ /datum/surgery_step/clamp_bone/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) if (affected.stage == 0) - user.visible_message("[user] starts repairing the damaged bones in [target]'s [affected.name] with \the [tool]." , \ - "You starts repairing the damaged bones in [target]'s [affected.name] with \the [tool].") + user.visible_message("[user] starts repairing the damaged bones in [target]'s [affected.name] with \the [tool]." , \ + "You starts repairing the damaged bones in [target]'s [affected.name] with \the [tool].") target.custom_pain("Something in your [affected.name] is causing you a lot of pain!", 50) ..() /datum/surgery_step/clamp_bone/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] sets the bone in [target]'s [affected.name] with \the [tool].", \ - "You sets [target]'s bone in [affected.name] with \the [tool].") + user.visible_message("[user] sets the bone in [target]'s [affected.name] with \the [tool].", \ + "You sets [target]'s bone in [affected.name] with \the [tool].") affected.status &= ~ORGAN_BROKEN /datum/surgery_step/clamp_bone/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) diff --git a/code/modules/surgery/encased.dm b/code/modules/surgery/encased.dm index ccad59c5348..89cb99a805e 100644 --- a/code/modules/surgery/encased.dm +++ b/code/modules/surgery/encased.dm @@ -48,8 +48,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has cut [target]'s [affected.encased] open with \the [tool].", \ - "You have cut [target]'s [affected.encased] open with \the [tool].") + user.visible_message("[user] has cut [target]'s [affected.encased] open with \the [tool].", \ + "You have cut [target]'s [affected.encased] open with \the [tool].") affected.open = 2.5 /datum/surgery_step/open_encased/saw/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -98,8 +98,8 @@ if (!hasorgans(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "[user] forces open [target]'s [affected.encased] with \the [tool]." - var/self_msg = "You force open [target]'s [affected.encased] with \the [tool]." + var/msg = "[user] forces open [target]'s [affected.encased] with \the [tool]." + var/self_msg = "You force open [target]'s [affected.encased] with \the [tool]." user.visible_message(msg, self_msg) affected.open = 3 @@ -152,8 +152,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "[user] bends [target]'s [affected.encased] back into place with \the [tool]." - var/self_msg = "You bend [target]'s [affected.encased] back into place with \the [tool]." + var/msg = "[user] bends [target]'s [affected.encased] back into place with \the [tool]." + var/self_msg = "You bend [target]'s [affected.encased] back into place with \the [tool]." user.visible_message(msg, self_msg) affected.open = 2.5 @@ -210,8 +210,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "[user] applied \the [tool] to [target]'s [affected.encased]." - var/self_msg = "You applied \the [tool] to [target]'s [affected.encased]." + var/msg = "[user] applied \the [tool] to [target]'s [affected.encased]." + var/self_msg = "You applied \the [tool] to [target]'s [affected.encased]." user.visible_message(msg, self_msg) affected.open = 2 @@ -250,8 +250,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has cut [target]'s [affected.encased] wide open with \the [tool].", \ - "You have cut [target]'s [affected.encased] wide open with \the [tool].") + user.visible_message("[user] has cut [target]'s [affected.encased] wide open with \the [tool].", \ + "You have cut [target]'s [affected.encased] wide open with \the [tool].") affected.open = 3 /datum/surgery_step/open_encased/advancedsaw_open/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -300,8 +300,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "[user] sealed \the [target]'s [affected.encased] with \the [tool]." - var/self_msg = "You sealed \the [target]'s [affected.encased] with \the [tool]." + var/msg = "[user] sealed \the [target]'s [affected.encased] with \the [tool]." + var/self_msg = "You sealed \the [target]'s [affected.encased] with \the [tool]." user.visible_message(msg, self_msg) affected.open = 2 diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm index 8e0edaebcdd..ae72bdad4e5 100644 --- a/code/modules/surgery/face.dm +++ b/code/modules/surgery/face.dm @@ -39,8 +39,8 @@ ..() /datum/surgery_step/generic/cut_face/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] has cut open [target]'s face and neck with \the [tool]." , \ - " You have cut open[target]'s face and neck with \the [tool].",) + user.visible_message("[user] has cut open [target]'s face and neck with \the [tool]." , \ + " You have cut open[target]'s face and neck with \the [tool].",) target.op_stage.face = 1 /datum/surgery_step/generic/cut_face/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -73,8 +73,8 @@ ..() /datum/surgery_step/face/mend_vocal/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] mends [target]'s vocal cords with \the [tool].", \ - "You mend [target]'s vocal cords with \the [tool].") + user.visible_message("[user] mends [target]'s vocal cords with \the [tool].", \ + "You mend [target]'s vocal cords with \the [tool].") target.op_stage.face = 2 /datum/surgery_step/face/mend_vocal/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -106,8 +106,8 @@ ..() /datum/surgery_step/face/fix_face/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] pulls the skin on [target]'s face back in place with \the [tool].", \ - "You pull the skin on [target]'s face back in place with \the [tool].") + user.visible_message("[user] pulls the skin on [target]'s face back in place with \the [tool].", \ + "You pull the skin on [target]'s face back in place with \the [tool].") target.op_stage.face = 3 /datum/surgery_step/face/fix_face/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -135,14 +135,14 @@ return ..() && target.op_stage.face > 0 /datum/surgery_step/face/cauterize/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] is beginning to cauterize the incision on [target]'s face and neck with \the [tool]." , \ - "You are beginning to cauterize the incision on [target]'s face and neck with \the [tool].") + user.visible_message("[user] is beginning to cauterize the incision on [target]'s face and neck with \the [tool]." , \ + "You are beginning to cauterize the incision on [target]'s face and neck with \the [tool].") ..() /datum/surgery_step/face/cauterize/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] cauterizes the incision on [target]'s face and neck with \the [tool].", \ - "You cauterize the incision on [target]'s face and neck with \the [tool].") + user.visible_message("[user] cauterizes the incision on [target]'s face and neck with \the [tool].", \ + "You cauterize the incision on [target]'s face and neck with \the [tool].") affected.open = 0 affected.status &= ~ORGAN_BLEEDING if (target.op_stage.face == 3) diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index e54d9da769d..31c41500fa2 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -51,8 +51,8 @@ /datum/surgery_step/generic/cut_open/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has made an incision on [target]'s [affected.name] with \the [tool].", \ - "You have made an incision on [target]'s [affected.name] with \the [tool].",) + user.visible_message("[user] has made an incision on [target]'s [affected.name] with \the [tool].", \ + "You have made an incision on [target]'s [affected.name] with \the [tool].",) affected.open = 1 if(istype(target) && target.should_have_organ(O_HEART)) @@ -96,8 +96,8 @@ /datum/surgery_step/generic/cut_with_laser/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has made a bloodless incision on [target]'s [affected.name] with \the [tool].", \ - "You have made a bloodless incision on [target]'s [affected.name] with \the [tool].",) + user.visible_message("[user] has made a bloodless incision on [target]'s [affected.name] with \the [tool].", \ + "You have made a bloodless incision on [target]'s [affected.name] with \the [tool].",) //Could be cleaner ... affected.open = 1 @@ -140,8 +140,8 @@ /datum/surgery_step/generic/incision_manager/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has constructed a prepared incision on and within [target]'s [affected.name] with \the [tool].", \ - "You have constructed a prepared incision on and within [target]'s [affected.name] with \the [tool].",) + user.visible_message("[user] has constructed a prepared incision on and within [target]'s [affected.name] with \the [tool].", \ + "You have constructed a prepared incision on and within [target]'s [affected.name] with \the [tool].",) affected.open = 1 if(istype(target) && target.should_have_organ(O_HEART)) @@ -186,8 +186,8 @@ /datum/surgery_step/generic/clamp_bleeders/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] clamps bleeders in [target]'s [affected.name] with \the [tool].", \ - "You clamp bleeders in [target]'s [affected.name] with \the [tool].") + user.visible_message("[user] clamps bleeders in [target]'s [affected.name] with \the [tool].", \ + "You clamp bleeders in [target]'s [affected.name] with \the [tool].") affected.organ_clamp() spread_germs_to_organ(affected, user) @@ -233,14 +233,14 @@ /datum/surgery_step/generic/retract_skin/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "[user] keeps the incision open on [target]'s [affected.name] with \the [tool]." - var/self_msg = "You keep the incision open on [target]'s [affected.name] with \the [tool]." + var/msg = "[user] keeps the incision open on [target]'s [affected.name] with \the [tool]." + var/self_msg = "You keep the incision open on [target]'s [affected.name] with \the [tool]." if (target_zone == BP_TORSO) - msg = "[user] keeps the ribcage open on [target]'s torso with \the [tool]." - self_msg = "You keep the ribcage open on [target]'s torso with \the [tool]." + msg = "[user] keeps the ribcage open on [target]'s torso with \the [tool]." + self_msg = "You keep the ribcage open on [target]'s torso with \the [tool]." if (target_zone == BP_GROIN) - msg = "[user] keeps the incision open on [target]'s lower abdomen with \the [tool]." - self_msg = "You keep the incision open on [target]'s lower abdomen with \the [tool]." + msg = "[user] keeps the incision open on [target]'s lower abdomen with \the [tool]." + self_msg = "You keep the incision open on [target]'s lower abdomen with \the [tool]." user.visible_message(msg, self_msg) affected.open = 2 @@ -286,8 +286,8 @@ /datum/surgery_step/generic/cauterize/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] cauterizes the incision on [target]'s [affected.name] with \the [tool].", \ - "You cauterize the incision on [target]'s [affected.name] with \the [tool].") + user.visible_message("[user] cauterizes the incision on [target]'s [affected.name] with \the [tool].", \ + "You cauterize the incision on [target]'s [affected.name] with \the [tool].") affected.open = 0 affected.germ_level = 0 affected.status &= ~ORGAN_BLEEDING @@ -331,8 +331,8 @@ /datum/surgery_step/generic/amputate/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] amputates [target]'s [affected.name] at the [affected.amputation_point] with \the [tool].", \ - "You amputate [target]'s [affected.name] with \the [tool].") + user.visible_message("[user] amputates [target]'s [affected.name] at the [affected.amputation_point] with \the [tool].", \ + "You amputate [target]'s [affected.name] with \the [tool].") affected.droplimb(1,DROPLIMB_EDGE) /datum/surgery_step/generic/amputate/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm index f9a3a75d433..762578198b1 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -67,8 +67,8 @@ end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) - user.visible_message("[user] makes some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].", \ - "You make some space inside [target]'s [get_cavity(affected)] cavity with \the [tool]." ) + user.visible_message("[user] makes some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].", \ + "You make some space inside [target]'s [get_cavity(affected)] cavity with \the [tool]." ) /////////////////////////////////////////////////////////////// // Cavity Closing Surgery @@ -101,8 +101,8 @@ /datum/surgery_step/cavity/close_space/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) - user.visible_message("[user] mends [target]'s [get_cavity(affected)] cavity walls with \the [tool].", \ - " You mend[target]'s [get_cavity(affected)] cavity walls with \the [tool]." ) + user.visible_message("[user] mends [target]'s [get_cavity(affected)] cavity walls with \the [tool].", \ + " You mend[target]'s [get_cavity(affected)] cavity walls with \the [tool]." ) /////////////////////////////////////////////////////////////// // Item Implantation Surgery @@ -130,16 +130,16 @@ /datum/surgery_step/cavity/place_item/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts putting \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \ - "You start putting \the [tool] inside [target]'s [get_cavity(affected)] cavity." ) //Nobody will probably ever see this, but I made these two blue. ~CK + user.visible_message("[user] starts putting \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \ + "You start putting \the [tool] inside [target]'s [get_cavity(affected)] cavity." ) //Nobody will probably ever see this, but I made these two blue. ~CK target.custom_pain("The pain in your chest is living hell!",1) ..() /datum/surgery_step/cavity/place_item/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) - user.visible_message("[user] puts \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \ - "You put \the [tool] inside [target]'s [get_cavity(affected)] cavity." ) + user.visible_message("[user] puts \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \ + "You put \the [tool] inside [target]'s [get_cavity(affected)] cavity." ) if (tool.w_class > get_max_wclass(affected)/2 && prob(50) && (affected.robotic < ORGAN_ROBOT)) to_chat(user, " You tear some blood vessels trying to fit such a big object in this cavity.") var/datum/wound/internal_bleeding/I = new (10) @@ -178,8 +178,8 @@ /datum/surgery_step/cavity/implant_removal/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts poking around inside [target]'s [affected.name] with \the [tool].", \ - "You start poking around inside [target]'s [affected.name] with \the [tool]." ) + user.visible_message("[user] starts poking around inside [target]'s [affected.name] with \the [tool].", \ + "You start poking around inside [target]'s [affected.name] with \the [tool]." ) target.custom_pain("The pain in your [affected.name] is living hell!",1) ..() @@ -202,8 +202,8 @@ find_prob +=50 if (prob(find_prob)) - user.visible_message("[user] takes something out of incision on [target]'s [affected.name] with \the [tool]!", \ - "You take [obj] out of incision on [target]'s [affected.name]s with \the [tool]!" ) + user.visible_message("[user] takes something out of incision on [target]'s [affected.name] with \the [tool]!", \ + "You take [obj] out of incision on [target]'s [affected.name]s with \the [tool]!" ) affected.implants -= obj ENABLE_BITFIELD(target.hud_updateflag, IMPLOYAL_HUD) @@ -225,11 +225,11 @@ imp.implanted = 0 else if(istype(tool,/obj/item/nif)){var/obj/item/nif/N = tool;N.unimplant(target)} //VOREStation Add - NIF support else - user.visible_message("[user] removes \the [tool] from [target]'s [affected.name].", \ - "There's something inside [target]'s [affected.name], but you just missed it this time." ) + user.visible_message("[user] removes \the [tool] from [target]'s [affected.name].", \ + "There's something inside [target]'s [affected.name], but you just missed it this time." ) else - user.visible_message("[user] could not find anything inside [target]'s [affected.name], and pulls \the [tool] out.", \ - "You could not find anything inside [target]'s [affected.name]." ) + user.visible_message("[user] could not find anything inside [target]'s [affected.name], and pulls \the [tool] out.", \ + "You could not find anything inside [target]'s [affected.name]." ) /datum/surgery_step/cavity/implant_removal/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) ..() diff --git a/code/modules/surgery/neck.dm b/code/modules/surgery/neck.dm index 9321642fb2f..32956bffd54 100644 --- a/code/modules/surgery/neck.dm +++ b/code/modules/surgery/neck.dm @@ -40,8 +40,8 @@ ..() /datum/surgery_step/brainstem/mend_vessels/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] has mended the blood vessels on [target]'s brainstem with \the [tool]." , \ - " You have mended the blood vessels on [target]'s brainstem with \the [tool].",) + user.visible_message("[user] has mended the blood vessels on [target]'s brainstem with \the [tool]." , \ + " You have mended the blood vessels on [target]'s brainstem with \the [tool].",) target.op_stage.brainstem = 1 /datum/surgery_step/brainstem/mend_vessels/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -78,8 +78,8 @@ /datum/surgery_step/brainstem/drill_vertebrae/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has drilled around [target]'s brainstem with \the [tool]." , \ - " You have drilled around [target]'s brainstem with \the [tool].",) + user.visible_message("[user] has drilled around [target]'s brainstem with \the [tool]." , \ + " You have drilled around [target]'s brainstem with \the [tool].",) target.AdjustParalysis(10) //We're getting Invasive here. This only ticks down when the person is alive, so it's a good side-effect for this step. Rattling the braincase with a drill is not optimal. target.op_stage.brainstem = 2 affected.fracture() //Does not apply damage, simply breaks it if it wasn't already. Doesn't stop a defib on its own. @@ -118,8 +118,8 @@ ..() /datum/surgery_step/brainstem/clean_chips/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] has cleaned around [target]'s brainstem with \the [tool]." , \ - " You have cleaned around [target]'s brainstem with \the [tool].",) + user.visible_message("[user] has cleaned around [target]'s brainstem with \the [tool]." , \ + " You have cleaned around [target]'s brainstem with \the [tool].",) target.AdjustParalysis(10) //Still invasive. target.op_stage.brainstem = 3 @@ -157,8 +157,8 @@ ..() /datum/surgery_step/brainstem/mend_cord/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] has fused [target]'s spinal cord with \the [tool]." , \ - " You have fused [target]'s spinal cord with \the [tool].",) + user.visible_message("[user] has fused [target]'s spinal cord with \the [tool]." , \ + " You have fused [target]'s spinal cord with \the [tool].",) target.op_stage.brainstem = 4 target.AdjustParalysis(5) target.add_modifier(/datum/modifier/franken_sickness, 20 MINUTES) @@ -196,8 +196,8 @@ ..() /datum/surgery_step/brainstem/mend_vertebrae/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] has mended [target]'s vertebrae with \the [tool]." , \ - " You have mended [target]'s vertebrae with \the [tool].",) + user.visible_message("[user] has mended [target]'s vertebrae with \the [tool]." , \ + " You have mended [target]'s vertebrae with \the [tool].",) target.can_defib = 1 target.op_stage.brainstem = 5 @@ -235,8 +235,8 @@ ..() /datum/surgery_step/brainstem/realign_tissue/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] has realigned the tissues in [target]'s skull back into place with \the [tool]." , \ - " You have realigned the tissues in [target]'s skull back into place with \the [tool].",) + user.visible_message("[user] has realigned the tissues in [target]'s skull back into place with \the [tool]." , \ + " You have realigned the tissues in [target]'s skull back into place with \the [tool].",) target.AdjustParalysis(5) //I n v a s i v e target.op_stage.brainstem = 0 //The cycle begins anew. diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index 7c6307a96c3..5afd672dd09 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -41,8 +41,8 @@ /datum/surgery_step/fix_vein/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has patched the damaged vein in [target]'s [affected.name] with \the [tool].", \ - "You have patched the damaged vein in [target]'s [affected.name] with \the [tool].") + user.visible_message("[user] has patched the damaged vein in [target]'s [affected.name] with \the [tool].", \ + "You have patched the damaged vein in [target]'s [affected.name] with \the [tool].") for(var/datum/wound/W in affected.wounds) if(W.internal) affected.wounds -= W @@ -92,8 +92,8 @@ /datum/surgery_step/fix_dead_tissue/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has cut away necrotic tissue in [target]'s [affected.name] with \the [tool].", \ - "You have cut away necrotic tissue in [target]'s [affected.name] with \the [tool].") + user.visible_message("[user] has cut away necrotic tissue in [target]'s [affected.name] with \the [tool].", \ + "You have cut away necrotic tissue in [target]'s [affected.name] with \the [tool].") affected.open = 3 /datum/surgery_step/fix_dead_tissue/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -158,8 +158,8 @@ affected.status &= ~ORGAN_DEAD affected.owner.update_icons_body() - user.visible_message("[user] applies [trans] units of the solution to affected tissue in [target]'s [affected.name].", \ - "You apply [trans] units of the solution to affected tissue in [target]'s [affected.name] with \the [tool].") + user.visible_message("[user] applies [trans] units of the solution to affected tissue in [target]'s [affected.name].", \ + "You apply [trans] units of the solution to affected tissue in [target]'s [affected.name] with \the [tool].") /datum/surgery_step/treat_necrosis/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) diff --git a/code/modules/surgery/slimes.dm b/code/modules/surgery/slimes.dm index 4936a5c70a0..7bfb9f0037c 100644 --- a/code/modules/surgery/slimes.dm +++ b/code/modules/surgery/slimes.dm @@ -29,8 +29,8 @@ "You start cutting through [target]'s flesh with \the [tool].") /datum/surgery_step/slime/cut_flesh/end_step(mob/living/user, mob/living/simple_mob/slime/target, target_zone, obj/item/tool) - user.visible_message("[user] cuts through [target]'s flesh with \the [tool].", \ - "You cut through [target]'s flesh with \the [tool], revealing its silky innards.") + user.visible_message("[user] cuts through [target]'s flesh with \the [tool].", \ + "You cut through [target]'s flesh with \the [tool], revealing its silky innards.") target.core_removal_stage = 1 /datum/surgery_step/slime/cut_flesh/fail_step(mob/living/user, mob/living/simple_mob/slime/target, target_zone, obj/item/tool) @@ -57,8 +57,8 @@ "You start cutting [target]'s silky innards apart with \the [tool].") /datum/surgery_step/slime/cut_innards/end_step(mob/living/user, mob/living/simple_mob/slime/target, target_zone, obj/item/tool) - user.visible_message("[user] cuts [target]'s innards apart with \the [tool], exposing the cores.", \ - "You cut [target]'s innards apart with \the [tool], exposing the cores.") + user.visible_message("[user] cuts [target]'s innards apart with \the [tool], exposing the cores.", \ + "You cut [target]'s innards apart with \the [tool], exposing the cores.") target.core_removal_stage = 2 /datum/surgery_step/slime/cut_innards/fail_step(mob/living/user, mob/living/simple_mob/slime/target, target_zone, obj/item/tool) @@ -85,8 +85,8 @@ /datum/surgery_step/slime/saw_core/end_step(mob/living/user, mob/living/simple_mob/slime/target, target_zone, obj/item/tool) target.cores-- - user.visible_message("[user] cuts out one of [target]'s cores with \the [tool].",, \ - "You cut out one of [target]'s cores with \the [tool]. [target.cores] cores left.") + user.visible_message("[user] cuts out one of [target]'s cores with \the [tool].",, \ + "You cut out one of [target]'s cores with \the [tool]. [target.cores] cores left.") if(target.cores >= 0) new target.coretype(target.loc) diff --git a/code/modules/vehicles/train.dm b/code/modules/vehicles/train.dm index fcfbf741e3d..bdd296f0a1a 100644 --- a/code/modules/vehicles/train.dm +++ b/code/modules/vehicles/train.dm @@ -100,7 +100,7 @@ unload(user, direction) - to_chat(user, "You climb down from [src].") + to_chat(user, "You climb down from [src].") return 1 @@ -174,7 +174,7 @@ setDir(lead.dir) if(user) - to_chat(user, "You hitch [src] to [T].") + to_chat(user, "You hitch [src] to [T].") update_stats() @@ -188,7 +188,7 @@ lead.tow = null lead.update_stats() - to_chat(user, "You unhitch [src] from [lead].") + to_chat(user, "You unhitch [src] from [lead].") lead = null update_stats() diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index 46f0c06f569..8ac71e811f7 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -136,7 +136,7 @@ health = min(maxhealth, health+10) user.setClickCooldown(user.get_attack_speed(W)) playsound(src, T.usesound, 50, 1) - user.visible_message("[user] repairs [src]!"," You repair [src]!") + user.visible_message("[user] repairs [src]!"," You repair [src]!") else to_chat(user, "Unable to repair with the maintenance panel closed.") else diff --git a/code/modules/virus2/biohazard destroyer.dm b/code/modules/virus2/biohazard destroyer.dm index 5d702824d90..c7bf8a9e5a2 100644 --- a/code/modules/virus2/biohazard destroyer.dm +++ b/code/modules/virus2/biohazard destroyer.dm @@ -17,4 +17,4 @@ I.loc = src.loc for(var/mob/O in hearers(src, null)) - O.show_message("[icon2html(thing = src, target = O)] The [src.name] beeps.", 2) + O.show_message("[icon2html(thing = src, target = O)] The [src.name] beeps.", 2) diff --git a/code/modules/virus2/items_devices.dm b/code/modules/virus2/items_devices.dm index 05b7550ae77..e63d59e53a9 100644 --- a/code/modules/virus2/items_devices.dm +++ b/code/modules/virus2/items_devices.dm @@ -30,7 +30,7 @@ report("Antibodies detected: [antigens2string(C.antibodies)]", user) /obj/item/antibody_scanner/proc/report(var/text, mob/user as mob) - to_chat(user, "\[icon2html(thing = src, target = user)] \The [src] beeps, \"[text]\"") + to_chat(user, "\[icon2html(thing = src, target = user)] \The [src] beeps, \"[text]\"") ///////////////VIRUS DISH/////////////// diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index a3fa31c96c1..adc1772514c 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -509,41 +509,41 @@ if(ishuman(C.loc)) //In a /mob/living/carbon/human var/mob/living/carbon/human/H = C.loc if(H.shoes == C) //Being worn - to_chat(src," You start to climb around the larger creature's feet and ankles!") + to_chat(src," You start to climb around the larger creature's feet and ankles!") to_chat(H,"Something is trying to climb out of your [C]!") var/original_loc = H.loc for(var/escape_time = 100,escape_time > 0,escape_time--) if(H.loc != original_loc) to_chat(src,"You're pinned back underfoot!") - to_chat(H,"You pin the escapee back underfoot!") + to_chat(H,"You pin the escapee back underfoot!") return if(src.loc != C) return sleep(1) - to_chat(src,"You manage to escape \the [C]!") + to_chat(src,"You manage to escape \the [C]!") to_chat(H,"Somone has climbed out of your [C]!") forceMove(H.loc) else //Being held by a human - to_chat(src,"You start to climb out of \the [C]!") + to_chat(src,"You start to climb out of \the [C]!") to_chat(H,"Something is trying to climb out of your [C]!") for(var/escape_time = 60,escape_time > 0,escape_time--) if(H.shoes == C) to_chat(src,"You're pinned underfoot!") - to_chat(H,"You pin the escapee underfoot!") + to_chat(H,"You pin the escapee underfoot!") return if(src.loc != C) return sleep(1) - to_chat(src,"You manage to escape \the [C]!") + to_chat(src,"You manage to escape \the [C]!") to_chat(H,"Somone has climbed out of your [C]!") forceMove(H.loc) - to_chat(src,"You start to climb out of \the [C]!") + to_chat(src,"You start to climb out of \the [C]!") sleep(50) if(loc == C) - to_chat(src,"You climb out of \the [C]!") + to_chat(src,"You climb out of \the [C]!") forceMove(C.loc) return diff --git a/code/modules/vore/fluffstuff/guns/cell_loaded/ml3m_cells.dm b/code/modules/vore/fluffstuff/guns/cell_loaded/ml3m_cells.dm index 4af11608d22..03b4abdba5e 100644 --- a/code/modules/vore/fluffstuff/guns/cell_loaded/ml3m_cells.dm +++ b/code/modules/vore/fluffstuff/guns/cell_loaded/ml3m_cells.dm @@ -306,7 +306,7 @@ /obj/item/projectile/beam/medical_cell/shrink/on_hit(var/mob/living/carbon/human/target) if(istype(target, /mob/living/carbon/human)) target.resize(0.5) - target.show_message("The beam fires into your body, changing your size!") + target.show_message("The beam fires into your body, changing your size!") target.updateicon() else return 1 @@ -320,7 +320,7 @@ /obj/item/projectile/beam/medical_cell/grow/on_hit(var/mob/living/carbon/human/target) if(istype(target, /mob/living/carbon/human)) target.resize(2.0) - target.show_message("The beam fires into your body, changing your size!") + target.show_message("The beam fires into your body, changing your size!") target.updateicon() else return 1 @@ -334,7 +334,7 @@ /obj/item/projectile/beam/medical_cell/normalsize/on_hit(var/mob/living/carbon/human/target) if(istype(target, /mob/living/carbon/human)) target.resize(1) - target.show_message("The beam fires into your body, changing your size!") + target.show_message("The beam fires into your body, changing your size!") target.updateicon() else return 1 diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm index 3ac490b60b0..8127674305c 100644 --- a/code/modules/vore/resizing/sizegun_vr.dm +++ b/code/modules/vore/resizing/sizegun_vr.dm @@ -75,7 +75,7 @@ if(ishuman(target)) var/mob/living/carbon/human/H = M H.resize(set_size, TRUE) - H.show_message(" The beam fires into your body, changing your size!") + H.show_message(" The beam fires into your body, changing your size!") H.updateicon() else if (istype(target, /mob/living/)) var/mob/living/H = M diff --git a/code/modules/xenoarcheaology/artifacts/replicator.dm b/code/modules/xenoarcheaology/artifacts/replicator.dm index df65fc42369..92aac9e9c54 100644 --- a/code/modules/xenoarcheaology/artifacts/replicator.dm +++ b/code/modules/xenoarcheaology/artifacts/replicator.dm @@ -74,7 +74,7 @@ viables.Remove(type) construction[button_desc] = type - fail_message = "[icon2html(thing = src, target = world)] a [pick("loud","soft","sinister","eery","triumphant","depressing","cheerful","angry")] \ + fail_message = "[icon2html(thing = src, target = world)] a [pick("loud","soft","sinister","eery","triumphant","depressing","cheerful","angry")] \ [pick("horn","beep","bing","bleep","blat","honk","hrumph","ding")] sounds and a \ [pick("yellow","purple","green","blue","red","orange","white")] \ [pick("light","dial","meter","window","protrusion","knob","antenna","swirly thing")] \ diff --git a/code/modules/xenoarcheaology/effects/cellcharge.dm b/code/modules/xenoarcheaology/effects/cellcharge.dm index 604078017c5..1838dbcb2e2 100644 --- a/code/modules/xenoarcheaology/effects/cellcharge.dm +++ b/code/modules/xenoarcheaology/effects/cellcharge.dm @@ -10,7 +10,7 @@ var/mob/living/silicon/robot/R = user for (var/obj/item/cell/D in R.contents) D.charge += rand() * 100 + 50 - to_chat(R, "SYSTEM ALERT: Large energy boost detected!") + to_chat(R, "SYSTEM ALERT: Large energy boost detected!") return 1 /datum/artifact_effect/cellcharge/DoEffectAura() @@ -25,7 +25,7 @@ for (var/obj/item/cell/D in M.contents) D.charge += 25 if(world.time - last_message > 200) - to_chat(M, "SYSTEM ALERT: Energy boost detected!") + to_chat(M, "SYSTEM ALERT: Energy boost detected!") last_message = world.time return 1 @@ -41,6 +41,6 @@ for (var/obj/item/cell/D in M.contents) D.charge += rand() * 100 if(world.time - last_message > 200) - to_chat(M, "SYSTEM ALERT: Energy boost detected!") + to_chat(M, "SYSTEM ALERT: Energy boost detected!") last_message = world.time return 1 diff --git a/code/modules/xenoarcheaology/effects/celldrain.dm b/code/modules/xenoarcheaology/effects/celldrain.dm index 12768f1cf2a..d04445cc0f7 100644 --- a/code/modules/xenoarcheaology/effects/celldrain.dm +++ b/code/modules/xenoarcheaology/effects/celldrain.dm @@ -10,7 +10,7 @@ var/mob/living/silicon/robot/R = user for (var/obj/item/cell/D in R.contents) D.charge = max(D.charge - rand() * 100, 0) - to_chat(R, "SYSTEM ALERT: Energy drain detected!") + to_chat(R, "SYSTEM ALERT: Energy drain detected!") return 1 return 1 diff --git a/code/modules/xenoarcheaology/effects/cold.dm b/code/modules/xenoarcheaology/effects/cold.dm index 9855ac280b0..e499ba8270c 100644 --- a/code/modules/xenoarcheaology/effects/cold.dm +++ b/code/modules/xenoarcheaology/effects/cold.dm @@ -11,7 +11,7 @@ /datum/artifact_effect/cold/DoEffectTouch(var/mob/user) if(holder) - to_chat(user, "A chill passes up your spine!") + to_chat(user, "A chill passes up your spine!") var/datum/gas_mixture/env = holder.loc.return_air() if(env) env.temperature = max(env.temperature - rand(5,50), 0) diff --git a/code/modules/xenoarcheaology/effects/goodfeeling.dm b/code/modules/xenoarcheaology/effects/goodfeeling.dm index c5d05adc5e3..4dd2c78d6f1 100644 --- a/code/modules/xenoarcheaology/effects/goodfeeling.dm +++ b/code/modules/xenoarcheaology/effects/goodfeeling.dm @@ -31,7 +31,7 @@ if(prob(75)) to_chat(H, "[pick(drastic_messages)]") else - to_chat(H, "[pick(messages)]") + to_chat(H, "[pick(messages)]") if(prob(50)) H.dizziness += rand(3,5) @@ -42,7 +42,7 @@ for (var/mob/living/carbon/human/H in range(src.effectrange,T)) if(prob(5)) if(prob(75)) - to_chat(H, "[pick(messages)]") + to_chat(H, "[pick(messages)]") else to_chat(H, "[pick(drastic_messages)]") @@ -58,7 +58,7 @@ if(prob(95)) to_chat(H, "[pick(drastic_messages)]") else - to_chat(H, "[pick(messages)]") + to_chat(H, "[pick(messages)]") if(prob(50)) H.dizziness += rand(3,5) diff --git a/code/modules/xenoarcheaology/effects/heal.dm b/code/modules/xenoarcheaology/effects/heal.dm index b195c736c1d..c91fd78b499 100644 --- a/code/modules/xenoarcheaology/effects/heal.dm +++ b/code/modules/xenoarcheaology/effects/heal.dm @@ -8,7 +8,7 @@ var/weakness = GetAnomalySusceptibility(toucher) if(prob(weakness * 100)) var/mob/living/carbon/C = toucher - to_chat(C, "You feel a soothing energy invigorate you.") + to_chat(C, "You feel a soothing energy invigorate you.") if(ishuman(toucher)) var/mob/living/carbon/human/H = toucher @@ -40,7 +40,7 @@ var/weakness = GetAnomalySusceptibility(C) if(prob(weakness * 100)) if(prob(10)) - to_chat(C, "You feel a soothing energy radiating from something nearby.") + to_chat(C, "You feel a soothing energy radiating from something nearby.") C.adjustBruteLoss(-1 * weakness) C.adjustFireLoss(-1 * weakness) C.adjustToxLoss(-1 * weakness) @@ -55,7 +55,7 @@ for (var/mob/living/carbon/C in range(src.effectrange,T)) var/weakness = GetAnomalySusceptibility(C) if(prob(weakness * 100)) - to_chat(C, "A wave of energy invigorates you.") + to_chat(C, "A wave of energy invigorates you.") C.adjustBruteLoss(-5 * weakness) C.adjustFireLoss(-5 * weakness) C.adjustToxLoss(-5 * weakness) diff --git a/code/modules/xenoarcheaology/effects/roboheal.dm b/code/modules/xenoarcheaology/effects/roboheal.dm index 0052a539793..f5857b9cb76 100644 --- a/code/modules/xenoarcheaology/effects/roboheal.dm +++ b/code/modules/xenoarcheaology/effects/roboheal.dm @@ -10,7 +10,7 @@ if(user) if (istype(user, /mob/living/silicon/robot)) var/mob/living/silicon/robot/R = user - to_chat(R, "Your systems report damaged components mending by themselves!") + to_chat(R, "Your systems report damaged components mending by themselves!") R.adjustBruteLoss(rand(-10,-30)) R.adjustFireLoss(rand(-10,-30)) return 1 @@ -20,7 +20,7 @@ var/turf/T = get_turf(holder) for (var/mob/living/silicon/robot/M in range(src.effectrange,T)) if(world.time - last_message > 200) - to_chat(M, "SYSTEM ALERT: Beneficial energy field detected!") + to_chat(M, "SYSTEM ALERT: Beneficial energy field detected!") last_message = world.time M.adjustBruteLoss(-1) M.adjustFireLoss(-1) @@ -32,7 +32,7 @@ var/turf/T = get_turf(holder) for (var/mob/living/silicon/robot/M in range(src.effectrange,T)) if(world.time - last_message > 200) - to_chat(M, "SYSTEM ALERT: Structural damage has been repaired by energy pulse!") + to_chat(M, "SYSTEM ALERT: Structural damage has been repaired by energy pulse!") last_message = world.time M.adjustBruteLoss(-10) M.adjustFireLoss(-10) diff --git a/code/modules/xenoarcheaology/effects/sleepy.dm b/code/modules/xenoarcheaology/effects/sleepy.dm index 554e0c92f02..a6d2e033d2d 100644 --- a/code/modules/xenoarcheaology/effects/sleepy.dm +++ b/code/modules/xenoarcheaology/effects/sleepy.dm @@ -11,7 +11,7 @@ var/weakness = GetAnomalySusceptibility(toucher) if(ishuman(toucher) && prob(weakness * 100)) var/mob/living/carbon/human/H = toucher - to_chat(H,pick("You feel like taking a nap."," You feel a yawn coming on."," You feel a little tired.")) + to_chat(H,pick("You feel like taking a nap."," You feel a yawn coming on."," You feel a little tired.")) H.drowsyness = min(H.drowsyness + rand(5,25) * weakness, 50 * weakness) H.eye_blurry = min(H.eye_blurry + rand(1,3) * weakness, 50 * weakness) return 1 @@ -26,7 +26,7 @@ var/weakness = GetAnomalySusceptibility(H) if(prob(weakness * 100)) if(prob(10)) - to_chat(H, pick("You feel like taking a nap."," You feel a yawn coming on."," You feel a little tired.")) + to_chat(H, pick("You feel like taking a nap."," You feel a yawn coming on."," You feel a little tired.")) H.drowsyness = min(H.drowsyness + 1 * weakness, 25 * weakness) H.eye_blurry = min(H.eye_blurry + 1 * weakness, 25 * weakness) for (var/mob/living/silicon/robot/R in range(src.effectrange,holder)) @@ -39,7 +39,7 @@ for(var/mob/living/carbon/human/H in range(src.effectrange, T)) var/weakness = GetAnomalySusceptibility(H) if(prob(weakness * 100)) - to_chat(H, pick("You feel like taking a nap."," You feel a yawn coming on."," You feel a little tired.")) + to_chat(H, pick("You feel like taking a nap."," You feel a yawn coming on."," You feel a little tired.")) H.drowsyness = min(H.drowsyness + rand(5,15) * weakness, 50 * weakness) H.eye_blurry = min(H.eye_blurry + rand(5,15) * weakness, 50 * weakness) for (var/mob/living/silicon/robot/R in range(src.effectrange,holder)) diff --git a/code/modules/xenoarcheaology/finds/talking.dm b/code/modules/xenoarcheaology/finds/talking.dm index c9a75d6193c..da1c2deec98 100644 --- a/code/modules/xenoarcheaology/finds/talking.dm +++ b/code/modules/xenoarcheaology/finds/talking.dm @@ -54,7 +54,7 @@ var/list/options = list("[holder_atom] seems to be listening intently to [source]...",\ "[holder_atom] seems to be focusing on [source]...",\ "[holder_atom] seems to turn it's attention to [source]...") - holder_atom.loc.visible_message("[icon2html(thing = holder_atom, target = world)]] [pick(options)]") + holder_atom.loc.visible_message("[icon2html(thing = holder_atom, target = world)]] [pick(options)]") if(prob(20)) spawn(2) @@ -118,5 +118,5 @@ listening|=M for(var/mob/M in listening) - to_chat(M, "[icon2html(thing = holder_atom, target = M)] [holder_atom] reverberates, \"[msg]\"") + to_chat(M, "[icon2html(thing = holder_atom, target = M)] [holder_atom] reverberates, \"[msg]\"") last_talk_time = world.time diff --git a/code/modules/xenoarcheaology/tools/ano_device_battery.dm b/code/modules/xenoarcheaology/tools/ano_device_battery.dm index 8c3b9bc2f31..87a77cc77f4 100644 --- a/code/modules/xenoarcheaology/tools/ano_device_battery.dm +++ b/code/modules/xenoarcheaology/tools/ano_device_battery.dm @@ -40,7 +40,7 @@ /obj/item/anodevice/attackby(var/obj/I as obj, var/mob/user as mob) if(istype(I, /obj/item/anobattery)) if(!inserted_battery) - to_chat(user, "You insert the battery.") + to_chat(user, "You insert the battery.") user.drop_item() I.loc = src inserted_battery = I @@ -131,13 +131,13 @@ //work out if we need to shutdown if(inserted_battery.stored_charge <= 0) - loc.visible_message("[icon2html(thing = src, target = world)] [src] buzzes.", "[icon2html(thing = src, target = world)] You hear something buzz.") + loc.visible_message("[icon2html(thing = src, target = world)] [src] buzzes.", "[icon2html(thing = src, target = world)] You hear something buzz.") shutdown_emission() else if(world.time > time_end) - loc.visible_message("[icon2html(thing = src, target = world)] [src] chimes.", "[icon2html(thing = src, target = world)] You hear something chime.") + loc.visible_message("[icon2html(thing = src, target = world)] [src] chimes.", "[icon2html(thing = src, target = world)] You hear something chime.") shutdown_emission() else - visible_message("[icon2html(thing = src, target = world)] [src] buzzes.", "[icon2html(thing = src, target = world)] You hear something buzz.") + visible_message("[icon2html(thing = src, target = world)] [src] buzzes.", "[icon2html(thing = src, target = world)] You hear something buzz.") shutdown_emission() last_process = world.time @@ -164,7 +164,7 @@ if(href_list["startup"]) if(inserted_battery && inserted_battery.battery_effect && (inserted_battery.stored_charge > 0) ) activated = 1 - visible_message("[icon2html(thing = src, target = world)] [src] whirrs.", "[icon2html(thing = src, target = world)]You hear something whirr.") + visible_message("[icon2html(thing = src, target = world)] [src] whirrs.", "[icon2html(thing = src, target = world)]You hear something whirr.") if(!inserted_battery.battery_effect.activated) inserted_battery.battery_effect.ToggleActivate(1) time_end = world.time + duration @@ -201,9 +201,9 @@ if(activated && inserted_battery.battery_effect.effect == EFFECT_TOUCH && !isnull(inserted_battery)) inserted_battery.battery_effect.DoEffectTouch(M) inserted_battery.use_power(energy_consumed_on_touch) - user.visible_message("[user] taps [M] with [src], and it shudders on contact.") + user.visible_message("[user] taps [M] with [src], and it shudders on contact.") else - user.visible_message("[user] taps [M] with [src], but nothing happens.") + user.visible_message("[user] taps [M] with [src], but nothing happens.") //admin logging user.lastattacked = M diff --git a/code/modules/xenoarcheaology/tools/artifact_harvester.dm b/code/modules/xenoarcheaology/tools/artifact_harvester.dm index 4ab063abefa..80dcecb628a 100644 --- a/code/modules/xenoarcheaology/tools/artifact_harvester.dm +++ b/code/modules/xenoarcheaology/tools/artifact_harvester.dm @@ -25,7 +25,7 @@ /obj/machinery/artifact_harvester/attackby(var/obj/I as obj, var/mob/user as mob) if(istype(I,/obj/item/anobattery)) if(!inserted_battery) - to_chat(user, "You insert [I] into [src].") + to_chat(user, "You insert [I] into [src].") user.drop_item() I.loc = src inserted_battery = I diff --git a/code/modules/xenoarcheaology/tools/geosample_scanner.dm b/code/modules/xenoarcheaology/tools/geosample_scanner.dm index 411d1d62ce9..cf5b41cecf9 100644 --- a/code/modules/xenoarcheaology/tools/geosample_scanner.dm +++ b/code/modules/xenoarcheaology/tools/geosample_scanner.dm @@ -234,16 +234,16 @@ //emergency stop if seal integrity reaches 0 if(scanner_seal_integrity <= 0 || (scanner_temperature >= 1273 && !rad_shield)) stop_scanning() - visible_message("[icon2html(thing = src, target = world)] buzzes unhappily. It has failed mid-scan!", 2) + visible_message("[icon2html(thing = src, target = world)] buzzes unhappily. It has failed mid-scan!", 2) if(prob(5)) - visible_message("[icon2html(thing = src, target = world)] [pick("whirrs","chuffs","clicks")][pick(" excitedly"," energetically"," busily")].", 2) + visible_message("[icon2html(thing = src, target = world)] [pick("whirrs","chuffs","clicks")][pick(" excitedly"," energetically"," busily")].", 2) else //gradually cool down over time if(scanner_temperature > 0) scanner_temperature = max(scanner_temperature - 5 - 10 * rand(), 0) if(prob(0.75)) - visible_message("[icon2html(thing = src, target = world)] [pick("plinks","hisses")][pick(" quietly"," softly"," sadly"," plaintively")].", 2) + visible_message("[icon2html(thing = src, target = world)] [pick("plinks","hisses")][pick(" quietly"," softly"," sadly"," plaintively")].", 2) last_process_worldtime = world.time /obj/machinery/radiocarbon_spectrometer/proc/stop_scanning() @@ -261,7 +261,7 @@ used_coolant = 0 /obj/machinery/radiocarbon_spectrometer/proc/complete_scan() - visible_message("[icon2html(thing = src, target = world)] makes an insistent chime.", 2) + visible_message("[icon2html(thing = src, target = world)] makes an insistent chime.", 2) if(scanned_item) //create report diff --git a/code/modules/xenoarcheaology/tools/suspension_generator.dm b/code/modules/xenoarcheaology/tools/suspension_generator.dm index a07010b8ef3..dc366f2a446 100644 --- a/code/modules/xenoarcheaology/tools/suspension_generator.dm +++ b/code/modules/xenoarcheaology/tools/suspension_generator.dm @@ -62,7 +62,7 @@ dat += "
" dat += "
" - dat += "Always wear safety gear and consult a field manual before operation.
" + dat += "Always wear safety gear and consult a field manual before operation.
" if(!locked) dat += "Lock console
" else @@ -183,10 +183,10 @@ for(var/mob/living/M in T) M.weakened += 5 - M.visible_message("[icon2html(thing = src, target = world)] [M] begins to float in the air!","You feel tingly and light, but it is difficult to move.") + M.visible_message("[icon2html(thing = src, target = world)] [M] begins to float in the air!","You feel tingly and light, but it is difficult to move.") suspension_field = new(T) - visible_message("[icon2html(thing = src, target = world)] [src] activates with a low hum.") + visible_message("[icon2html(thing = src, target = world)] [src] activates with a low hum.") icon_state = "suspension3" for(var/obj/item/I in T) @@ -196,7 +196,7 @@ if(collected) suspension_field.icon_state = "energynet" suspension_field.overlays += "shield2" - visible_message("[icon2html(thing = suspension_field, target = world)] [suspension_field] gently absconds [collected > 1 ? "something" : "several things"].") + visible_message("[icon2html(thing = suspension_field, target = world)] [suspension_field] gently absconds [collected > 1 ? "something" : "several things"].") else if(istype(T,/turf/simulated/mineral) || istype(T,/turf/simulated/wall)) suspension_field.icon_state = "shieldsparkles" @@ -211,7 +211,7 @@ to_chat(M, "You no longer feel like floating.") M.Weaken(3) - visible_message("[icon2html(thing = src, target = world)] [src] deactivates with a gentle shudder.") + visible_message("[icon2html(thing = src, target = world)] [src] deactivates with a gentle shudder.") qdel(suspension_field) suspension_field = null icon_state = "suspension2"