diff --git a/code/datums/mind.dm b/code/datums/mind.dm index ffb1c88385..ef480e0e59 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -410,7 +410,7 @@ else if (href_list["obj_announce"]) var/obj_count = 1 - current << "Your current objectives:" + current << "Your current objectives:" for(var/datum/objective/objective in objectives) current << "Objective #[obj_count]: [objective.explanation_text]" obj_count++ diff --git a/code/game/gamemodes/changeling/modularchangling.dm b/code/game/gamemodes/changeling/modularchangling.dm index 41f66fb4ec..3b012bdedf 100644 --- a/code/game/gamemodes/changeling/modularchangling.dm +++ b/code/game/gamemodes/changeling/modularchangling.dm @@ -108,7 +108,7 @@ var/list/datum/power/changeling/powerinstances = list() if(enhancedtext) { - body += "Recursive Enhancement Effect: "+enhancedtext+"
" + body += "Recursive Enhancement Effect: "+enhancedtext+"
" } if(!ownsthis) diff --git a/code/game/gamemodes/epidemic/epidemic.dm b/code/game/gamemodes/epidemic/epidemic.dm index b6e4146a9c..9b64742a7a 100644 --- a/code/game/gamemodes/epidemic/epidemic.dm +++ b/code/game/gamemodes/epidemic/epidemic.dm @@ -39,7 +39,7 @@ intercepttext += "Warning: Pathogen [virus_name] has been detected on [station_name()].

" intercepttext += "Code violet quarantine of [station_name()] put under immediate effect.
" intercepttext += "Class [rand(2,5)] cruiser has been dispatched. ETA: [round(cruiser_seconds() / 60)] minutes.
" - intercepttext += "
Instructions
" + intercepttext += "
Instructions
" intercepttext += "* ELIMINATE THREAT WITH EXTREME PREJUDICE. [virus_name] IS HIGHLY CONTAGIOUS. INFECTED CREW MEMBERS MUST BE QUARANTINED IMMEDIATELY.
" intercepttext += "* [station_name()] is under QUARANTINE. Any vessels outbound from [station_name()] will be tracked down and destroyed.
" intercepttext += "* The existence of [virus_name] is highly confidential. To prevent a panic, only high-ranking staff members are authorized to know of its existence. Crew members that illegally obtained knowledge of [virus_name] are to be neutralized.
" diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index e5ec1851c4..9268a713e8 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -50,7 +50,7 @@ var/global/datum/controller/gameticker/ticker do pregame_timeleft = 180 - to_chat(world, "Welcome to the pregame lobby!") + to_chat(world, "Welcome to the pregame lobby!") to_chat(world, "Please set up your character and select ready. The round will start in [pregame_timeleft] seconds.") while(current_state == GAME_STATE_PREGAME) for(var/i=0, i<10, i++) @@ -389,7 +389,7 @@ var/global/datum/controller/gameticker/ticker var/turf/playerTurf = get_turf(Player) if(emergency_shuttle.departed && emergency_shuttle.evac) if(isNotAdminLevel(playerTurf.z)) - Player << "You survived the round, but remained on [station_name()] as [Player.real_name]." + Player << "You survived the round, but remained on [station_name()] as [Player.real_name]." else Player << "You managed to survive the events on [station_name()] as [Player.real_name]." else if(isAdminLevel(playerTurf.z)) @@ -397,7 +397,7 @@ var/global/datum/controller/gameticker/ticker else if(issilicon(Player)) Player << "You remain operational after the events on [station_name()] as [Player.real_name]." else - Player << "You missed the crew transfer after the events on [station_name()] as [Player.real_name]." + 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/game/gamemodes/technomancer/catalog.dm b/code/game/gamemodes/technomancer/catalog.dm index 06464adfb6..ecaeffeec3 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 55d003f06c..ad799fe7c1 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -424,7 +424,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 5a15bca65e..67753cd761 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -186,7 +186,7 @@ if(!input || !(usr in view(1,src))) return CentCom_announce(input, usr) - usr << "Message transmitted." + usr << "Message transmitted." log_game("[key_name(usr)] has made an IA [using_map.boss_short] announcement: [input]") centcomm_message_cooldown = 1 spawn(300)//10 minute cooldown @@ -203,7 +203,7 @@ if(!input || !(usr in view(1,src))) return Syndicate_announce(input, usr) - usr << "Message transmitted." + 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 fd82940b6d..1eaf73a8f5 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 e0112532dd..e04e6728a0 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/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 504d65c306..6246c15177 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -105,7 +105,7 @@ var/pressure = tile_info[index][2] o += "" o += "[celsius]°C " - o += "" + o += "" o += "[pressure]kPa" user << o diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 048c1563b9..b853951537 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -323,11 +323,11 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(6) dat+="ERROR: Could not submit Feed story to Network.

" if(channel_name=="") - dat+="•Invalid receiving channel name.
" + dat+="?Invalid receiving channel name.
" if(scanned_user=="Unknown") - dat+="•Channel author unverified.
" + dat+="?Channel author unverified.
" if(msg == "" || msg == "\[REDACTED\]") - dat+="•Invalid message body.
" + dat+="?Invalid message body.
" dat+="
Return
" if(7) @@ -339,18 +339,18 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co else existing_authors += FC.author if(scanned_user in existing_authors) - dat+="•There already exists a Feed channel under your name.
" + dat+="?There already exists a Feed channel under your name.
" if(channel_name=="" || channel_name == "\[REDACTED\]") - dat+="•Invalid channel name.
" + dat+="?Invalid channel name.
" var/check = 0 for(var/datum/feed_channel/FC in news_network.network_channels) if(FC.channel_name == channel_name) check = 1 break if(check) - dat+="•Channel name already in use.
" + dat+="?Channel name already in use.
" if(scanned_user=="Unknown") - dat+="•Channel author unverified.
" + dat+="?Channel author unverified.
" dat+="
Return
" if(8) var/total_num=length(news_network.network_channels) @@ -464,11 +464,11 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(16) dat+="ERROR: Wanted Issue rejected by Network.

" if(channel_name=="" || channel_name == "\[REDACTED\]") - dat+="•Invalid name for person wanted.
" + dat+="?Invalid name for person wanted.
" if(scanned_user=="Unknown") - dat+="•Issue author unverified.
" + dat+="?Issue author unverified.
" if(msg == "" || msg == "\[REDACTED\]") - dat+="•Invalid description.
" + dat+="?Invalid description.
" dat+="
Return
" if(17) dat+="Wanted Issue successfully deleted from Circulation
" @@ -814,7 +814,7 @@ obj/item/weapon/newspaper/attack_self(mob/user as mob) switch(screen) if(0) //Cover dat+="
The Griffon
" - dat+="
[using_map.company_name]-standard newspaper, for use on [using_map.company_name]© Space Facilities
" + dat+="
[using_map.company_name]-standard newspaper, for use on [using_map.company_name]? Space Facilities
" if(isemptylist(news_content)) if(important_message) dat+="Contents:
" @@ -919,7 +919,7 @@ obj/item/weapon/newspaper/Topic(href, href_list) obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/pen)) if(scribble_page == curr_page) - user << "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?" + 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 2ad81624a3..182f4edb75 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -253,7 +253,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() if(inoperable(MAINT)) return if(screen == RCS_MESSAUTH) var/obj/item/weapon/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 d55dc0bb3e..7d8afeffa6 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -95,8 +95,8 @@ 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 thick old-style button, with 2 grimy LED lights next to it. The [] LED is on.
Press button",(safetieson? "GREEN" : "RED"),src) + 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") //onclose(user, "ssu_m_panel") @@ -110,7 +110,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) @@ -402,9 +402,9 @@ if(OCCUPANT.client) if(user != OCCUPANT) - OCCUPANT << "The machine kicks you out!" + OCCUPANT << "The machine kicks you out!" if(user.loc != src.loc) - OCCUPANT << "You leave the not-so-cozy confines of the SSU." + OCCUPANT << "You leave the not-so-cozy confines of the SSU." OCCUPANT.client.eye = OCCUPANT.client.mob OCCUPANT.client.perspective = MOB_PERSPECTIVE @@ -474,7 +474,7 @@ if(istype(I, /obj/item/weapon/screwdriver)) panelopen = !panelopen playsound(src, I.usesound, 100, 1) - user << text("You [] the unit's maintenance panel.",(panelopen ? "open up" : "close")) + user << text("You [] the unit's maintenance panel.",(panelopen ? "open up" : "close")) updateUsrDialog() return if(istype(I, /obj/item/weapon/grab)) @@ -514,7 +514,7 @@ return var/obj/item/clothing/suit/space/S = I if(SUIT) - user << "The unit already contains a suit." + user << "The unit already contains a suit." return user << "You load the [S.name] into the storage compartment." user.drop_item() @@ -528,7 +528,7 @@ return var/obj/item/clothing/head/helmet/H = I if(HELMET) - user << "The unit already contains a helmet." + user << "The unit already contains a helmet." return user << "You load the [H.name] into the storage compartment." user.drop_item() @@ -542,7 +542,7 @@ return var/obj/item/clothing/mask/M = I if(MASK) - user << "The unit already contains a mask." + user << "The unit already contains a mask." return user << "You load the [M.name] into the storage compartment." user.drop_item() diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm index 2d3034573a..ab15be3316 100644 --- a/code/game/mecha/combat/durand.dm +++ b/code/game/mecha/combat/durand.dm @@ -44,7 +44,7 @@ defence = !defence if(defence) 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.") diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index eadc96aadd..10423893fd 100644 --- a/code/game/mecha/combat/gygax.dm +++ b/code/game/mecha/combat/gygax.dm @@ -63,7 +63,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/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index d33570cd9c..dc63664e27 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -64,7 +64,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 360c9e1bbf..8153f95def 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -463,12 +463,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 @@ -1668,7 +1668,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/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 8f2827c7ab..bed23c2357 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -239,7 +239,7 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard) return var/mob/M = usr if(!istype(M, /mob/living/carbon)) - usr << "You don't have any DNA, or your DNA is incompatible with this device." + usr << "You don't have any DNA, or your DNA is incompatible with this device." else var/datum/dna/dna = usr.dna pai.master = M.real_name diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm index 749f1a08b9..7f6f4aa6e5 100644 --- a/code/game/objects/items/weapons/hydroponics.dm +++ b/code/game/objects/items/weapons/hydroponics.dm @@ -68,7 +68,7 @@ for (var/O in item_quants) if(item_quants[O] > 0) var/N = item_quants[O] - dat += "[capitalize(O)]:" + dat += "[capitalize(O)]:" dat += " [N] " dat += "Vend" dat += "
" diff --git a/code/game/verbs/advanced_who.dm b/code/game/verbs/advanced_who.dm index 855c70dafa..bd176074b3 100644 --- a/code/game/verbs/advanced_who.dm +++ b/code/game/verbs/advanced_who.dm @@ -60,7 +60,7 @@ if(isobserver(O)) entry += " - Observing" else if(istype(O,/mob/new_player)) - entry += " - In Lobby" + entry += " - In Lobby" else entry += " - Playing" Lines += entry @@ -70,7 +70,7 @@ if(isobserver(O)) //Woo, players can see entry += " - Observing" else if(istype(O,/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 e4d2298ace..6c053321ad 100644 --- a/code/modules/admin/DB ban/functions.dm +++ b/code/modules/admin/DB ban/functions.dm @@ -82,7 +82,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() - usr << "Ban saved to database." + 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 e28c4fd570..d0d82259b9 100644 --- a/code/modules/admin/IsBanned.dm +++ b/code/modules/admin/IsBanned.dm @@ -7,13 +7,13 @@ world/IsBanned(key,address,computer_id) //Guest Checking if(!config.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") 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.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(key), computer_id, "Use of ToR", "Automated Ban", 0, 0) return list("reason"="Using ToR", "desc"="\nReason: The network you are using to connect has been banned.\nIf you believe this is a mistake, please request help at [config.banappeals]") @@ -25,7 +25,7 @@ world/IsBanned(key,address,computer_id) . = CheckBan( ckey(key), 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"]]") return . return ..() //default pager ban stuff diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index 0b3899ad99..953941de99 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 0a2feaf850..d6eae136bf 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -403,21 +403,21 @@ proc/admin_notice(var/message, var/rights) if(6) dat+="ERROR: Could not submit Feed story to Network.

" if(src.admincaster_feed_channel.channel_name=="") - dat+="•Invalid receiving channel name.
" + dat+="??Invalid receiving channel name.
" if(src.admincaster_feed_message.body == "" || src.admincaster_feed_message.body == "\[REDACTED\]") - dat+="•Invalid message body.
" + dat+="??Invalid message body.
" dat+="
Return
" if(7) dat+="ERROR: Could not submit Feed Channel to Network.

" if(src.admincaster_feed_channel.channel_name =="" || src.admincaster_feed_channel.channel_name == "\[REDACTED\]") - dat+="•Invalid channel name.
" + dat+="??Invalid channel name.
" var/check = 0 for(var/datum/feed_channel/FC in news_network.network_channels) if(FC.channel_name == src.admincaster_feed_channel.channel_name) check = 1 break if(check) - dat+="•Channel name already in use.
" + dat+="??Channel name already in use.
" dat+="
Return
" if(9) dat+="[src.admincaster_feed_channel.channel_name]: \[created by: [src.admincaster_feed_channel.author]\]
" @@ -531,9 +531,9 @@ proc/admin_notice(var/message, var/rights) if(16) dat+="ERROR: Wanted Issue rejected by Network.

" if(src.admincaster_feed_message.author =="" || src.admincaster_feed_message.author == "\[REDACTED\]") - dat+="•Invalid name for person wanted.
" + dat+="??Invalid name for person wanted.
" if(src.admincaster_feed_message.body == "" || src.admincaster_feed_message.body == "\[REDACTED\]") - dat+="•Invalid description.
" + dat+="??Invalid description.
" dat+="
Return
" if(17) dat+={" @@ -877,7 +877,7 @@ var/datum/announcement/minor/admin_min_announcer = new ticker.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 @@ -894,7 +894,7 @@ var/datum/announcement/minor/admin_min_announcer = new else 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! @@ -920,7 +920,7 @@ var/datum/announcement/minor/admin_min_announcer = new world << "You may now respawn." else world << "You may no longer respawn :(" - message_admins("[key_name_admin(usr)] toggled respawn to [config.abandon_allowed ? "On" : "Off"].", 1) + message_admins("[key_name_admin(usr)] toggled respawn to [config.abandon_allowed ? "On" : "Off"].", 1) log_admin("[key_name(usr)] toggled respawn to [config.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! @@ -952,7 +952,7 @@ var/datum/announcement/minor/admin_min_announcer = new if (!ticker || ticker.current_state != GAME_STATE_PREGAME) ticker.delay_end = !ticker.delay_end log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].") - message_admins("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1) + message_admins("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1) return //alert("Round end delayed", null, null, null, null, null) round_progressing = !round_progressing if (!round_progressing) @@ -968,7 +968,7 @@ var/datum/announcement/minor/admin_min_announcer = new set desc="Toggle admin jumping" set name="Toggle Jump" config.allow_admin_jump = !(config.allow_admin_jump) - message_admins("Toggled admin jumping to [config.allow_admin_jump].") + message_admins("Toggled admin jumping to [config.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() @@ -976,7 +976,7 @@ var/datum/announcement/minor/admin_min_announcer = new set desc="Toggle admin spawning" set name="Toggle Spawn" config.allow_admin_spawning = !(config.allow_admin_spawning) - message_admins("Toggled admin item spawning to [config.allow_admin_spawning].") + message_admins("Toggled admin item spawning to [config.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() @@ -984,7 +984,7 @@ var/datum/announcement/minor/admin_min_announcer = new set desc="Toggle admin revives" set name="Toggle Revive" config.allow_admin_rev = !(config.allow_admin_rev) - message_admins("Toggled reviving to [config.allow_admin_rev].") + message_admins("Toggled reviving to [config.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/immreboot() @@ -994,7 +994,7 @@ var/datum/announcement/minor/admin_min_announcer = new if(!usr.client.holder) return if( alert("Reboot server?",,"Yes","No") == "No") return - world << "Rebooting world!Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!" + world << "Rebooting world!Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!" log_admin("[key_name(usr)] initiated an immediate reboot.") feedback_set_details("end_error","immediate admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]") @@ -1258,7 +1258,7 @@ var/datum/announcement/minor/admin_min_announcer = new else world << "Guests may now enter the game." log_admin("[key_name(usr)] toggled guests game entering [config.guests_allowed?"":"dis"]allowed.") - message_admins("[key_name_admin(usr)] toggled guests game entering [config.guests_allowed?"":"dis"]allowed.", 1) + message_admins("[key_name_admin(usr)] toggled guests game entering [config.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 3689c49970..59e1e268ca 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -535,7 +535,7 @@ var/list/admin_verbs_event_manager = list( mob.alpha = max(mob.alpha + 100, 255) else mob.invisibility = INVISIBILITY_OBSERVER - mob << "Invisimin on. You are now as invisible as a ghost." + mob << "Invisimin on. You are now as invisible as a ghost." mob.alpha = max(mob.alpha - 100, 0) @@ -701,7 +701,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 mob_list) // -- Giacom @@ -733,7 +733,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" @@ -770,7 +770,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! @@ -804,7 +804,7 @@ var/list/admin_verbs_event_manager = list( 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" @@ -1068,7 +1068,7 @@ var/list/admin_verbs_event_manager = list( T << "Move on." 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" @@ -1082,7 +1082,7 @@ var/list/admin_verbs_event_manager = list( T << '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 mob_list) // -- Urist set category = "Fun" @@ -1093,4 +1093,4 @@ 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) diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm index 0c3e560f78..310a3c73bc 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 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)) M << "You have been jobbanned from [job] by [usr.client.ckey].\nReason: [reason]." @@ -236,7 +236,7 @@ var/savefile/Banlistjob else 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 d0cc5518c7..505eee2e7e 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() - usr << "New admin added." + 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() - usr << "Admin rank changed." + usr << "Admin rank changed." /datum/admins/proc/log_admin_permission_modification(var/adm_ckey, var/new_permission) if(config.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() - usr << "Permission removed." + 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() - usr << "Permission added." \ No newline at end of file + usr << "Permission added." \ No newline at end of file diff --git a/code/modules/admin/player_notes.dm b/code/modules/admin/player_notes.dm index dee9a69366..b20d34f329 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 f92bae98fb..c61ee1bb7f 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -197,7 +197,7 @@ if (emergency_shuttle.can_call()) emergency_shuttle.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 (!( ticker ) || !emergency_shuttle.location()) @@ -205,12 +205,12 @@ if (emergency_shuttle.can_call()) emergency_shuttle.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 (emergency_shuttle.can_recall()) emergency_shuttle.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" @@ -223,14 +223,14 @@ emergency_shuttle.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 (emergency_shuttle.shuttle.has_arrive_time()) var/new_time_left = input("Enter new shuttle arrival time (seconds):","Edit Shuttle Arrival Time", emergency_shuttle.estimate_arrival_time() ) as num emergency_shuttle.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.") @@ -241,7 +241,7 @@ ticker.delay_end = !ticker.delay_end log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].") - message_admins("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1) + message_admins("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1) href_list["secretsadmin"] = "check_antagonist" else if(href_list["simplemake"]) @@ -259,7 +259,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 ) @@ -339,7 +339,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 @@ -711,7 +711,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) M << "You have been jobbanned by [usr.client.ckey] from: [msg]." M << "The reason is: [reason]" M << "This jobban will be lifted in [mins] minutes." @@ -732,7 +732,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) M << "You have been jobbanned by [usr.client.ckey] from: [msg]." M << "The reason is: [reason]" M << "Jobban can be lifted only upon request." @@ -765,7 +765,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) M << "You have been un-jobbanned by [usr.client.ckey] from [msg]." href_list["jobban2"] = 1 // lets it fall through and refresh return 1 @@ -782,7 +782,7 @@ else M << "You have been kicked from the server: [reason]" log_admin("[key_name(usr)] booted [key_name(M)].") - message_admins("[key_name_admin(usr)] booted [key_name_admin(M)].", 1) + message_admins("[key_name_admin(usr)] booted [key_name_admin(M)].", 1) //M.client = null qdel(M.client) @@ -793,7 +793,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, " - ") @@ -840,7 +840,7 @@ else 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.") qdel(M.client) //qdel(M) // See no reason why to delete mob. Important stuff can be lost. And ban can be lifted before round ends. @@ -864,7 +864,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) @@ -920,8 +920,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.mode_names[master_mode]].") - message_admins("[key_name_admin(usr)] set the mode as [config.mode_names[master_mode]].", 1) - world << "The mode is now: [config.mode_names[master_mode]]" + message_admins("[key_name_admin(usr)] set the mode as [config.mode_names[master_mode]].", 1) + world << "The mode is now: [config.mode_names[master_mode]]" Game() // updates the main game menu world.save_mode(master_mode) .(href, list("c_mode"=1)) @@ -935,7 +935,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)) @@ -948,7 +948,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"]) @@ -960,7 +960,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"]) @@ -975,7 +975,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 @@ -1015,7 +1015,7 @@ 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 @@ -1038,7 +1038,7 @@ sleep(5) M.loc = pick(tdome1) spawn(50) - M << "You have been sent to the Thunderdome." + 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) @@ -1063,7 +1063,7 @@ sleep(5) M.loc = pick(tdome2) spawn(50) - M << "You have been sent to the Thunderdome." + 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) @@ -1085,7 +1085,7 @@ sleep(5) M.loc = pick(tdomeadmin) spawn(50) - M << "You have been sent to the Thunderdome." + 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) @@ -1114,7 +1114,7 @@ sleep(5) M.loc = pick(tdomeobserve) spawn(50) - M << "You have been sent to the Thunderdome." + 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) @@ -1323,7 +1323,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) - H << "Your prayers have been answered!! You received the best cookie!" + H << "Your prayers have been answered!! You received the best cookie!" else if(href_list["adminsmite"]) if(!check_rights(R_ADMIN|R_FUN)) return diff --git a/code/modules/admin/verbs/SDQL.dm b/code/modules/admin/verbs/SDQL.dm index 969e5cd47c..d17863fbf5 100644 --- a/code/modules/admin/verbs/SDQL.dm +++ b/code/modules/admin/verbs/SDQL.dm @@ -262,7 +262,7 @@ - usr << "SQDL Query: [query_text]" + usr << "SQDL Query: [query_text]" message_admins("[usr] executed SDQL query: \"[query_text]\".") /* for(var/t in types) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 1029d1b5d5..e620380a3c 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! @@ -296,7 +296,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 mob_list) set category = "Admin" @@ -310,7 +310,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 @@ -570,7 +570,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 b85a8b9a2b..24da1c9b57 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 = "\icon[cross] PRAY: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src, src)]) (CA) (SC) (SMITE): [msg]" + msg = "\icon[cross] PRAY: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src, src)]) (CA) (SC) (SMITE): [msg]" for(var/client/C in admins) if(R_ADMIN & 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(using_map.boss_short)]M[iamessage ? " IA" : ""]:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender, src)]) (CA) (BSA) (RPLY): [msg]" + msg = "[uppertext(using_map.boss_short)]M[iamessage ? " IA" : ""]:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender, src)]) (CA) (BSA) (RPLY): [msg]" for(var/client/C in admins) if(R_ADMIN & C.holder.rights) C << msg C << '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, src)]) (CA) (BSA) (RPLY): [msg]" + msg = "ILLEGAL:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender, src)]) (CA) (BSA) (RPLY): [msg]" for(var/client/C in admins) if(R_ADMIN & C.holder.rights) C << msg diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index e3f2c3db56..4a5c9c9341 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -40,7 +40,7 @@ spawn(50) 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. @@ -96,7 +96,7 @@ M << "You hear a voice in your head... [msg]" log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]") - message_admins("SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]", 1) + message_admins("SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]", 1) feedback_add_details("admin_verb","SMS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_world_narrate() // Allows administrators to fluff events a little easier -- TLE @@ -113,7 +113,7 @@ return world << "[msg]" log_admin("GlobalNarrate: [key_name(usr)] : [msg]") - message_admins(" GlobalNarrate: [key_name_admin(usr)] : [msg]
", 1) + message_admins(" GlobalNarrate: [key_name_admin(usr)] : [msg]
", 1) feedback_add_details("admin_verb","GLN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_direct_narrate(var/mob/M) // Targetted narrate -- TLE @@ -137,7 +137,7 @@ M << msg log_admin("DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]") - message_admins(" DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
", 1) + message_admins(" DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
", 1) feedback_add_details("admin_verb","DIRN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_godmode(mob/M as mob in mob_list) @@ -147,7 +147,7 @@ src << "Only administrators may use this command." return M.status_flags ^= GODMODE - usr << " Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"]" + 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"]") message_admins("[key_name_admin(usr)] has toggled [key_name_admin(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]", 1) @@ -278,7 +278,7 @@ Ccomp's first proc. G.has_enabled_antagHUD = 2 G.can_reenter_corpse = 1 - G:show_message(text("You may now respawn. You should roleplay as if you learned nothing about the round during your time with the dead."), 1) + G:show_message(text("You may now respawn. You should roleplay as if you learned nothing about the round during your time with the dead."), 1) log_admin("[key_name(usr)] allowed [key_name(G)] to bypass the respawn time limit") message_admins("Admin [key_name_admin(usr)] allowed [key_name_admin(G)] to bypass the respawn time limit", 1) @@ -306,10 +306,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 - g << "The Administrator has enabled AntagHUD " // Notify all observers they can now use AntagHUD + g << "The Administrator has enabled AntagHUD " // Notify all observers they can now use AntagHUD config.antag_hud_allowed = 1 action = "enabled" - src << "AntagHUD usage has been enabled" + src << "AntagHUD usage has been enabled" log_admin("[key_name(usr)] has [action] antagHUD usage for observers") @@ -326,10 +326,10 @@ Ccomp's first proc. var/action="" if(config.antag_hud_restricted) for(var/mob/observer/dead/g in get_ghosts()) - g << "The administrator has lifted restrictions on joining the round if you use AntagHUD" + g << "The administrator has lifted restrictions on joining the round if you use AntagHUD" action = "lifted restrictions" config.antag_hud_restricted = 0 - src << "AntagHUD restrictions have been lifted" + src << "AntagHUD restrictions have been lifted" else for(var/mob/observer/dead/g in get_ghosts()) g << "The administrator has placed restrictions on joining the round if you use AntagHUD" @@ -701,7 +701,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() @@ -739,7 +739,7 @@ Traitors and the like can also be revived with the previous role mostly intact. M << "This is a temporary ban, it will be removed in [mins] minutes." 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.server_name, "#", "")]") del(M.client) qdel(M) @@ -754,7 +754,7 @@ Traitors and the like can also be revived with the previous role mostly intact. M << "This is a permanent ban." 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.server_name, "#", "")]") del(M.client) qdel(M) @@ -817,7 +817,7 @@ Traitors and the like can also be revived with the previous role mostly intact. view = world.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! @@ -851,7 +851,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() @@ -868,7 +868,7 @@ Traitors and the like can also be revived with the previous role mostly intact. emergency_shuttle.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 @@ -922,7 +922,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") - world << "Admin [usr.key] has forced the players to have completely random identities!" + world << "Admin [usr.key] has forced the players to have completely random identities!" 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 8cf88aa127..0b576f6e57 100644 --- a/code/modules/admin/verbs/tripAI.dm +++ b/code/modules/admin/verbs/tripAI.dm @@ -14,9 +14,9 @@ if(ticker.triai) ticker.triai = 0 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 ticker.triai = 1 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/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 4f92884dfb..660604dc28 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -259,6 +259,6 @@ obj/machinery/gateway/centerstation/process() return // VOREStation Add End else - user << "Recalibration successful!: This gate's systems have been fine tuned. Travel to this gate will now be on target." + 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/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm index 3e8cb36a6c..1f5d0da2e2 100644 --- a/code/modules/clothing/spacesuits/rig/modules/combat.dm +++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm @@ -54,7 +54,7 @@ user << "Another grenade of that type will not fit into the module." return 0 - user << "You slot \the [input_device] into the suit module." + user << "You slot \the [input_device] into the suit module." user.drop_from_inventory(input_device) qdel(input_device) accepted_item.charges++ @@ -243,7 +243,7 @@ else var/obj/item/new_weapon = new fabrication_type() new_weapon.forceMove(H) - H << "You quickly fabricate \a [new_weapon]." + 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 9308e44cb0..db809e8f92 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 - ai_mob << "You have been transferred to \the [holder]'s [src]." - user << "You load [ai_mob] into \the [holder]'s [src]." + ai_mob << "You have been transferred to \the [holder]'s [src]." + user << "You load [ai_mob] into \the [holder]'s [src]." integrated_ai = ai_mob @@ -261,7 +261,7 @@ var/obj/item/weapon/disk/tech_disk/disk = input_device if(disk.stored) if(load_data(disk.stored)) - user << "Download successful; disk erased." + user << "Download successful; disk erased." disk.stored = null else 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)) - user << "Download successful; local and remote repositories synchronized." + user << "Download successful; local and remote repositories synchronized." else 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) M << "Total power drained: [round(total_power_drained*CELLRATE)] cell units." + if(M) M << "Total power drained: [round(total_power_drained*CELLRATE)] cell units." else - if(M) M << "Total power drained from [interfaced_with]: [round(total_power_drained*CELLRATE)] cell units." + if(M) 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 b5d58c8da6..6af53cac1a 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 583f491d5e..342a7eb4dc 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm @@ -192,7 +192,7 @@ break if(total_transferred) - user << "You transfer [total_transferred] units into the suit reservoir." + user << "You transfer [total_transferred] units into the suit reservoir." else user << "None of the reagents seem suitable." return 1 @@ -321,17 +321,17 @@ if("Enable") active = 1 voice_holder.active = 1 - usr << "You enable the speech synthesiser." + usr << "You enable the speech synthesiser." if("Disable") active = 0 voice_holder.active = 0 - usr << "You disable the speech synthesiser." + 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 - usr << "You are now mimicking [voice_holder.voice]." + usr << "You are now mimicking [voice_holder.voice]." return 1 /obj/item/rig_module/maneuvering_jets @@ -518,7 +518,7 @@ user << "Another grenade of that type will not fit into the module." return 0 - user << "You slot \the [input_device] into the suit module." + user << "You slot \the [input_device] into the suit module." user.drop_from_inventory(input_device) qdel(input_device) accepted_item.charges++ @@ -642,7 +642,7 @@ var/mob/living/carbon/human/H = holder.wearer - H << "You activate the suit's sprint mode." + H << "You activate the suit's sprint mode." holder.slowdown = initial(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 a4092d47ef..67ea6ca0cd 100644 --- a/code/modules/clothing/spacesuits/rig/modules/vision.dm +++ b/code/modules/clothing/spacesuits/rig/modules/vision.dm @@ -179,7 +179,7 @@ // Don't cycle if this engage() is being called by activate(). if(starting_up) - holder.wearer << "You activate your visual sensors." + holder.wearer << "You activate your visual sensors." return 1 if(vision_modes.len > 1) @@ -188,9 +188,9 @@ vision_index = 1 vision = vision_modes[vision_index] - holder.wearer << "You cycle your sensors to [vision.mode] mode." + holder.wearer << "You cycle your sensors to [vision.mode] mode." else - holder.wearer << "Your sensors only have one mode." + 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 df610f3407..489f46c4bf 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -245,7 +245,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) M << "You must remain still while the suit is adjusting the components." failed_to_seal = 1 @@ -275,16 +275,16 @@ piece.icon_state = "[initial(icon_state)][!seal_target ? "_sealed" : ""]" switch(msg_type) if("boots") - M << "\The [piece] [!seal_target ? "seal around your feet" : "relax their grip on your legs"]." + M << "\The [piece] [!seal_target ? "seal around your feet" : "relax their grip on your legs"]." M.update_inv_shoes() if("gloves") - M << "\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"]." + M << "\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"]." M.update_inv_gloves() if("chest") - M << "\The [piece] [!seal_target ? "cinches tight again your chest" : "releases your chest"]." + M << "\The [piece] [!seal_target ? "cinches tight again your chest" : "releases your chest"]." M.update_inv_wear_suit() if("helmet") - M << "\The [piece] hisses [!seal_target ? "closed" : "open"]." + M << "\The [piece] hisses [!seal_target ? "closed" : "open"]." M.update_inv_head() if(helmet) helmet.update_light(wearer) @@ -319,7 +319,7 @@ // Success! canremove = seal_target - M << "Your entire suit [canremove ? "loosens as the components relax" : "tightens around you as the components lock into place"]." + 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" @@ -692,7 +692,7 @@ ..() if(seal_delay > 0 && istype(M) && M.back == 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) if(!M.unEquip(src)) @@ -701,7 +701,7 @@ return if(istype(M) && M.back == 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() @@ -751,7 +751,7 @@ holder = use_obj.loc if(istype(holder)) if(use_obj && check_slot == use_obj) - H << "Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly." + 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 09db9b0325..2dcb437441 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 - usr << "Primary system is now: deselected." + usr << "Primary system is now: deselected." return selected_module = module - usr << "Primary system is now: [selected_module.interface_name]." + usr << "Primary system is now: [selected_module.interface_name]." /obj/item/weapon/rig/verb/toggle_module() @@ -256,10 +256,10 @@ return if(module.active) - usr << "You attempt to deactivate \the [module.interface_name]." + usr << "You attempt to deactivate \the [module.interface_name]." module.deactivate() else - usr << "You attempt to activate \the [module.interface_name]." + usr << "You attempt to activate \the [module.interface_name]." module.activate() /obj/item/weapon/rig/verb/engage_module() @@ -293,5 +293,5 @@ if(!istype(module)) return - usr << "You attempt to engage the [module.interface_name]." + usr << "You attempt to engage the [module.interface_name]." module.engage() \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index b5a9900081..76888e02ba 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -35,7 +35,7 @@ camera = new /obj/machinery/camera(src) camera.replace_networks(camera_networks) camera.c_tag = user.name - user << "User scanned as [camera.c_tag]. Camera activated." + user << "User scanned as [camera.c_tag]. Camera activated." user.update_action_buttons() return 1 diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index eb1a04a2e0..1fa33edd6b 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -196,10 +196,10 @@ /obj/item/clothing/suit/armor/reactive/attack_self(mob/user as mob) active = !( active ) if (active) - user << "The reactive armor is now active." + user << "The reactive armor is now active." icon_state = "reactive" else - user << "The reactive armor is now inactive." + user << "The reactive armor is now inactive." icon_state = "reactiveoff" add_fingerprint(user) return diff --git a/code/modules/detectivework/microscope/dnascanner.dm b/code/modules/detectivework/microscope/dnascanner.dm index 0c54df0397..925d614799 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 68e4c12c86..411802f1db 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) - usr << "\icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'" + usr << "\icon[src] 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) - human_user << "\icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'" + human_user << "\icon[src] 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 8bf5c63cc7..2bc1d13494 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -156,4 +156,4 @@ proc/spawn_money(var/sum, spawnloc, mob/living/carbon/human/human_user as mob) /obj/item/weapon/spacecash/ewallet/examine(mob/user) ..(user) if (!(user in view(2)) && user!=src.loc) return - user << "Charge card's owner: [src.owner_name]. Thalers remaining: [src.worth]." + user << "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 964ea8dbed..4eb572729c 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -23,7 +23,7 @@ mob/living/carbon/proc/dream() spawn(0) for(var/i = rand(1,4),i > 0, i--) - src << "... [pick(dreams)] ..." + src << "... [pick(dreams)] ..." sleep(rand(40,70)) if(paralysis <= 0) dreaming = 0 diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index 7dc02dedc7..d6606e23c7 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() diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm index 8923abac56..851d82b8c1 100644 --- a/code/modules/mining/coins.dm +++ b/code/modules/mining/coins.dm @@ -75,7 +75,7 @@ CC.update_icon() overlays = list() string_attached = null - user << "You detach the string from the coin." + user << "You detach the string from the coin." else ..() /obj/item/weapon/coin/attack_self(mob/user as mob) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index ca03098f55..ad9534eafa 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 d208b303ee..bbe0ba427c 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -120,7 +120,7 @@ usr.set_machine(src) src.add_fingerprint(usr) if(processing==1) - usr << "The machine is processing." + 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 13ddd4ad57..fccca1f4b5 100644 --- a/code/modules/mining/money_bag.dm +++ b/code/modules/mining/money_bag.dm @@ -50,14 +50,14 @@ ..() if (istype(W, /obj/item/weapon/coin)) var/obj/item/weapon/coin/C = W - user << "You add the [C.name] into the bag." + user << "You add the [C.name] into the bag." usr.drop_item() contents += C if (istype(W, /obj/item/weapon/moneybag)) var/obj/item/weapon/moneybag/C = W for (var/obj/O in C.contents) contents += O; - user << "You empty the [C.name] into the bag." + user << "You empty the [C.name] into the bag." return /obj/item/weapon/moneybag/Topic(href, href_list) diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index b904a7cfad..46bdde5185 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -90,7 +90,7 @@ for (var/obj/item/weapon/ore/O in contents) contents -= O O.loc = src.loc - usr << "You empty the ore box." + usr << "You empty the ore box." return diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index e7ced61d89..22cca07dcd 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -271,7 +271,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" @@ -293,7 +293,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 return_sorted_areas()) set category = "Ghost" @@ -449,16 +449,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 - src << "Results:" + src << "Results:" if(abs(pressure - ONE_ATMOSPHERE) < 10) - src << "Pressure: [round(pressure,0.1)] kPa" + src << "Pressure: [round(pressure,0.1)] kPa" else src << "Pressure: [round(pressure,0.1)] kPa" if(total_moles) for(var/g in environment.gas) - src << "[gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]% ([round(environment.gas[g], 0.01)] moles)" - src << "Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)" - src << "Heat Capacity: [round(environment.heat_capacity(),0.1)]" + src << "[gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]% ([round(environment.gas[g], 0.01)] moles)" + src << "Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)" + 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 07f65f62b5..a79ca24177 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -238,7 +238,7 @@ /obj/item/device/mmi/digital/attack_self(mob/user as mob) if(brainmob && !brainmob.key && searching == 0) //Start the process of searching for a new user. - user << "You carefully locate the manual activation switch and start the [src]'s boot process." + user << "You carefully locate the manual activation switch and start the [src]'s boot process." request_player() /obj/item/device/mmi/digital/proc/request_player() @@ -262,7 +262,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/device/mmi/digital/proc/transfer_personality(var/mob/candidate) announce_ghost_joinleave(candidate, 0, "They are occupying a synthetic brain now.") @@ -280,7 +280,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/device/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 22efdc76c6..a54f5dae4a 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") src << "alarm,alert,notice,flash,blink,whistle,beep,boop" else - src << "Unusable emote '[act]'. Say *help for a list." + 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 9f1f778ad2..14c7569319 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/device/mmi/digital/posibrain/attack_self(mob/user as mob) if(brainmob && !brainmob.key && searching == 0) //Start the process of searching for a new user. - user << "You carefully locate the manual activation switch and start the positronic brain's boot process." + 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/device/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 01f74ac3b5..f821a2466d 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -143,8 +143,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 c7009107de..bfdcbf69f7 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) - H <<"[cure_message]" + 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 c7009107de..bfdcbf69f7 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) - H <<"[cure_message]" + 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 3cef432949..df2d2799bc 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -730,7 +730,7 @@ twitch_v, vomit, whimper, wink, yawn. Synthetics: beep, buzz, yes, no, rcough, rsneeze, ping" else - src << "Unusable emote '[act]'. Say *help for a list." + src << "Unusable emote '[act]'. Say *help for a list." if (message) custom_emote(m_type,message) diff --git a/code/modules/mob/living/carbon/human/examine_vr.dm b/code/modules/mob/living/carbon/human/examine_vr.dm index 4ddcdbd796..4cbb7a3dba 100644 --- a/code/modules/mob/living/carbon/human/examine_vr.dm +++ b/code/modules/mob/living/carbon/human/examine_vr.dm @@ -144,7 +144,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!\n" + message = "They are small enough that you could easily pick them up!\n" return message /mob/living/carbon/human/proc/examine_step_size(mob/living/H) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 700415bdda..597fb2b94a 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -755,7 +755,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 @@ -846,7 +846,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" @@ -869,10 +869,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 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 41c240b98a..0aee7fb4c8 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -76,7 +76,7 @@ log_say("(COMMUNE to [key_name(M)]) [text]",src) - M << "Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]" + 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/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm index e6b52d47e3..6d98a820e5 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm @@ -878,7 +878,7 @@ mob/living/carbon/proc/charmed() //TODO spawn(0) for(var/i = 1,i > 0, i--) - src << "... [pick(charmed)] ..." + src << "... [pick(charmed)] ..." charmed = 0 */ diff --git a/code/modules/mob/living/carbon/metroid/emote.dm b/code/modules/mob/living/carbon/metroid/emote.dm index 6375f23b2a..312cf8b7de 100644 --- a/code/modules/mob/living/carbon/metroid/emote.dm +++ b/code/modules/mob/living/carbon/metroid/emote.dm @@ -86,7 +86,7 @@ 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 - src << "Unusable emote '[act]'. Say *help for a list." + 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 7d2d86ab76..a7aeae21b9 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -218,9 +218,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 3d9140dd46..42b4359d11 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -255,7 +255,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 9357c3eeb4..5044595975 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -516,7 +516,7 @@ var/list/ai_verbs_default = list( if(network in C.network) eyeobj.setLoc(get_turf(C)) break - src << "Switched to [network] camera network." + src << "Switched to [network] camera network." //End of code by Mord_Sith /mob/living/silicon/ai/proc/ai_statuschange() @@ -695,20 +695,20 @@ var/list/ai_verbs_default = list( else if(istype(W, /obj/item/weapon/wrench)) 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 0ba4487f4b..3358d1855e 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -231,7 +231,7 @@ cameralist[C.network] = C.network src.network = input(usr, "Which network would you like to view?") as null|anything in cameralist - src << "Switched to [src.network] camera network." + 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 bbc8cefd36..5e799b969a 100644 --- a/code/modules/mob/living/silicon/robot/analyzer.dm +++ b/code/modules/mob/living/silicon/robot/analyzer.dm @@ -24,10 +24,10 @@ user << text("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 7e73eb7e4c..c34b802f4f 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -240,7 +240,7 @@ if ("help") 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 - src << "Unusable emote '[act]'. Say *help for a list." + 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 3136fb6cc8..072adae5f9 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -469,7 +469,7 @@ C.brute_damage = WC.brute C.electronics_damage = WC.burn - usr << "You install the [W.name]." + 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 d52a5da531..aa7358eb43 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -166,7 +166,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 @@ -206,9 +206,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 ..() @@ -288,7 +288,7 @@ deploy_paper(get_turf(src)) /obj/item/weapon/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/weapon/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 e51dfd82a7..c09599d619 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("\icon[src] [src] retracts several targetting vanes, and dulls it's running lights.") + src.visible_message("\icon[src] [src] retracts several targetting vanes, and dulls it's running lights.") hostile = 0 else src.visible_message("\icon[src] [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("\icon[src] [src] suddenly shuts down!") + src.visible_message("\icon[src] [src] suddenly shuts down!") else - src.visible_message("\icon[src] [src] suddenly lies still and quiet.") + src.visible_message("\icon[src] [src] suddenly lies still and quiet.") disabled = rand(150, 600) walk(src,0) diff --git a/code/modules/mob/living/simple_animal/animals/corgi.dm b/code/modules/mob/living/simple_animal/animals/corgi.dm index 33bda8b2e0..317866e6c4 100644 --- a/code/modules/mob/living/simple_animal/animals/corgi.dm +++ b/code/modules/mob/living/simple_animal/animals/corgi.dm @@ -105,7 +105,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)) set_dir(i) diff --git a/code/modules/mob/living/simple_animal/animals/farm_animals.dm b/code/modules/mob/living/simple_animal/animals/farm_animals.dm index 5f63128596..9cc06b035b 100644 --- a/code/modules/mob/living/simple_animal/animals/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/animals/farm_animals.dm @@ -255,12 +255,12 @@ var/global/chicken_count = 0 var/obj/item/weapon/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 - user << "[name] doesn't seem hungry!" + user << "[name] doesn't seem hungry!" else user << "[name] doesn't seem interested in that." else diff --git a/code/modules/mob/living/simple_animal/animals/mouse.dm b/code/modules/mob/living/simple_animal/animals/mouse.dm index 5df09466e6..7998fb6229 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("\icon[src] Squeek!") + M.visible_message("\icon[src] Squeek!") M << 'sound/effects/mouse_squeak.ogg' ..() diff --git a/code/modules/mob/living/simple_animal/animals/parrot.dm b/code/modules/mob/living/simple_animal/animals/parrot.dm index 63c129dda1..4582c7bc61 100644 --- a/code/modules/mob/living/simple_animal/animals/parrot.dm +++ b/code/modules/mob/living/simple_animal/animals/parrot.dm @@ -417,7 +417,7 @@ if(!parrot_perch || parrot_interest.loc != parrot_perch.loc) held_item = parrot_interest parrot_interest.forceMove(src) - visible_message("[src] grabs the [held_item]!", "You grab the [held_item]!", "You hear the sounds of wings flapping furiously.") + visible_message("[src] grabs the [held_item]!", "You grab the [held_item]!", "You hear the sounds of wings flapping furiously.") parrot_interest = null parrot_state = PARROT_SWOOP | PARROT_RETURN @@ -590,7 +590,7 @@ held_item = I I.forceMove(src) - visible_message("[src] grabs the [held_item]!", "You grab the [held_item]!", "You hear the sounds of wings flapping furiously.") + visible_message("[src] grabs the [held_item]!", "You grab the [held_item]!", "You hear the sounds of wings flapping furiously.") return held_item to_chat(src, "There is nothing of interest to take.") @@ -621,7 +621,7 @@ C.remove_from_mob(stolen_item) held_item = stolen_item stolen_item.forceMove(src) - visible_message("[src] grabs the [held_item] out of [C]'s hand!", "You snag the [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.") + visible_message("[src] grabs the [held_item] out of [C]'s hand!", "You snag the [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.") return held_item to_chat(src, "There is nothing of interest to take.") diff --git a/code/modules/mob/living/simple_animal/borer/borer.dm b/code/modules/mob/living/simple_animal/borer/borer.dm index e4add4d749..be70dfc211 100644 --- a/code/modules/mob/living/simple_animal/borer/borer.dm +++ b/code/modules/mob/living/simple_animal/borer/borer.dm @@ -64,16 +64,16 @@ if(host.reagents.has_reagent("sugar")) if(!docile) if(controlling) - host << "You feel the soporific flow of sugar in your host's blood, lulling you into docility." + host << "You feel the soporific flow of sugar in your host's blood, lulling you into docility." else - src << "You feel the soporific flow of sugar in your host's blood, lulling you into docility." + src << "You feel the soporific flow of sugar in your host's blood, lulling you into docility." docile = 1 else if(docile) if(controlling) - host << "You shake off your lethargy as the sugar leaves your host's blood." + host << "You shake off your lethargy as the sugar leaves your host's blood." else - src << "You shake off your lethargy as the sugar leaves your host's blood." + src << "You shake off your lethargy as the sugar leaves your host's blood." docile = 0 if(chemicals < 250) @@ -81,7 +81,7 @@ if(controlling) if(docile) - host << "You are feeling far too docile to continue controlling your host..." + host << "You are feeling far too docile to continue controlling your host..." host.release_control() return diff --git a/code/modules/mob/living/simple_animal/borer/borer_powers.dm b/code/modules/mob/living/simple_animal/borer/borer_powers.dm index b75da20cc4..b83c6dfe42 100644 --- a/code/modules/mob/living/simple_animal/borer/borer_powers.dm +++ b/code/modules/mob/living/simple_animal/borer/borer_powers.dm @@ -11,7 +11,7 @@ src << "You cannot leave your host in your current state." if(docile) - src << "You are feeling far too docile to do that." + src << "You are feeling far too docile to do that." return if(!host || !src) return @@ -143,7 +143,7 @@ src << "You cannot do that in your current state." if(docile) - src << "You are feeling far too docile to do that." + src << "You are feeling far too docile to do that." return @@ -211,7 +211,7 @@ src << "You cannot secrete chemicals in your current state." if(docile) - src << "You are feeling far too docile to do that." + src << "You are feeling far too docile to do that." return if(chemicals < 50) @@ -280,7 +280,7 @@ return if(docile) - src << "You are feeling far too docile to do that." + src << "You are feeling far too docile to do that." return src << "You begin delicately adjusting your connection to the host brain..." diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 8471dd8307..146c59a790 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 bedf671863..265e8ce360 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -360,7 +360,7 @@ if(istype(src,/mob/observer/dead)) var/mob/observer/dead/G = src if(G.has_enabled_antagHUD == 1 && config.antag_hud_restricted) - to_chat(usr, "By using the antagHUD you forfeit the ability to join the round.") + to_chat(usr, "By using the antagHUD you forfeit the ability to join the round.") return var/deathtimeminutes = round(deathtime / 600) var/pluralcheck = "minute" @@ -381,7 +381,7 @@ log_game("[usr.name]/[usr.key] used abandon mob.") - to_chat(usr, "Make sure to play a different character, and please roleplay correctly!") + to_chat(usr, "Make sure to play a different character, and please roleplay correctly!") if(!client) log_game("[usr.key] AM failed due to disconnect.") @@ -442,7 +442,7 @@ if(client.holder && (client.holder.rights & R_ADMIN)) is_admin = 1 else if(stat != DEAD || istype(src, /mob/new_player)) - usr << "You must be observing to use this!" + 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 c2b0aaf0f1..2c82a53c32 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -73,7 +73,7 @@ set hidden = 1 if(!usr.pulling) - usr << "You are not pulling anything." + usr << "You are not pulling anything." return usr.stop_pulling() @@ -262,13 +262,13 @@ for(var/mob/M in range(mob, 1)) if(M.pulling == mob) if(!M.restrained() && M.stat == 0 && M.canmove && mob.Adjacent(M)) - src << "You're restrained! You can't move!" + src << "You're restrained! You can't move!" return 0 else M.stop_pulling() if(mob.pinned.len) - src << "You're pinned to a wall by [mob.pinned[1]]!" + src << "You're pinned to a wall by [mob.pinned[1]]!" return 0 move_delay = world.time//set move delay @@ -477,7 +477,7 @@ //Check to see if we slipped if(prob(Process_Spaceslipping(5)) && !buckled) - src << "You slipped!" + src << "You slipped!" src.inertia_dir = src.last_move step(src, src.inertia_dir) return 0 diff --git a/code/modules/mob/new_player/poll.dm b/code/modules/mob/new_player/poll.dm index 0282af9fe9..484a914381 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() - usr << "Vote successful." + 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() - usr << "Feedback logging successful." + 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() - usr << "Vote successful." + usr << "Vote successful." usr << browse(null,"window=playerpoll") \ No newline at end of file diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 816b62a099..4231ed9bcb 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -428,7 +428,7 @@ // check for exploits for(var/bad in paper_blacklist) if(findtext(t,bad)) - usr << "You think to yourself, \"Hm.. this is only paper...\"" + 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 707b756ede..757563118a 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") - M << "You feel very light, as if you might just float away..." + M << "You feel very light, as if you might just float away..." qdel(src) return diff --git a/code/modules/power/cable_heavyduty.dm b/code/modules/power/cable_heavyduty.dm index a286517965..e078dde2f2 100644 --- a/code/modules/power/cable_heavyduty.dm +++ b/code/modules/power/cable_heavyduty.dm @@ -18,10 +18,10 @@ return if(istype(W, /obj/item/weapon/wirecutters)) - usr << "These cables are too tough to be cut with those [W.name]." + usr << "These cables are too tough to be cut with those [W.name]." return else if(istype(W, /obj/item/stack/cable_coil)) - usr << "You will need heavier cables to connect to these." + 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 b6b904e65a..ac7c1977c4 100644 --- a/code/modules/power/pacman2.dm +++ b/code/modules/power/pacman2.dm @@ -52,7 +52,7 @@ examine(mob/user) ..(user) - user << "The generator has [P.air_contents.phoron] units of fuel left, producing [power_gen] per cycle." + user << "The generator has [P.air_contents.phoron] units of fuel left, producing [power_gen] per cycle." handleInactive() heat -= 2 @@ -75,23 +75,23 @@ P = O user.drop_item() O.loc = src - user << "You add the phoron tank to the generator." + user << "You add the phoron tank to the generator." else if(!active) if(istype(O, /obj/item/weapon/wrench)) anchored = !anchored playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(anchored) - user << "You secure the generator to the floor." + user << "You secure the generator to the floor." else - user << "You unsecure the generator from the floor." + user << "You unsecure the generator from the floor." SSmachines.makepowernets() else if(istype(O, /obj/item/weapon/screwdriver)) open = !open playsound(loc, O.usesound, 50, 1) if(open) - user << "You open the access panel." + user << "You open the access panel." else - user << "You close the access panel." + user << "You close the access panel." else if(istype(O, /obj/item/weapon/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 7354faea9e..bcd06c2843 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(istype(W, /obj/item/weapon/wrench)) if(P) - user << "Remove the phoron tank first." + 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 7ac9bbcfb0..b1cf66b4f5 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -407,7 +407,7 @@ var/list/solars_list = list() playsound(src, I.usesound, 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) - user << "The broken glass falls out." + user << "The broken glass falls out." var/obj/structure/frame/A = new /obj/structure/frame/computer( src.loc ) new /obj/item/weapon/material/shard( src.loc ) var/obj/item/weapon/circuitboard/solar_control/M = new /obj/item/weapon/circuitboard/solar_control( A ) @@ -419,7 +419,7 @@ var/list/solars_list = list() A.anchored = 1 qdel(src) else - user << "You disconnect the monitor." + user << "You disconnect the monitor." var/obj/structure/frame/A = new /obj/structure/frame/computer( src.loc ) var/obj/item/weapon/circuitboard/solar_control/M = new /obj/item/weapon/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 b28c8f2993..fedd2dae68 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -32,7 +32,7 @@ /obj/item/ammo_casing/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/screwdriver)) if(!BB) - user << "There is no bullet in the casing to inscribe anything into." + user << "There is no bullet in the casing to inscribe anything into." return var/tmp_label = "" @@ -40,10 +40,10 @@ if(length(label_text) > 20) user << "The inscription can be at most 20 characters long." else if(!label_text) - user << "You scratch the inscription off of [initial(BB)]." + user << "You scratch the inscription off of [initial(BB)]." BB.name = initial(BB.name) else - user << "You inscribe \"[label_text]\" into \the [initial(BB.name)]." + 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 2f28086e45..e76989eb79 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -695,7 +695,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 dae5a5c8ee..3c14144fbc 100644 --- a/code/modules/projectiles/guns/launcher/rocket.dm +++ b/code/modules/projectiles/guns/launcher/rocket.dm @@ -20,7 +20,7 @@ /obj/item/weapon/gun/launcher/rocket/examine(mob/user) if(!..(user, 2)) return - user << "[rockets.len] / [max_rockets] rockets." + user << "[rockets.len] / [max_rockets] rockets." /obj/item/weapon/gun/launcher/rocket/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/ammo_casing/rocket)) @@ -28,8 +28,8 @@ user.drop_item() I.loc = src rockets += I - user << "You put the rocket in [src]." - user << "[rockets.len] / [max_rockets] rockets." + user << "You put the rocket in [src]." + user << "[rockets.len] / [max_rockets] rockets." else 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 080c7cc1a6..f65fe7def4 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) - user << "[src] contains:" + user << "[src] contains:" for(var/obj/item/weapon/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) - user << "[R.volume] units of [R.name]" + user << "[R.volume] units of [R.name]" /obj/item/weapon/gun/projectile/dartgun/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/weapon/reagent_containers/glass)) if(!istype(I, container_type)) - user << "[I] doesn't seem to fit into [src]." + user << "[I] doesn't seem to fit into [src]." return if(beakers.len >= max_beakers) - user << "[src] already has [max_beakers] beakers in it - another one isn't going to fit!" + user << "[src] already has [max_beakers] beakers in it - another one isn't going to fit!" return var/obj/item/weapon/reagent_containers/glass/beaker/B = I user.drop_item() B.loc = src beakers += B - user << "You slot [B] into [src]." + 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 2e27d125ef..956e0ba673 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/reagents/reagent_containers/food/sandwich.dm b/code/modules/reagents/reagent_containers/food/sandwich.dm index 5662b7d3ff..1e13bddf13 100644 --- a/code/modules/reagents/reagent_containers/food/sandwich.dm +++ b/code/modules/reagents/reagent_containers/food/sandwich.dm @@ -23,7 +23,7 @@ sandwich_limit += 4 if(istype(W,/obj/item/weapon/material/shard)) - user << "You hide [W] in \the [src]." + user << "You hide [W] in \the [src]." user.drop_item() W.loc = src update() @@ -32,7 +32,7 @@ if(src.contents.len > sandwich_limit) user << "If you put anything else on \the [src] it's going to collapse." return - user << "You layer [W] over \the [src]." + user << "You layer [W] over \the [src]." var/obj/item/weapon/reagent_containers/F = W F.reagents.trans_to_obj(src, F.reagents.total_volume) user.drop_item() @@ -81,7 +81,7 @@ /obj/item/weapon/reagent_containers/food/snacks/csandwich/examine(mob/user) ..(user) var/obj/item/O = pick(contents) - user << "You think you can see [O.name] in there." + user << "You think you can see [O.name] in there." /obj/item/weapon/reagent_containers/food/snacks/csandwich/attack(mob/M as mob, mob/user as mob, def_zone) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index ce2dd8e791..cd8c568f71 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -147,11 +147,11 @@ if (bitecount==0) return else if (bitecount==1) - user << "\The [src] was bitten by someone!" + user << "\The [src] was bitten by someone!" else if (bitecount<=3) - user << "\The [src] was bitten [bitecount] times!" + user << "\The [src] was bitten [bitecount] times!" else - user << "\The [src] was bitten multiple times!" + user << "\The [src] was bitten multiple times!" /obj/item/weapon/reagent_containers/food/snacks/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W,/obj/item/weapon/storage)) @@ -171,7 +171,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++ @@ -585,10 +585,10 @@ var/clr = C.colourName if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow"))) - usr << "The egg refuses to take on this color!" + usr << "The egg refuses to take on this color!" return - usr << "You color \the [src] [clr]" + usr << "You color \the [src] [clr]" icon_state = "egg-[clr]" else ..() diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index a9b0b213ed..1cc6fa3d59 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -99,7 +99,7 @@ if(istype(I, /obj/item/weapon/storage/bag/trash)) var/obj/item/weapon/storage/bag/trash/T = I - user << "You empty the bag." + user << "You empty the bag." for(var/obj/item/O in T.contents) T.remove_from_storage(O,src) T.update_icon() @@ -1169,7 +1169,7 @@ if(O.currTag)// Tag set sort_tag = O.currTag playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1) - user << "Changed tag to '[sort_tag]'." + user << "Changed tag to '[sort_tag]'." updatename() updatedesc() @@ -1237,7 +1237,7 @@ if(O.currTag)// Tag set sortType = O.currTag playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1) - user << "Changed filter to '[sortType]'." + user << "Changed filter to '[sortType]'." updatename() updatedesc() diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index b2cbcb9b3e..cda6f6a42e 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -232,7 +232,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/weapon/storage) && !istype(target,/obj/item/weapon/storage/box))) @@ -293,7 +293,7 @@ else if(src.amount < 3) user << "You need more paper." else - user << "The object you are trying to wrap is unsuitable for the sorting machinery!" + user << "The object you are trying to wrap is unsuitable for the sorting machinery!" if (src.amount <= 0) new /obj/item/weapon/c_tube( src.loc ) qdel(src) @@ -302,7 +302,7 @@ examine(mob/user) if(..(user, 0)) - user << "There are [amount] units of package wrap left!" + 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 19afc0f564..adcc735061 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -136,7 +136,7 @@ var/global/list/obj/machinery/message_server/message_servers = list() /obj/machinery/message_server/attack_hand(user as mob) -// 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." +// 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." user << "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]" active = !active update_icon() diff --git a/code/modules/scripting/IDE.dm b/code/modules/scripting/IDE.dm index 3974e2dee4..7b3b3a84ec 100644 --- a/code/modules/scripting/IDE.dm +++ b/code/modules/scripting/IDE.dm @@ -58,12 +58,12 @@ client/verb/tcscompile() else - src << output("TCS compilation successful!", "tcserror") + src << output("TCS compilation successful!", "tcserror") src << output("(0 errors)", "tcserror") for(var/mob/M in Machine.viewingcode) if(M.client) - M << output("TCS compilation successful!", "tcserror") + M << output("TCS compilation successful!", "tcserror") M << output("(0 errors)", "tcserror") else @@ -109,12 +109,12 @@ client/verb/tcsrun() else // Finally, we run the code! - src << output("TCS compilation successful! Code executed.", "tcserror") + src << output("TCS compilation successful! Code executed.", "tcserror") src << output("(0 errors)", "tcserror") for(var/mob/M in Machine.viewingcode) if(M.client) - M << output("TCS compilation successful!", "tcserror") + M << output("TCS compilation successful!", "tcserror") M << output("(0 errors)", "tcserror") var/datum/signal/signal = new() @@ -196,10 +196,10 @@ client/verb/tcsclearmem() Server.memory = list() // clear the memory // Show results src << output(null, "tcserror") - src << output("Server memory cleared!", "tcserror") + src << output("Server memory cleared!", "tcserror") for(var/mob/M in Machine.viewingcode) if(M.client) - M << output("Server memory cleared!", "tcserror") + M << output("Server memory cleared!", "tcserror") else src << output(null, "tcserror") src << output("Failed to clear memory: Unable to locate server machine.", "tcserror") diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm index b67e6f70a2..efbd40374e 100644 --- a/code/modules/shieldgen/emergency_shield.dm +++ b/code/modules/shieldgen/emergency_shield.dm @@ -261,14 +261,14 @@ return if (src.active) - user.visible_message("\icon[src] [user] deactivated the shield generator.", \ - "\icon[src] You deactivate the shield generator.", \ + user.visible_message("\icon[src] [user] deactivated the shield generator.", \ + "\icon[src] You deactivate the shield generator.", \ "You hear heavy droning fade out.") src.shields_down() else if(anchored) - user.visible_message("\icon[src] [user] activated the shield generator.", \ - "\icon[src] You activate the shield generator.", \ + user.visible_message("\icon[src] [user] activated the shield generator.", \ + "\icon[src] You activate the shield generator.", \ "You hear heavy droning.") src.shields_up() else @@ -285,10 +285,10 @@ if(istype(W, /obj/item/weapon/screwdriver)) playsound(src, W.usesound, 100, 1) if(is_open) - user << "You close the panel." + user << "You close the panel." is_open = 0 else - user << "You open the panel and expose the wiring." + user << "You open the panel and expose the wiring." is_open = 1 else if(istype(W, /obj/item/stack/cable_coil) && malfunction && is_open) @@ -308,15 +308,15 @@ return if(anchored) playsound(src, W.usesound, 100, 1) - user << "You unsecure the [src] from the floor!" + user << "You unsecure the [src] from the floor!" if(active) - user << "The [src] shuts off!" + 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) - user << "You secure the [src] to the floor!" + 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 1b8f2def84..3f601bcc4e 100644 --- a/code/modules/shieldgen/shield_capacitor.dm +++ b/code/modules/shieldgen/shield_capacitor.dm @@ -48,7 +48,7 @@ else if(istype(W, /obj/item/weapon/wrench)) src.anchored = !src.anchored playsound(src, W.usesound, 75, 1) - src.visible_message("\icon[src] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].") + src.visible_message("\icon[src] [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 aa504fd7a6..008358a635 100644 --- a/code/modules/shieldgen/shield_gen.dm +++ b/code/modules/shieldgen/shield_gen.dm @@ -67,7 +67,7 @@ else if(istype(W, /obj/item/weapon/wrench)) src.anchored = !src.anchored playsound(src, W.usesound, 75, 1) - src.visible_message("\icon[src] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user].") + src.visible_message("\icon[src] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user].") if(active) toggle() diff --git a/code/modules/shuttles/shuttle_specops.dm b/code/modules/shuttles/shuttle_specops.dm index 47c3aca5ab..26adfb23d2 100644 --- a/code/modules/shuttles/shuttle_specops.dm +++ b/code/modules/shuttles/shuttle_specops.dm @@ -64,14 +64,14 @@ var/obj/machinery/computer/C = user if(world.time <= reset_time) - C.visible_message("[using_map.boss_name] will not allow the Special Operations shuttle to launch yet.") + C.visible_message("[using_map.boss_name] will not allow the Special Operations shuttle to launch yet.") if (((world.time - reset_time)/10) > 60) - C.visible_message("[-((world.time - reset_time)/10)/60] minutes remain!") + C.visible_message("[-((world.time - reset_time)/10)/60] minutes remain!") else - C.visible_message("[-(world.time - reset_time)/10] seconds remain!") + C.visible_message("[-(world.time - reset_time)/10] seconds remain!") return - C.visible_message("The Special Operations shuttle will depart in [(specops_countdown_time/10)] seconds.") + C.visible_message("The Special Operations shuttle will depart in [(specops_countdown_time/10)] seconds.") if (location) //returning radio_announce("THE SPECIAL OPERATIONS SHUTTLE IS PREPARING TO RETURN") diff --git a/code/modules/shuttles/shuttles_multi.dm b/code/modules/shuttles/shuttles_multi.dm index 73e08a719f..a5ea7d1fd2 100644 --- a/code/modules/shuttles/shuttles_multi.dm +++ b/code/modules/shuttles/shuttles_multi.dm @@ -179,7 +179,7 @@ return if (MS.moving_status != SHUTTLE_IDLE) - to_chat(usr, "[shuttle_tag] vessel is moving.") + to_chat(usr, "[shuttle_tag] vessel is moving.") return if(href_list["dock_command"]) @@ -246,7 +246,7 @@ var/choice = input("Select a destination.") as null|anything in MS.destinations if(!choice) return - to_chat(usr, "[shuttle_tag] main computer received message.") + to_chat(usr, "[shuttle_tag] main computer received message.") if(MS.at_origin) MS.announce_arrival() diff --git a/code/modules/shuttles/shuttles_web.dm b/code/modules/shuttles/shuttles_web.dm index 90e5141535..92590071ee 100644 --- a/code/modules/shuttles/shuttles_web.dm +++ b/code/modules/shuttles/shuttles_web.dm @@ -375,7 +375,7 @@ ui_interact(usr) if (WS.moving_status != SHUTTLE_IDLE) - usr << "[WS.visible_name] is busy moving." + 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 5465e7d03e..45c5818213 100644 --- a/code/modules/surgery/bones.dm +++ b/code/modules/surgery/bones.dm @@ -27,15 +27,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) @@ -64,16 +64,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].", \ @@ -106,14 +106,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) @@ -147,14 +147,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 @@ -186,15 +186,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 7bc33d7500..3a482659dc 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) @@ -97,8 +97,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 @@ -150,8 +150,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 @@ -207,8 +207,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 \ No newline at end of file diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm index b3fae927bb..29c06158d5 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) @@ -104,8 +104,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) @@ -133,14 +133,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 f74c7dda64..067cc402a2 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 @@ -139,8 +139,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)) @@ -185,8 +185,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.clamp() spread_germs_to_organ(affected, user) @@ -231,14 +231,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 @@ -284,8 +284,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 @@ -329,8 +329,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 3bbb5f1089..5341151408 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)) user << " You tear some blood vessels trying to fit such a big object in this cavity." var/datum/wound/internal_bleeding/I = new (10) @@ -175,8 +175,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) ..() @@ -199,8 +199,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 BITSET(target.hud_updateflag, IMPLOYAL_HUD) @@ -222,11 +222,11 @@ imp.implanted = 0 else if(istype(tool,/obj/item/device/nif)){var/obj/item/device/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 6cd347586b..112c0356b8 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) @@ -76,8 +76,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. @@ -115,8 +115,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 @@ -154,8 +154,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) @@ -193,8 +193,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 @@ -231,8 +231,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 56c6731b9a..cbd5e743f2 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 ad4c413c8e..43ed082d9a 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_animal/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_animal/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_animal/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_animal/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_animal/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 42f97676ad..8cc1a0d3fb 100644 --- a/code/modules/vehicles/train.dm +++ b/code/modules/vehicles/train.dm @@ -86,7 +86,7 @@ unload(user, direction) - user << "You climb down from [src]." + user << "You climb down from [src]." return 1 @@ -160,7 +160,7 @@ set_dir(lead.dir) if(user) - user << "You hitch [src] to [T]." + user << "You hitch [src] to [T]." update_stats() @@ -174,7 +174,7 @@ lead.tow = null lead.update_stats() - user << "You unhitch [src] from [lead]." + 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 0b454f6bc5..c6c9246a3b 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -137,7 +137,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 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 694251a76e..c3703dca80 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("\icon[src] The [src.name] beeps.", 2) \ No newline at end of file + O.show_message("\icon[src] The [src.name] beeps.", 2) \ No newline at end of file diff --git a/code/modules/virus2/items_devices.dm b/code/modules/virus2/items_devices.dm index ae56c35087..bee6db8783 100644 --- a/code/modules/virus2/items_devices.dm +++ b/code/modules/virus2/items_devices.dm @@ -31,7 +31,7 @@ report("Antibodies detected: [antigens2string(C.antibodies)]", user) /obj/item/device/antibody_scanner/proc/report(var/text, mob/user as mob) - user << "\icon[src] \The [src] beeps, \"[text]\"" + user << "\icon[src] \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 4e40af36f7..4e845ccc33 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -474,41 +474,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/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm index 27f2d770b8..12adf709b0 100644 --- a/code/modules/vore/resizing/sizegun_vr.dm +++ b/code/modules/vore/resizing/sizegun_vr.dm @@ -74,7 +74,7 @@ if(ishuman(target)) var/mob/living/carbon/human/H = M H.resize(set_size) - 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 89ca5dfdb1..e89940190c 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 = "\icon[src] a [pick("loud","soft","sinister","eery","triumphant","depressing","cheerful","angry")] \ + fail_message = "\icon[src] 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 1ce4233c39..fb72700b41 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/weapon/cell/D in R.contents) D.charge += rand() * 100 + 50 - R << "SYSTEM ALERT: Large energy boost detected!" + R << "SYSTEM ALERT: Large energy boost detected!" return 1 /datum/artifact_effect/cellcharge/DoEffectAura() @@ -25,7 +25,7 @@ for (var/obj/item/weapon/cell/D in M.contents) D.charge += 25 if(world.time - last_message > 200) - M << "SYSTEM ALERT: Energy boost detected!" + M << "SYSTEM ALERT: Energy boost detected!" last_message = world.time return 1 @@ -41,6 +41,6 @@ for (var/obj/item/weapon/cell/D in M.contents) D.charge += rand() * 100 if(world.time - last_message > 200) - M << "SYSTEM ALERT: Energy boost detected!" + 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 4c27aaf134..2421c1b14b 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/weapon/cell/D in R.contents) D.charge = max(D.charge - rand() * 100, 0) - R << "SYSTEM ALERT: Energy drain detected!" + 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 3c7438f93e..6b4ad2d425 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) - user << "A chill passes up your spine!" + 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 8086d0e673..5a7848bfc0 100644 --- a/code/modules/xenoarcheaology/effects/goodfeeling.dm +++ b/code/modules/xenoarcheaology/effects/goodfeeling.dm @@ -31,7 +31,7 @@ if(prob(75)) H << "[pick(drastic_messages)]" else - H << "[pick(messages)]" + 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)) - H << "[pick(messages)]" + H << "[pick(messages)]" else H << "[pick(drastic_messages)]" @@ -58,7 +58,7 @@ if(prob(95)) H << "[pick(drastic_messages)]" else - H << "[pick(messages)]" + 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 963a0de295..2957f0cad8 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 - C << "You feel a soothing energy invigorate you." + 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)) - C << "You feel a soothing energy radiating from something nearby." + 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)) - C << "A wave of energy invigorates you." + 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 5e714ece47..bab60e93b8 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 - R << "Your systems report damaged components mending by themselves!" + 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) - M << "SYSTEM ALERT: Beneficial energy field detected!" + 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) - M << "SYSTEM ALERT: Structural damage has been repaired by energy pulse!" + 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 d556c76b60..f31e59e2d1 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 - H << pick("You feel like taking a nap."," You feel a yawn coming on."," You feel a little tired.") + 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)) - H << pick("You feel like taking a nap."," You feel a yawn coming on."," You feel a little tired.") + 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)) - H << pick("You feel like taking a nap."," You feel a yawn coming on."," You feel a little tired.") + 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 72ff1330de..ec48217b9e 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("\icon[holder_atom] [pick(options)]") + holder_atom.loc.visible_message("\icon[holder_atom] [pick(options)]") if(prob(20)) spawn(2) @@ -118,5 +118,5 @@ listening|=M for(var/mob/M in listening) - M << "\icon[holder_atom] [holder_atom] reverberates, \"[msg]\"" + M << "\icon[holder_atom] [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 a7fdae7553..5188b22c9b 100644 --- a/code/modules/xenoarcheaology/tools/ano_device_battery.dm +++ b/code/modules/xenoarcheaology/tools/ano_device_battery.dm @@ -39,7 +39,7 @@ /obj/item/weapon/anodevice/attackby(var/obj/I as obj, var/mob/user as mob) if(istype(I, /obj/item/weapon/anobattery)) if(!inserted_battery) - user << "You insert the battery." + user << "You insert the battery." user.drop_item() I.loc = src inserted_battery = I @@ -130,13 +130,13 @@ //work out if we need to shutdown if(inserted_battery.stored_charge <= 0) - src.loc.visible_message("\icon[src] [src] buzzes.", "\icon[src] You hear something buzz.") + src.loc.visible_message("\icon[src] [src] buzzes.", "\icon[src] You hear something buzz.") shutdown_emission() else if(world.time > time_end) - src.loc.visible_message("\icon[src] [src] chimes.", "\icon[src] You hear something chime.") + src.loc.visible_message("\icon[src] [src] chimes.", "\icon[src] You hear something chime.") shutdown_emission() else - src.visible_message("\icon[src] [src] buzzes.", "\icon[src] You hear something buzz.") + src.visible_message("\icon[src] [src] buzzes.", "\icon[src] You hear something buzz.") shutdown_emission() last_process = world.time @@ -163,7 +163,7 @@ if(href_list["startup"]) if(inserted_battery && inserted_battery.battery_effect && (inserted_battery.stored_charge > 0) ) activated = 1 - src.visible_message("\icon[src] [src] whirrs.", "\icon[src]You hear something whirr.") + src.visible_message("\icon[src] [src] whirrs.", "\icon[src]You hear something whirr.") if(!inserted_battery.battery_effect.activated) inserted_battery.battery_effect.ToggleActivate(1) time_end = world.time + duration @@ -200,9 +200,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 253aad11ad..672f1bd2c5 100644 --- a/code/modules/xenoarcheaology/tools/artifact_harvester.dm +++ b/code/modules/xenoarcheaology/tools/artifact_harvester.dm @@ -23,7 +23,7 @@ /obj/machinery/artifact_harvester/attackby(var/obj/I as obj, var/mob/user as mob) if(istype(I,/obj/item/weapon/anobattery)) if(!inserted_battery) - user << "You insert [I] into [src]." + user << "You insert [I] into [src]." user.drop_item() I.loc = src src.inserted_battery = I diff --git a/code/modules/xenoarcheaology/tools/geosample_scanner.dm b/code/modules/xenoarcheaology/tools/geosample_scanner.dm index 156a59799e..a6f7f3f69d 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() - src.visible_message("\icon[src] buzzes unhappily. It has failed mid-scan!", 2) + src.visible_message("\icon[src] buzzes unhappily. It has failed mid-scan!", 2) if(prob(5)) - src.visible_message("\icon[src] [pick("whirrs","chuffs","clicks")][pick(" excitedly"," energetically"," busily")].", 2) + src.visible_message("\icon[src] [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)) - src.visible_message("\icon[src] [pick("plinks","hisses")][pick(" quietly"," softly"," sadly"," plaintively")].", 2) + src.visible_message("\icon[src] [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() - src.visible_message("\icon[src] makes an insistent chime.", 2) + src.visible_message("\icon[src] 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 ac56f7de92..3358dc5fd7 100644 --- a/code/modules/xenoarcheaology/tools/suspension_generator.dm +++ b/code/modules/xenoarcheaology/tools/suspension_generator.dm @@ -61,7 +61,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 @@ -182,10 +182,10 @@ for(var/mob/living/M in T) M.weakened += 5 - M.visible_message("\icon[M] [M] begins to float in the air!","You feel tingly and light, but it is difficult to move.") + M.visible_message("\icon[M] [M] begins to float in the air!","You feel tingly and light, but it is difficult to move.") suspension_field = new(T) - src.visible_message("\icon[src] [src] activates with a low hum.") + src.visible_message("\icon[src] [src] activates with a low hum.") icon_state = "suspension3" for(var/obj/item/I in T) @@ -195,7 +195,7 @@ if(collected) suspension_field.icon_state = "energynet" suspension_field.overlays += "shield2" - src.visible_message("\icon[suspension_field] [suspension_field] gently absconds [collected > 1 ? "something" : "several things"].") + src.visible_message("\icon[suspension_field] [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" @@ -210,7 +210,7 @@ M << "You no longer feel like floating." M.weakened = min(M.weakened, 3) - src.visible_message("\icon[src] [src] deactivates with a gentle shudder.") + src.visible_message("\icon[src] [src] deactivates with a gentle shudder.") qdel(suspension_field) suspension_field = null icon_state = "suspension2" diff --git a/code/world.dm b/code/world.dm index f205dbf515..13520761a8 100644 --- a/code/world.dm +++ b/code/world.dm @@ -358,7 +358,7 @@ var/world_topic_spam_protect_time = world.timeofday rank = "Admin" var/message = "IRC-[rank] PM from IRC-[input["sender"]]: [input["msg"]]" - var/amessage = "IRC-[rank] PM from IRC-[input["sender"]] to [key_name(C)] : [input["msg"]]" + var/amessage = "IRC-[rank] PM from IRC-[input["sender"]] to [key_name(C)] : [input["msg"]]" C.received_irc_pm = world.time C.irc_admin = input["sender"]