From 4f63b6870d5ed5aecc4ac8f99555f9b747e33f68 Mon Sep 17 00:00:00 2001 From: clusterfack Date: Thu, 8 Jan 2015 03:04:52 -0600 Subject: [PATCH] Examine change passthrough --- code/ATMOSPHERICS/chiller.dm | 10 +- .../components/unary/vent_pump.dm | 9 +- code/ATMOSPHERICS/pipes.dm | 34 ++-- code/defines/obj/hydro.dm | 22 +-- code/game/gamemodes/events/ninja_equipment.dm | 184 +++++++++--------- code/game/machinery/alarm.dm | 28 +-- code/game/machinery/atmoalter/meter.dm | 10 +- code/game/machinery/cell_charger.dm | 6 +- code/game/machinery/cloning.dm | 10 +- code/game/machinery/cryo.dm | 30 +-- code/game/machinery/doors/firedoor.dm | 8 +- code/game/machinery/iv_drip.dm | 14 +- code/game/machinery/lightswitch.dm | 2 +- code/game/machinery/machinery.dm | 30 +-- code/game/machinery/spaceheater.dm | 14 +- code/game/machinery/status_display.dm | 2 +- code/game/mecha/mecha.dm | 12 +- code/game/objects/effects/decals/slag.dm | 4 +- code/game/objects/items.dm | 10 +- .../objects/items/devices/lightreplacer.dm | 2 +- code/game/objects/items/devices/multitool.dm | 11 +- .../objects/items/devices/pipe_painter.dm | 4 +- .../game/objects/items/devices/radio/radio.dm | 4 +- code/game/objects/items/stacks/stack.dm | 12 +- code/game/objects/items/toys.dm | 2 +- .../objects/items/weapons/airlock_painter.dm | 4 +- code/game/objects/items/weapons/cards_ids.dm | 6 +- code/game/objects/items/weapons/cash.dm | 2 +- .../objects/items/weapons/gift_wrappaper.dm | 2 +- .../items/weapons/grenades/chem_grenade.dm | 6 +- .../items/weapons/grenades/ghettobomb.dm | 2 +- .../objects/items/weapons/grenades/grenade.dm | 6 +- .../objects/items/weapons/storage/fancy.dm | 6 +- .../objects/items/weapons/storage/lockbox.dm | 1 - .../objects/items/weapons/storage/secure.dm | 2 +- code/game/objects/items/weapons/stunbaton.dm | 4 +- .../objects/items/weapons/tanks/jetpack.dm | 19 -- .../objects/items/weapons/tanks/tank_types.dm | 31 --- .../game/objects/items/weapons/tanks/tanks.dm | 10 +- code/game/objects/items/weapons/tools.dm | 8 +- code/game/objects/structures/bedsheet_bin.dm | 6 +- code/game/objects/structures/displaycase.dm | 2 +- .../objects/structures/vehicles/clowncart.dm | 2 +- code/game/objects/structures/window.dm | 2 +- code/game/turfs/simulated/walls.dm | 12 +- code/modules/assembly/assembly.dm | 4 +- code/modules/assembly/holder.dm | 4 +- code/modules/assembly/mousetrap.dm | 2 +- code/modules/clothing/clothing.dm | 12 +- code/modules/clothing/shoes/magboots.dm | 34 ++-- code/modules/clothing/spacesuits/ert.dm | 2 +- code/modules/clothing/spacesuits/plasmamen.dm | 2 +- code/modules/clothing/spacesuits/rig.dm | 4 +- code/modules/food/cooking_machines.dm | 4 +- code/modules/hydroponics/seeds.dm | 6 +- code/modules/mining/equipment_locker.dm | 14 +- .../living/carbon/alien/special/facehugger.dm | 2 +- .../mob/living/carbon/brain/brain_item.dm | 6 +- code/modules/paperwork/nano_paper_bin.dm | 2 +- code/modules/paperwork/paper.dm | 2 - code/modules/paperwork/paper_pack.dm | 2 +- code/modules/paperwork/paperbin.dm | 4 +- code/modules/paperwork/photography.dm | 2 +- code/modules/power/antimatter/fuel.dm | 2 +- code/modules/power/cable.dm | 1 + code/modules/power/cell.dm | 2 +- code/modules/power/lighting.dm | 21 +- code/modules/power/port_gen.dm | 4 +- code/modules/projectiles/ammunition.dm | 2 +- code/modules/projectiles/guns/projectile.dm | 4 +- .../projectiles/guns/projectile/pneumatic.dm | 6 +- code/modules/reagents/dartgun.dm | 24 +-- code/modules/reagents/grenade_launcher.dm | 2 +- .../reagent_containers/food/drinks.dm | 12 +- .../reagent_containers/food/snacks.dm | 6 +- .../reagents/reagent_containers/hypospray.dm | 4 +- code/modules/reagents/reagent_dispenser.dm | 4 +- code/modules/research/fabricators.dm | 4 +- code/modules/telesci/telepad.dm | 6 +- code/modules/virus2/items_devices.dm | 2 +- code/stylesheet.dm | 1 + code/unused/disease2/isolator.dm | 2 +- .../goonheist/genetics2/geneticsScanner.dm | 8 +- 83 files changed, 391 insertions(+), 441 deletions(-) diff --git a/code/ATMOSPHERICS/chiller.dm b/code/ATMOSPHERICS/chiller.dm index 3769be33b56..3260502d9aa 100644 --- a/code/ATMOSPHERICS/chiller.dm +++ b/code/ATMOSPHERICS/chiller.dm @@ -58,13 +58,13 @@ C.loc = src C.add_fingerprint(usr) - user.visible_message("\blue [user] inserts a power cell into [src].", "\blue You insert the power cell into [src].") + user.visible_message("[user] inserts a power cell into [src].", "You insert the power cell into [src].") else user << "The hatch must be open to insert a power cell." return else if(istype(I, /obj/item/weapon/screwdriver)) open = !open - user.visible_message("\blue [user] [open ? "opens" : "closes"] the hatch on the [src].", "\blue You [open ? "open" : "close"] the hatch on the [src].") + user.visible_message("[user] [open ? "opens" : "closes"] the hatch on the [src].", "You [open ? "open" : "close"] the hatch on the [src].") update_icon() if(!open && user.machine == src) user << browse(null, "window=aircond") @@ -102,7 +102,7 @@ onclose(user, "aircond") else on = !on - user.visible_message("\blue [user] switches [on ? "on" : "off"] the [src].","\blue You switch [on ? "on" : "off"] the [src].") + user.visible_message("[user] switches [on ? "on" : "off"] the [src].","You switch [on ? "on" : "off"] the [src].") update_icon() return @@ -127,7 +127,7 @@ usr.put_in_hands(cell) cell.add_fingerprint(usr) cell = null - usr.visible_message("\blue [usr] removes the power cell from \the [src].", "\blue You remove the power cell from \the [src].") + usr.visible_message("[usr] removes the power cell from \the [src].", "You remove the power cell from \the [src].") if("cellinstall") @@ -139,7 +139,7 @@ C.loc = src C.add_fingerprint(usr) - usr.visible_message("\blue [usr] inserts a power cell into \the [src].", "\blue You insert the power cell into \the [src].") + usr.visible_message("[usr] inserts a power cell into \the [src].", "You insert the power cell into \the [src].") src.updateDialog() else diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index 6322ff64045..530fbd22644 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -55,9 +55,10 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume name = "Large Air Vent" power_channel = EQUIP - New() - ..() - air_contents.volume = 1000 + +/obj/machinery/atmospherics/unary/vent_pump/high_volume/New() + ..() + air_contents.volume = 1000 /obj/machinery/atmospherics/unary/vent_pump/update_icon() if(welded) @@ -287,7 +288,7 @@ /obj/machinery/atmospherics/unary/vent_pump/examine(mob/user) ..() if(welded) - user << "It seems welded shut." + user << "It seems welded shut." /obj/machinery/atmospherics/unary/vent_pump/power_change() if(powered(power_channel)) diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index b86390084d8..80e936eb106 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -128,7 +128,7 @@ level = T.intact ? 2 : 1 initialize(1) if(!node1&&!node2) - usr << "\red There's nothing to connect this pipe section to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)" + usr << "There's nothing to connect this pipe section to! A pipe segment must be connected to at least one other object!" return 0 update_icon() build_network() @@ -580,12 +580,12 @@ return // Coloring pipes. if (istype(W, /obj/item/device/analyzer) && get_dist(user, src) <= 1) for (var/mob/O in viewers(user, null)) - O << "\red [user] has used the analyzer on \icon[icon]" + O << "[user] has used the analyzer on \icon[icon]" var/pressure = parent.air.return_pressure() var/total_moles = parent.air.total_moles() - user << "\blue Results of analysis of \icon[icon]" + user << "Results of analysis of \icon[icon]" if (total_moles>0) var/o2_concentration = parent.air.oxygen/total_moles var/n2_concentration = parent.air.nitrogen/total_moles @@ -594,16 +594,16 @@ var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration) - user << "\blue Pressure: [round(pressure,0.1)] kPa" - user << "\blue Nitrogen: [round(n2_concentration*100)]%" - user << "\blue Oxygen: [round(o2_concentration*100)]%" - user << "\blue CO2: [round(co2_concentration*100)]%" - user << "\blue Plasma: [round(plasma_concentration*100)]%" + user << "Pressure: [round(pressure,0.1)] kPa" + user << "Nitrogen: [round(n2_concentration*100)]%" + user << "Oxygen: [round(o2_concentration*100)]%" + user << "CO2: [round(co2_concentration*100)]%" + user << "Plasma: [round(plasma_concentration*100)]%" if(unknown_concentration>0.01) - user << "\red Unknown: [round(unknown_concentration*100)]%" - user << "\blue Temperature: [round(parent.air.temperature-T0C)]°C" + user << "Unknown: [round(unknown_concentration*100)]%" + user << "Temperature: [round(parent.air.temperature-T0C)]°C" else - user << "\blue Tank is empty!" + user << "Tank is empty!" /obj/machinery/atmospherics/pipe/manifold icon = 'icons/obj/atmospherics/pipe_manifold.dmi' @@ -627,7 +627,7 @@ level = T.intact ? 2 : 1 initialize(1) if(!node1&&!node2&&!node3) - usr << "\red There's nothing to connect this manifold to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)" + usr << "There's nothing to connect this manifold to! A pipe segment must be connected to at least one other object!" return 0 update_icon() // Skipped in initialize()! build_network() @@ -873,7 +873,7 @@ level = T.intact ? 2 : 1 initialize(1) if(!node1 && !node2 && !node3 && !node4) - usr << "\red There's nothing to connect this manifold to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)" + usr << "There's nothing to connect this manifold to! A pipe segment must be connected to at least one other object!" return 0 update_icon() build_network() @@ -1089,25 +1089,25 @@ if(istype(W, /obj/item/weapon/reagent_containers/glass/paint/red)) src._color = "red" src.color = PIPE_COLOR_RED - user << "\red You paint the pipe red." + user << "You paint the pipe red." update_icon() return 1 if(istype(W, /obj/item/weapon/reagent_containers/glass/paint/blue)) src._color = "blue" src.color = PIPE_COLOR_BLUE - user << "\red You paint the pipe blue." + user << "You paint the pipe blue." update_icon() return 1 if(istype(W, /obj/item/weapon/reagent_containers/glass/paint/green)) src._color = "green" src.color = PIPE_COLOR_GREEN - user << "\red You paint the pipe green." + user << "You paint the pipe green." update_icon() return 1 if(istype(W, /obj/item/weapon/reagent_containers/glass/paint/yellow)) src._color = "yellow" src.color = PIPE_COLOR_YELLOW - user << "\red You paint the pipe yellow." + user << "You paint the pipe yellow." update_icon() return 1 diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index 4aeef5e5d54..7a2e726ae8c 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -35,19 +35,19 @@ /obj/item/seeds/examine(mob/user) ..() - user << "Plant Yield: [(yield != -1) ? yield : "\red ERROR"]" - user << "Plant Potency: [(potency != -1) ? potency : "\red ERROR"]" + user << "Plant Yield: [(yield != -1) ? yield : "ERROR"]" + user << "Plant Potency: [(potency != -1) ? potency : "ERROR"]" /obj/item/seeds/attackby(var/obj/item/O as obj, var/mob/user as mob) if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "*** [plantname] ***" - user << "-Plant Endurance: \blue [endurance]" - user << "-Plant Lifespan: \blue [lifespan]" + user << "-Plant Endurance: [endurance]" + user << "-Plant Lifespan: [lifespan]" if(yield != -1) - user << "-Plant Yield: \blue [yield]" - user << "-Plant Production: \blue [production]" + user << "-Plant Yield: [yield]" + user << "-Plant Production: [production]" if(potency != -1) - user << "-Plant Potency: \blue [potency]" + user << "-Plant Potency: [potency]" return ..() // Fallthrough to item/attackby() so that bags can pick seeds up @@ -1413,7 +1413,7 @@ force = round((5 + potency / 5), 1) /obj/item/weapon/grown/deathnettle // -- Skie - desc = "The \red glowing \black nettle incites \redrage\black in you just from looking at it!" + desc = "The glowing nettle incites rage in you just from looking at it!" icon = 'icons/obj/weapons.dmi' name = "deathnettle" icon_state = "deathnettle" @@ -1430,7 +1430,7 @@ attack_verb = list("stung") suicide_act(mob/user) - viewers(user) << "\red [user] is eating some of the [src.name]! It looks like \he's trying to commit suicide." + viewers(user) << "[user] is eating some of the [src.name]! It looks like \he's trying to commit suicide." return (BRUTELOSS|TOXLOSS) /obj/item/weapon/grown/deathnettle/New() @@ -1496,7 +1496,7 @@ var/WeedKillStr = 2 suicide_act(mob/user) - viewers(user) << "\red [user] is huffing the [src.name]! It looks like \he's trying to commit suicide." + viewers(user) << "[user] is huffing the [src.name]! It looks like \he's trying to commit suicide." return (TOXLOSS) /obj/item/weapon/pestspray // -- Skie @@ -1515,7 +1515,7 @@ var/PestKillStr = 2 suicide_act(mob/user) - viewers(user) << "\red [user] is huffing the [src.name]! It looks like \he's trying to commit suicide." + viewers(user) << "[user] is huffing the [src.name]! It looks like \he's trying to commit suicide." return (TOXLOSS) /obj/item/weapon/minihoe // -- Numbers diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index 0723ec4b3f9..5658144b1e9 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -59,7 +59,7 @@ ________________________________________________________________________________ /obj/item/clothing/suit/space/space_ninja/proc/killai(mob/living/silicon/ai/A = AI) if(A.client) - A << "\red Self-erase protocol dete-- *bzzzzz*" + A << "Self-erase protocol dete-- *bzzzzz*" A << browse(null, "window=hack spideros") AI = null A.death(1)//Kill, deleting mob. @@ -85,7 +85,7 @@ ________________________________________________________________________________ if(s_control&&!s_busy) deinitialize() else - affecting << "\red The function did not trigger!" + affecting << "The function did not trigger!" return /obj/item/clothing/suit/space/space_ninja/proc/spideros() @@ -96,7 +96,7 @@ ________________________________________________________________________________ if(s_control&&!s_busy&&!kamikaze) display_spideros() else - affecting << "\red The interface is locked!" + affecting << "The interface is locked!" return /obj/item/clothing/suit/space/space_ninja/proc/stealth() @@ -107,7 +107,7 @@ ________________________________________________________________________________ if(s_control&&!s_busy) toggle_stealth() else - affecting << "\red Stealth does not appear to work!" + affecting << "Stealth does not appear to work!" return //=======//PROCESS PROCS//=======// @@ -157,27 +157,27 @@ ________________________________________________________________________________ for(var/i,i<7,i++) switch(i) if(0) - U << "\blue Now initializing..." + U << "Now initializing..." if(1) if(!lock_suit(U))//To lock the suit onto wearer. break - U << "\blue Securing external locking mechanism...\nNeural-net established." + U << "Securing external locking mechanism...\nNeural-net established." if(2) - U << "\blue Extending neural-net interface...\nNow monitoring brain wave pattern..." + U << "\Extending neural-net interface...\nNow monitoring brain wave pattern..." if(3) if(U.stat==2||U.health<=0) - U << "\red FĆAL �Rr�R: 344--93#�&&21 BR��N |/|/aV� PATT$RN RED\nA-A-aB�rT�NG..." + U << "FĆAL �Rr�R: 344--93#�&&21 BR��N |/|/aV� PATT$RN RED\nA-A-aB�rT�NG..." unlock_suit() break lock_suit(U,1)//Check for icons. U.regenerate_icons() - U << "\blue Linking neural-net interface...\nPattern \green GREEN\blue, continuing operation." + U << "Linking neural-net interface...\nPattern GREEN, continuing operation." if(4) - U << "\blue VOID-shift device status: ONLINE.\nCLOAK-tech device status: ONLINE." + U << "VOID-shift device status: ONLINE.\nCLOAK-tech device status: ONLINE." if(5) - U << "\blue Primary system status: ONLINE.\nBackup system status: ONLINE.\nCurrent energy capacity: [cell.charge]." + U << "Primary system status: ONLINE.\nBackup system status: ONLINE.\nCurrent energy capacity: [cell.charge]." if(6) - U << "\blue All systems operational. Welcome to SpiderOS, [U.real_name]." + U << "All systems operational. Welcome to SpiderOS, [U.real_name]." grant_ninja_verbs() grant_equip_verbs() ntick() @@ -187,9 +187,9 @@ ________________________________________________________________________________ if(!U.mind||U.mind.assigned_role!="MODE")//Your run of the mill persons shouldn't know what it is. Or how to turn it on. U << "You do not understand how this suit functions. Where the heck did it even come from?" else if(s_initialized) - U << "\red The suit is already functioning. \black Please report this bug." + U << "The suit is already functioning. Please report this bug." else - U << "\red ERROR: \black You cannot use this function at this time." + U << "ERROR: You cannot use this function at this time." return //=======//DEINITIALIZE//=======// @@ -198,34 +198,34 @@ ________________________________________________________________________________ if(affecting==loc&&!s_busy) var/mob/living/carbon/human/U = affecting if(!s_initialized) - U << "\red The suit is not initialized. \black Please report this bug." + U << "The suit is not initialized. Please report this bug." return if(alert("Are you certain you wish to remove the suit? This will take time and remove all abilities.",,"Yes","No")=="No") return if(s_busy||flush) - U << "\red ERROR: \black You cannot use this function at this time." + U << "ERROR: You cannot use this function at this time." return s_busy = 1 for(var/i = 0,i<7,i++) switch(i) if(0) - U << "\blue Now de-initializing..." + U << "Now de-initializing..." remove_kamikaze(U)//Shutdowns kamikaze. spideros = 0//Spideros resets. if(1) - U << "\blue Logging off, [U:real_name]. Shutting down SpiderOS." + U << "Logging off, [U:real_name]. Shutting down SpiderOS." remove_ninja_verbs() if(2) - U << "\blue Primary system status: OFFLINE.\nBackup system status: OFFLINE." + U << "Primary system status: OFFLINE.\nBackup system status: OFFLINE." if(3) - U << "\blue VOID-shift device status: OFFLINE.\nCLOAK-tech device status: OFFLINE." + U << "VOID-shift device status: OFFLINE.\nCLOAK-tech device status: OFFLINE." cancel_stealth()//Shutdowns stealth. if(4) - U << "\blue Disconnecting neural-net interface...\greenSuccess\blue." + U << "Disconnecting neural-net interface...Success." if(5) - U << "\blue Disengaging neural-net interface...\greenSuccess\blue." + U << "Disengaging neural-net interface...Success." if(6) - U << "\blue Unsecuring external locking mechanism...\nNeural-net abolished.\nOperation status: FINISHED." + U << "Unsecuring external locking mechanism...\nNeural-net abolished.\nOperation status: FINISHED." blade_check(U,2) remove_equip_verbs() unlock_suit() @@ -498,7 +498,7 @@ ________________________________________________________________________________ if(s_control) if(!affecting||U.stat||!s_initialized)//Check to make sure the guy is wearing the suit after clicking and it's on. - U << "\red Your suit must be worn and active to use this function." + U << "Your suit must be worn and active to use this function." U << browse(null, "window=spideros")//Closes the window. return @@ -510,7 +510,7 @@ ________________________________________________________________________________ U << "Anonymous Messenger blinks." else if(!affecting||A.stat||!s_initialized||A.loc!=src) - A << "\red This function is not available at this time." + A << "This function is not available at this time." A << browse(null, "window=spideros")//Closes the window. return @@ -532,7 +532,7 @@ ________________________________________________________________________________ U.electrocute_act(damage, src,0.1,1)//The last argument is a safety for the human proc that checks for gloves. cell.charge -= damage else - A << "\red ERROR: \black Not enough energy remaining." + A << "ERROR: Not enough energy remaining." if("Message") var/obj/item/device/pda/P = locate(href_list["target"]) @@ -542,7 +542,7 @@ ________________________________________________________________________________ display_to << browse(null, "window=spideros") return if(isnull(P)||P.toff)//So it doesn't freak out if the object no-longer exists. - display_to << "\red Error: unable to deliver message." + display_to << "Error: unable to deliver message." display_spideros() return P.tnote += "← From [!s_control?(A):"an unknown source"]:
[t]
" @@ -555,7 +555,7 @@ ________________________________________________________________________________ if("Inject") if( (href_list["tag"]=="radium"? (reagents.get_reagent_amount("radium"))<=(a_boost*a_transfer) : !reagents.get_reagent_amount(href_list["tag"])) )//Special case for radium. If there are only a_boost*a_transfer radium units left. - display_to << "\red Error: the suit cannot perform this function. Out of [href_list["name"]]." + display_to << "Error: the suit cannot perform this function. Out of [href_list["name"]]." else reagents.reaction(U, 2) reagents.trans_id_to(U, href_list["tag"], href_list["tag"]=="nutriment"?5:a_transfer)//Nutriment is a special case since it's very potent. Shouldn't influence actual refill amounts or anything. @@ -594,27 +594,27 @@ ________________________________________________________________________________ for(var/i, i<4, i++) switch(i) if(0) - U << "\blue Engaging mode...\n\blackCODE NAME: \red KAMIKAZE" + U << "Engaging mode...\n\CODE NAME: KAMIKAZE" if(1) - U << "\blue Re-routing power nodes... \nUnlocking limiter..." + U << "Re-routing power nodes... \nUnlocking limiter..." if(2) - U << "\blue Power nodes re-routed. \nLimiter unlocked." + U << "Power nodes re-routed. \nLimiter unlocked." if(3) grant_kamikaze(U)//Give them verbs and change variables as necessary. U.regenerate_icons()//Update their clothing. ninjablade()//Summon two energy blades. - message_admins("\blue [key_name_admin(U)] used KAMIKAZE mode.")//Let the admins know. + message_admins("[key_name_admin(U)] used KAMIKAZE mode.")//Let the admins know. s_busy = 0 return sleep(s_delay) else - U << "\red ERROR: \black Unable to initiate mode." + U << "ERROR: Unable to initiate mode." else U << browse(null, "window=spideros") s_busy = 0 return else - U << "\red ERROR: WRONG PASSWORD!" + U << "ERROR: WRONG PASSWORD!" k_unlock = 0 spideros = 0 s_busy = 0 @@ -630,7 +630,7 @@ ________________________________________________________________________________ t_disk.loc = T t_disk = null else - U << "\red ERROR: \black Could not eject disk." + U << "ERROR: Could not eject disk." if("Copy to Disk") var/datum/tech/current_data = locate(href_list["target"]) @@ -651,14 +651,14 @@ ________________________________________________________________________________ pai.loc = T pai = null else - U << "\red ERROR: \black Could not eject pAI card." + U << "ERROR: Could not eject pAI card." if("Override AI Laws") var/law_zero = A.laws.zeroth//Remembers law zero, if there is one. A.laws = new /datum/ai_laws/ninja_override A.set_zeroth_law(law_zero)//Adds back law zero if there was one. A.show_laws() - U << "\blue Law Override: SUCCESS." + U << "Law Override: SUCCESS." if("Purge AI") var/confirm = alert("Are you sure you want to purge the AI? This cannot be undone once started.", "Confirm purge", "Yes", "No") @@ -672,31 +672,31 @@ ________________________________________________________________________________ if(AI==A) switch(i) if(0) - A << "\red WARNING: \black purge procedure detected. \nNow hacking host..." - U << "\red WARNING: HACKING AT��TEMP� IN PR0GRESs!" + A << "WARNING: purge procedure detected. \nNow hacking host..." + U << "WARNING: HACKING AT��TEMP� IN PR0GRESs!" spideros = 0 k_unlock = 0 U << browse(null, "window=spideros") if(1) A << "Disconnecting neural interface..." - U << "\red WAR�NING: �R�O0�Gr�--S 2&3%" + U << "WAR�NING: �R�O0�Gr�--S 2&3%" if(2) A << "Shutting down external protocol..." - U << "\red WARNING: P����RֆGr�5S 677^%" + U << "WARNING: P����RֆGr�5S 677^%" cancel_stealth() if(3) A << "Connecting to kernel..." - U << "\red WARNING: �R�r�R_404" + U << "WARNING: �R�r�R_404" A.control_disabled = 0 if(4) A << "Connection established and secured. Menu updated." - U << "\red W�r#nING: #%@!!WȆ|_4�54@ \nUn�B88l3 T� L�-�o-L�CaT2 ##$!�RN�0..%.." + U << "W�r#nING: #%@!!WȆ|_4�54@ \nUn�B88l3 T� L�-�o-L�CaT2 ##$!�RN�0..%.." grant_AI_verbs() return sleep(s_delay) else break s_busy = 0 - U << "\blue Hacking attempt disconnected. Resuming normal operation." + U << "Hacking attempt disconnected. Resuming normal operation." else flush = 1 A.suiciding = 1 @@ -744,9 +744,9 @@ ________________________________________________________________________________ ai_holo_process()//Move to initialize else - AI << "\red ERROR: \black Image feed in progress." + AI << "ERROR: Image feed in progress." else - AI << "\red ERROR: \black Unable to project image." + AI << "ERROR: Unable to project image." return /obj/item/clothing/suit/space/space_ninja/proc/ai_holo_process() @@ -811,13 +811,13 @@ ________________________________________________________________________________ if(s_control) I:transfer_ai("NINJASUIT","AICARD",src,U) else - U << "\red ERROR: \black Remote access channel disabled." + U << "ERROR: Remote access channel disabled." return//Return individually so that ..() can run properly at the end of the proc. else if(istype(I, /obj/item/device/paicard) && !pai)//If it's a pai card. U:drop_item() I.loc = src pai = I - U << "\blue You slot \the [I] into \the [src]." + U << "You slot \the [I] into \the [src]." updateUsrDialog() return else if(istype(I, /obj/item/weapon/reagent_containers/glass))//If it's a glass beaker. @@ -838,7 +838,7 @@ ________________________________________________________________________________ return else if(istype(I, /obj/item/weapon/cell)) if(I:maxcharge>cell.maxcharge&&n_gloves&&n_gloves.candrain) - U << "\blue Higher maximum capacity detected.\nUpgrading..." + U << "Higher maximum capacity detected.\nUpgrading..." if (n_gloves&&n_gloves.candrain&&do_after(U,s_delay)) U.drop_item() I.loc = src @@ -850,9 +850,9 @@ ________________________________________________________________________________ old_cell.corrupt() old_cell.updateicon() cell = I - U << "\blue Upgrade complete. Maximum capacity: [round(cell.maxcharge/100)]%" + U << "Upgrade complete. Maximum capacity: [round(cell.maxcharge/100)]%" else - U << "\red Procedure interrupted. Protocol terminated." + U << "Procedure interrupted. Protocol terminated." return else if(istype(I, /obj/item/weapon/disk/tech_disk))//If it's a data disk, we want to copy the research on to the suit. var/obj/item/weapon/disk/tech_disk/TD = I @@ -865,13 +865,13 @@ ________________________________________________________________________________ current_data.level=TD.stored.level break TD.stored = null - U << "\blue Data analyzed and updated. Disk erased." + U << "Data analyzed and updated. Disk erased." else - U << "\red ERROR: \black Procedure interrupted. Process terminated." + U << "ERROR: Procedure interrupted. Process terminated." else I.loc = src t_disk = I - U << "\blue You slot \the [I] into \the [src]." + U << "You slot \the [I] into \the [src]." return ..() @@ -885,7 +885,7 @@ ________________________________________________________________________________ s_active=!s_active icon_state = U.gender==FEMALE ? "s-ninjasf" : "s-ninjas" U.regenerate_icons() //update their icons - U << "\blue You are now invisible to normal detection." + U << "You are now invisible to normal detection." for(var/mob/O in oviewers(U)) O.show_message("[U.name] vanishes into thin air!",1) U.invisibility = INVISIBILITY_OBSERVER @@ -897,7 +897,7 @@ ________________________________________________________________________________ spawn(0) anim(U.loc,U,'icons/mob/mob.dmi',,"uncloak",,U.dir) s_active=!s_active - U << "\blue You are now visible." + U << "You are now visible." U.invisibility = 0 for(var/mob/O in oviewers(U)) O.show_message("[U.name] appears from thin air!",1) @@ -934,7 +934,7 @@ ________________________________________________________________________________ if(!kamikaze) user << "The CLOAK-tech device is [s_active?"active":"inactive"]." else - user << "\red KAMIKAZE MODE ENGAGED!" + user << "KAMIKAZE MODE ENGAGED!" user << "There are [s_bombs] smoke bombs remaining." user << "There are [a_boost] adrenaline boosters remaining." else @@ -961,7 +961,7 @@ ________________________________________________________________________________ G.draining = 1 if(target_type!="RESEARCH")//I lumped research downloading here for ease of use. - U << "\blue Now charging battery..." + U << "Now charging battery..." switch(target_type) @@ -984,14 +984,14 @@ ________________________________________________________________________________ S.cell.charge+=drain totaldrain+=drain else break - U << "\blue Gained [totaldrain] energy from the APC." + U << "Gained [totaldrain] energy from the APC." if(!A.emagged) flick("apc-spark", src) A.emagged = 1 A.locked = 0 A.update_icon() else - U << "\red This APC has run dry of power. You must find another source." + U << "This APC has run dry of power. You must find another source." if("SMES") var/obj/machinery/power/smes/A = target @@ -1012,15 +1012,15 @@ ________________________________________________________________________________ S.cell.charge+=drain totaldrain+=drain else break - U << "\blue Gained [totaldrain] energy from the SMES cell." + U << "Gained [totaldrain] energy from the SMES cell." else - U << "\red This SMES cell has run dry of power. You must find another source." + U << "This SMES cell has run dry of power. You must find another source." if("CELL") var/obj/item/weapon/cell/A = target if(A.charge) if (G.candrain&&do_after(U,30)) - U << "\blue Gained [A.charge] energy from the cell." + U << "Gained [A.charge] energy from the cell." if(S.cell.charge+A.charge>S.cell.maxcharge) S.cell.charge=S.cell.maxcharge else @@ -1030,9 +1030,9 @@ ________________________________________________________________________________ A.corrupt() A.updateicon() else - U << "\red Procedure interrupted. Protocol terminated." + U << "Procedure interrupted. Protocol terminated." else - U << "\red This cell is empty and of no use." + U << "This cell is empty and of no use." if("MACHINERY")//Can be applied to generically to all powered machinery. I'm leaving this alone for now. var/obj/machinery/A = target @@ -1067,31 +1067,31 @@ ________________________________________________________________________________ totaldrain += drained spark_system.start() if(drained==0) break - U << "\blue Gained [totaldrain] energy from the power network." + U << "Gained [totaldrain] energy from the power network." else - U << "\red Power network could not be found. Aborting." + U << "Power network could not be found. Aborting." else - U << "\red This recharger is not providing energy. You must find another source." + U << "This recharger is not providing energy. You must find another source." if("RESEARCH") var/obj/machinery/A = target - U << "\blue Hacking \the [A]..." + U << "Hacking \the [A]..." spawn(0) var/turf/location = get_turf(U) for(var/mob/living/silicon/ai/AI in player_list) - AI << "\red Network Alert: Hacking attempt detected[location?" in [location]":". Unable to pinpoint location"]." + AI << "Network Alert: Hacking attempt detected[location?" in [location]":". Unable to pinpoint location"]." if(A:files&&A:files.known_tech.len) for(var/datum/tech/current_data in S.stored_research) - U << "\blue Checking \the [current_data.name] database." + U << "Checking \the [current_data.name] database." if(do_after(U, S.s_delay)&&G.candrain&&!isnull(A)) for(var/datum/tech/analyzing_data in A:files.known_tech) if(current_data.id==analyzing_data.id) if(analyzing_data.level>current_data.level) - U << "\blue Database: \black UPDATED." + U << "Database: UPDATED." current_data.level = analyzing_data.level break//Move on to next. else break//Otherwise, quit processing. - U << "\blue Data analyzed. Process finished." + U << "Data analyzed. Process finished." if("WIRE") var/obj/structure/cable/A = target @@ -1119,11 +1119,11 @@ ________________________________________________________________________________ totaldrain += drained S.spark_system.start() if(drained==0) break - U << "\blue Gained [totaldrain] energy from the power network." + U << "Gained [totaldrain] energy from the power network." if("MECHA") var/obj/mecha/A = target - A.occupant_message("\red Warning: Unauthorized access through sub-route 4, block H, detected.") + A.occupant_message("Warning: Unauthorized access through sub-route 4, block H, detected.") if(A.get_charge()) while(G.candrain&&A.cell.charge>0&&!maxcapacity) drain = rand(G.mindrain,G.maxdrain) @@ -1139,13 +1139,13 @@ ________________________________________________________________________________ S.cell.charge+=drain totaldrain+=drain else break - U << "\blue Gained [totaldrain] energy from [src]." + U << "Gained [totaldrain] energy from [src]." else - U << "\red The exosuit's battery has run dry. You must find another source of power." + U << "The exosuit's battery has run dry. You must find another source of power." if("CYBORG") var/mob/living/silicon/robot/A = target - A << "\red Warning: Unauthorized access through sub-route 12, block C, detected." + A << "Warning: Unauthorized access through sub-route 12, block C, detected." G.draining = 1 if(A.cell&&A.cell.charge) while(G.candrain&&A.cell.charge>0&&!maxcapacity) @@ -1162,9 +1162,9 @@ ________________________________________________________________________________ S.cell.charge+=drain totaldrain+=drain else break - U << "\blue Gained [totaldrain] energy from [A]." + U << "Gained [totaldrain] energy from [A]." else - U << "\red Their battery has run dry of power. You must find another source." + U << "Their battery has run dry of power. You must find another source." else//Else nothing :< @@ -1337,7 +1337,7 @@ It is possible to destroy the net by the occupant or someone else. for(var/mob/O in viewers(src, 3)) O.show_message(text("[] was recovered from the energy net!", M.name), 1, text("You hear a grunt."), 2) if(!isnull(master))//As long as they still exist. - master << "\red ERROR: \black unable to initiate transport protocol. Procedure terminated." + master << "ERROR: unable to initiate transport protocol. Procedure terminated." del(src) return @@ -1351,7 +1351,7 @@ It is possible to destroy the net by the occupant or someone else. if(isnull(M)||M.loc!=loc)//If mob is gone or not at the location. if(!isnull(master))//As long as they still exist. - master << "\red ERROR: \black unable to locate \the [mob_name]. Procedure terminated." + master << "ERROR: unable to locate \the [mob_name]. Procedure terminated." del(src)//Get rid of the net. return @@ -1372,7 +1372,7 @@ It is possible to destroy the net by the occupant or someone else. anim(M.loc,M,'icons/mob/mob.dmi',,"phaseout",,M.dir) M.loc = pick(holdingfacility)//Throw mob in to the holding facility. - M << "\red You appear in a strange place!" + M << "You appear in a strange place!" spawn(0) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() @@ -1387,12 +1387,12 @@ It is possible to destroy the net by the occupant or someone else. O.show_message(text("[] vanished!", M), 1, text("You hear sparks flying!"), 2) if(!isnull(master))//As long as they still exist. - master << "\blue SUCCESS: \black transport procedure of \the [affecting] complete." + master << "SUCCESS: transport procedure of \the [affecting] complete." M.anchored = 0//Important. else//And they are free. - M << "\blue You are free of the net!" + M << "You are free of the net!" return bullet_act(var/obj/item/projectile/Proj) @@ -1424,7 +1424,7 @@ It is possible to destroy the net by the occupant or someone else. hitby(AM as mob|obj) ..() for(var/mob/O in viewers(src, null)) - O.show_message(text("\red [src] was hit by [AM]."), 1) + O.show_message(text("[src] was hit by [AM]."), 1) var/tforce = 0 if(ismob(AM)) tforce = 10 @@ -1438,9 +1438,9 @@ It is possible to destroy the net by the occupant or someone else. attack_hand() if (M_HULK in usr.mutations) - usr << text("\blue You easily destroy the energy net.") + usr << text("You easily destroy the energy net.") for(var/mob/O in oviewers(src)) - O.show_message(text("\red [] rips the energy net apart!", usr), 1) + O.show_message(text("[] rips the energy net apart!", usr), 1) health-=50 healthcheck() return @@ -1451,15 +1451,15 @@ It is possible to destroy the net by the occupant or someone else. attack_alien() if (islarva(usr)) return - usr << text("\green You claw at the net.") + usr << text("You claw at the net.") for(var/mob/O in oviewers(src)) - O.show_message(text("\red [] claws at the energy net!", usr), 1) + O.show_message(text("[] claws at the energy net!", usr), 1) playsound(get_turf(src), 'sound/weapons/slash.ogg', 80, 1) health -= rand(10, 20) if(health <= 0) - usr << text("\green You slice the energy net to pieces.") + usr << text("\You slice the energy net to pieces.") for(var/mob/O in oviewers(src)) - O.show_message(text("\red [] slices the energy net apart!", usr), 1) + O.show_message(text("[] slices the energy net apart!", usr), 1) healthcheck() return diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index b54323b0e68..e365c3129a4 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -824,7 +824,7 @@ stat ^= BROKEN add_fingerprint(user) for(var/mob/O in viewers(user, null)) - O.show_message(text("\red [] has []activated []!", user, (stat&BROKEN) ? "de" : "re", src), 1) + O.show_message(text("[] has []activated []!", user, (stat&BROKEN) ? "de" : "re", src), 1) update_icon() return */ @@ -849,10 +849,10 @@ else if(allowed(user) && !wires.IsIndexCut(AALARM_WIRE_IDSCAN)) locked = !locked - user << "\blue You [ locked ? "lock" : "unlock"] the Air Alarm interface." + user << "You [ locked ? "lock" : "unlock"] the Air Alarm interface." updateUsrDialog() else - user << "\red Access denied." + user << "Access denied." return if(1) @@ -911,9 +911,9 @@ /obj/machinery/alarm/examine(mob/user) ..() if (buildstage < 2) - user << "It is not wired." + user << "It is not wired." if (buildstage < 1) - user << "The circuit is missing." + user << "The circuit is missing." /* AIR ALARM ITEM @@ -949,14 +949,14 @@ Code shamelessly copied from apc_frame var/turf/loc = get_turf_loc(usr) var/area/A = loc.loc if (!istype(loc, /turf/simulated/floor)) - usr << "\red Air Alarm cannot be placed on this spot." + usr << "Air Alarm cannot be placed on this spot." return if (A.requires_power == 0 || A.name == "Space") - usr << "\red Air Alarm cannot be placed in this area." + usr << "Air Alarm cannot be placed in this area." return if(gotwallitem(loc, ndir)) - usr << "\red There's already an item on this wall!" + usr << "There's already an item on this wall!" return new /obj/machinery/alarm(loc, ndir, 1) @@ -1040,13 +1040,13 @@ FIRE ALARM if (istype(W, /obj/item/device/multitool)) src.detecting = !( src.detecting ) if (src.detecting) - user.visible_message("\red [user] has reconnected [src]'s detecting unit!", "You have reconnected [src]'s detecting unit.") + user.visible_message("[user] has reconnected [src]'s detecting unit!", "You have reconnected [src]'s detecting unit.") else - user.visible_message("\red [user] has disconnected [src]'s detecting unit!", "You have disconnected [src]'s detecting unit.") + user.visible_message("[user] has disconnected [src]'s detecting unit!", "You have disconnected [src]'s detecting unit.") if(istype(W, /obj/item/weapon/wirecutters)) if(do_after(user,50)) buildstage=1 - user.visible_message("\red [user] has cut the wiring from \the [src]!", "You have cut the last of the wiring from \the [src].") + user.visible_message("[user] has cut the wiring from \the [src]!", "You have cut the last of the wiring from \the [src].") update_icon() new /obj/item/weapon/cable_coil(user.loc,5) playsound(get_turf(src), 'sound/items/Wirecutter.ogg', 50, 1) @@ -1264,14 +1264,14 @@ Code shamelessly copied from apc_frame var/turf/loc = get_turf_loc(usr) var/area/A = loc.loc if (!istype(loc, /turf/simulated/floor)) - usr << "\red Fire Alarm cannot be placed on this spot." + usr << "Fire Alarm cannot be placed on this spot." return if (A.requires_power == 0 || A.name == "Space") - usr << "\red Fire Alarm cannot be placed in this area." + usr << "Fire Alarm cannot be placed in this area." return if(gotwallitem(loc, ndir)) - usr << "\red There's already an item on this wall!" + usr << "There's already an item on this wall!" return new /obj/machinery/firealarm(loc, ndir, 1) diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index be780e38f5a..fd3b00c7760 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -102,7 +102,7 @@ /obj/machinery/meter/examine(mob/user) ..() - user << status() + attack_hand(user) /obj/machinery/meter/attack_ai(var/mob/user) attack_hand(user) @@ -119,7 +119,7 @@ if (get_dist(usr, src) <= 3 || istype(usr, /mob/living/silicon/ai) || istype(usr, /mob/dead)) t += status() else - usr << "\blue You are too far away." + usr << "You are too far away." return 1 usr << t @@ -142,11 +142,11 @@ return ..() playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." + user << "You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ + "[user] unfastens \the [src].", \ + "You have unfastened \the [src].", \ "You hear ratchet.") new /obj/item/pipe_meter(src.loc) del(src) diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 4d795bd095d..160ac85fc2b 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -46,14 +46,14 @@ ..() if(istype(W, /obj/item/weapon/cell) && anchored) if(charging) - user << "\red There is already a cell in the charger." + user << "There is already a cell in the charger." return else var/area/a = loc.loc // Gets our locations location, like a dream within a dream if(!isarea(a)) return if(a.power_equip == 0) // There's no APC in this area, don't try to cheat power! - user << "\red The [name] blinks red as you try to insert the cell!" + user << "The [name] blinks red as you try to insert the cell!" return user.drop_item() @@ -76,7 +76,7 @@ /obj/machinery/cell_charger/wrenchAnchor(mob/user) if(charging) - user << "\red Remove the cell first!" + user << "Remove the cell first!" return ..() diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index ff6a998349c..3e3937d90d6 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -138,7 +138,7 @@ /obj/item/weapon/disk/data/examine(mob/user) ..() - user << text("The write-protect tab is set to [src.read_only ? "protected" : "unprotected"].") + user << "The write-protect tab is set to [src.read_only ? "protected" : "unprotected"]." //Health Tracker Implant @@ -319,7 +319,7 @@ /obj/machinery/clonepod/crowbarDestroy(mob/user) if (occupant) - user << "\red You cannot disassemble this [src], it's occupado." + user << "You cannot disassemble this [src], it's occupado." return return..() @@ -327,18 +327,18 @@ /obj/machinery/clonepod/attackby(obj/item/weapon/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if (!src.check_access(W)) - user << "\red Access Denied." + user << "Access Denied." return if ((!src.locked) || (isnull(src.occupant))) return if ((src.occupant.health < -20) && (src.occupant.stat != 2)) - user << "\red Access Refused." + user << "Access Refused." return else src.locked = 0 user << "System unlocked." else if (istype(W, /obj/item/weapon/reagent_containers/food/snacks/meat)) - user << "\blue \The [src] processes \the [W]." + user << "\The [src] processes \the [W]." biomass += 50 user.drop_item() del(W) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 08187399348..d4b476003dc 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -65,7 +65,7 @@ if(!istype(user.loc, /turf) || !istype(O.loc, /turf)) // are you in a container/closet/pod/etc? return if(occupant) - user << "\blue The cryo cell is already occupied!" + user << "The cryo cell is already occupied!" return if(isrobot(user)) if(!istype(user:module, /obj/item/weapon/robot_module/medical)) @@ -75,7 +75,7 @@ if(!istype(L) || L.buckled) return if(L.abiotic()) - user << "\red Subject cannot have abiotic items on." + user << "Subject cannot have abiotic items on." return for(var/mob/living/carbon/slime/M in range(1,L)) if(M.Victim == L) @@ -126,16 +126,16 @@ /obj/machinery/atmospherics/unary/cryo_cell/examine(mob/user) ..() - if(in_range(usr, src)) - usr << "You can just about make out some loose objects floating in the murk:" + if(in_range(user, src)) + user << "You can just about make out some loose objects floating in the murk:" for(var/obj/O in src) if(O != beaker) - usr << O.name + user << O.name for(var/mob/M in src) if(M != occupant) - usr << M.name + user << M.name else - usr << "Too far away to view contents." + user << "Too far away to view contents." /obj/machinery/atmospherics/unary/cryo_cell/attack_hand(mob/user) ui_interact(user) @@ -244,7 +244,7 @@ user << "[src] is on." return if(occupant) - user << "\red [occupant.name] is inside the [src]!" + user << "[occupant.name] is inside the [src]!" return if(beaker) //special check to avoid destroying this beaker.loc = src.loc @@ -253,7 +253,7 @@ /obj/machinery/atmospherics/unary/cryo_cell/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob) if(istype(G, /obj/item/weapon/reagent_containers/glass)) if(beaker) - user << "\red A beaker is already loaded into the machine." + user << "A beaker is already loaded into the machine." return beaker = G user.drop_item() @@ -354,16 +354,16 @@ return /obj/machinery/atmospherics/unary/cryo_cell/proc/put_mob(mob/living/carbon/M as mob) if (!istype(M)) - usr << "\red The cryo cell cannot handle such a lifeform!" + usr << "The cryo cell cannot handle such a lifeform!" return if (occupant) - usr << "\red The cryo cell is already occupied!" + usr << "The cryo cell is already occupied!" return if (M.abiotic()) - usr << "\red Subject may not have abiotic items on." + usr << "Subject may not have abiotic items on." return if(!node) - usr << "\red The cell is not correctly connected to its pipe network!" + usr << "The cell is not correctly connected to its pipe network!" return if (M.client) M.client.perspective = EYE_PERSPECTIVE @@ -371,7 +371,7 @@ M.stop_pulling() M.loc = src if(M.health > -100 && (M.health < 0 || M.sleeping)) - M << "\blue You feel a cold liquid surround you. Your skin starts to freeze up." + M << "You feel a cold liquid surround you. Your skin starts to freeze up." occupant = M //M.metabslow = 1 add_fingerprint(usr) @@ -386,7 +386,7 @@ if(usr == occupant)//If the user is inside the tube... if (usr.stat == 2)//and he's not dead.... return - usr << "\blue Release sequence activated. This will take two minutes." + usr << "Release sequence activated. This will take two minutes." sleep(1200) if(!src || !usr || !occupant || (occupant != usr)) //Check if someone's released/replaced/bombed him already return diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index ef839f32727..643b1dd224c 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -101,7 +101,7 @@ /obj/machinery/door/firedoor/examine(mob/user) . = ..() if(pdiff >= FIREDOOR_MAX_PRESSURE_DIFF) - user << "WARNING: Current pressure differential is [pdiff]kPa! Opening door may result in injury!" + user << "WARNING: Current pressure differential is [pdiff]kPa! Opening door may result in injury!" user << "Sensor readings:" for(var/index = 1; index <= tile_info.len; index++) @@ -188,7 +188,7 @@ var/obj/item/weapon/weldingtool/W = C if(W.remove_fuel(0, user)) blocked = !blocked - user.visible_message("\The [user] [blocked ? "welds" : "unwelds"] \the [src] with \a [W].",\ + user.visible_message("\The [user] [blocked ? "welds" : "unwelds"] \the [src] with \a [W].",\ "You [blocked ? "weld" : "unweld"] \the [src] with \the [W].",\ "You hear something being welded.") update_icon() @@ -206,11 +206,11 @@ if(operating) return if( blocked ) - user.visible_message("\The [user] pries at \the [src] with \a [C], but \the [src] is welded in place!",\ + user.visible_message("\The [user] pries at \the [src] with \a [C], but \the [src] is welded in place!",\ "You try to pry \the [src] [density ? "open" : "closed"], but it is welded in place!",\ "You hear someone struggle and metal straining.") - user.visible_message("\The [user] forces \the [src] [density ? "open" : "closed"] with \a [C]!",\ + user.visible_message("\The [user] forces \the [src] [density ? "open" : "closed"] with \a [C]!",\ "You force \the [src] [density ? "open" : "closed"] with \the [C]!",\ "You hear metal strain, and a door [density ? "open" : "close"].") diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 1e514c6a0eb..c03a6cd130b 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -149,7 +149,7 @@ set src in view(1) if(!istype(usr, /mob/living)) - usr << "\red You can't do that." + usr << "You can't do that." return if(usr.stat) @@ -160,16 +160,12 @@ /obj/machinery/iv_drip/examine(mob/user) ..() - if (!(usr in view(2)) && usr!=src.loc) return - user << "The [src] is [mode ? "injecting" : "taking blood"]." - if(beaker) if(beaker.reagents && beaker.reagents.reagent_list.len) - user << "Attached is \a [beaker] with [beaker.reagents.total_volume] units of liquid." + user << "Attached is \a [beaker] with [beaker.reagents.total_volume] units of liquid." else - user << "Attached is an empty [beaker]." + user << "Attached is an empty [beaker]." else - user << "No chemicals are attached." - - user << "[attached ? attached : "No one"] is attached." \ No newline at end of file + user << "No chemicals are attached." + user << "[attached ? attached : "No one"] is attached." diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 09e05040642..877d0fee002 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -23,7 +23,7 @@ /obj/machinery/light_switch/examine(mob/user) ..() - user << "It is [on? "on" : "off"]." + user << "It is [on? "on" : "off"]." /obj/machinery/light_switch/attack_paw(mob/user) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 38418e45dd9..e78e08978de 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -146,7 +146,7 @@ Class Procs: /obj/machinery/examine(mob/user) ..() if(panel_open) - user << "Its maintenance panel is open." + user << "Its maintenance panel is open." /obj/machinery/Destroy() if(src in machines) @@ -243,7 +243,7 @@ Class Procs: var/re_init=0 if("set_tag" in href_list) if(!(href_list["set_tag"] in vars)) - usr << "\red Something went wrong: Unable to find [href_list["set_tag"]] in vars!" + usr << "Something went wrong: Unable to find [href_list["set_tag"]] in vars!" return 1 var/current_tag = src.vars[href_list["set_tag"]] var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID tag", src, current_tag) as null|text),1,MAX_MESSAGE_LEN) @@ -260,13 +260,13 @@ Class Procs: if(!O) return 1 if(!canLink(O)) - usr << "\red You can't link with that device." + usr << "You can't link with that device." return 1 if(unlinkFrom(usr, O)) - usr << "\blue A green light flashes on \the [P], confirming the link was removed." + usr << "A green light flashes on \the [P], confirming the link was removed." else - usr << "\red A red light flashes on \the [P]. It appears something went wrong when unlinking the two devices." + usr << "A red light flashes on \the [P]. It appears something went wrong when unlinking the two devices." update_mt_menu=1 if("link" in href_list) @@ -274,25 +274,25 @@ Class Procs: if(!O) return 1 if(!canLink(O,href_list)) - usr << "\red You can't link with that device." + usr << "You can't link with that device." return 1 if (isLinkedWith(O)) - usr << "\red A red light flashes on \the [P]. The two devices are already linked." + usr << "A red light flashes on \the [P]. The two devices are already linked." return 1 if(linkWith(usr, O, href_list)) - usr << "\blue A green light flashes on \the [P], confirming the link was removed." + usr << "A green light flashes on \the [P], confirming the link has been created." else - usr << "\red A red light flashes on \the [P]. It appears something went wrong when linking the two devices." + usr << "A red light flashes on \the [P]. It appears something went wrong when linking the two devices." update_mt_menu=1 if("buffer" in href_list) P.buffer = src - usr << "\blue A green light flashes, and the device appears in the multitool buffer." + usr << "A green light flashes, and the device appears in the multitool buffer." update_mt_menu=1 if("flush" in href_list) - usr << "\blue A green light flashes, and the device disappears from the multitool buffer." + usr << "A green light flashes, and the device disappears from the multitool buffer." P.buffer = null update_mt_menu=1 @@ -324,7 +324,7 @@ Class Procs: if ( ! (istype(usr, /mob/living/carbon/human) || \ istype(usr, /mob/living/silicon) || \ istype(usr, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") ) - usr << "\red You don't have the dexterity to do this!" + usr << "You don't have the dexterity to do this!" return 1 var/norange = 0 @@ -380,7 +380,7 @@ Class Procs: if ( ! (istype(usr, /mob/living/carbon/human) || \ istype(usr, /mob/living/silicon) || \ istype(usr, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") ) - usr << "\red You don't have the dexterity to do this!" + usr << "You don't have the dexterity to do this!" return 1 /* //distance checks are made by atom/proc/DblClick @@ -390,10 +390,10 @@ Class Procs: if (ishuman(user)) var/mob/living/carbon/human/H = user if(H.getBrainLoss() >= 60) - visible_message("\red [H] stares cluelessly at [src] and drools.") + visible_message("[H] stares cluelessly at [src] and drools.") return 1 else if(prob(H.getBrainLoss())) - user << "\red You momentarily forget how to use [src]." + user << "You momentarily forget how to use [src]." return 1 src.add_fingerprint(user) diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 1198776aef6..0479fa16f92 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -35,11 +35,11 @@ /obj/machinery/space_heater/examine(mob/user) ..() - user << "The heater is [on ? "on" : "off"] and the hatch is [open ? "open" : "closed"]." + user << "The heater is [on ? "on" : "off"] and the hatch is [open ? "open" : "closed"]." if(open) - user << "The power cell is [cell ? "installed" : "missing"]." + user << "The power cell is [cell ? "installed" : "missing"]." else - user << "The charge meter reads [cell ? round(cell.percent(),1) : 0]%" + user << "The charge meter reads [cell ? round(cell.percent(),1) : 0]%" /obj/machinery/space_heater/emp_act(severity) if(stat & (BROKEN|NOPOWER)) @@ -65,7 +65,7 @@ C.loc = src C.add_fingerprint(usr) - user.visible_message("\blue [user] inserts a power cell into [src].", "\blue You insert the power cell into [src].") + user.visible_message("[user] inserts a power cell into [src].", "You insert the power cell into [src].") else user << "The hatch must be open to insert a power cell." return @@ -113,7 +113,7 @@ else on = !on - user.visible_message("\blue [user] switches [on ? "on" : "off"] the [src].","\blue You switch [on ? "on" : "off"] the [src].") + user.visible_message("[user] switches [on ? "on" : "off"] the [src].","You switch [on ? "on" : "off"] the [src].") update_icon() return @@ -138,7 +138,7 @@ usr.put_in_hands(cell) cell.add_fingerprint(usr) cell = null - usr.visible_message("\blue [usr] removes the power cell from \the [src].", "\blue You remove the power cell from \the [src].") + usr.visible_message("[usr] removes the power cell from \the [src].", "You remove the power cell from \the [src].") if("cellinstall") if(open && !cell) @@ -149,7 +149,7 @@ C.loc = src C.add_fingerprint(usr) - usr.visible_message("\blue [usr] inserts a power cell into \the [src].", "\blue You insert the power cell into \the [src].") + usr.visible_message("[usr] inserts a power cell into \the [src].", "You insert the power cell into \the [src].") updateDialog() else diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 4297aecbe71..7e972ab53e7 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -131,7 +131,7 @@ . = ..() switch(mode) if(1,2,4) - user << "The display says:
\t[message1]
\t[message2]" + user << "The display says:
\t[message1]
\t[message2]" /obj/machinery/status_display/proc/set_message(m1, m2) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index b0df1613723..63d37630fcd 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -170,15 +170,15 @@ var/integrity = health/initial(health)*100 switch(integrity) if(85 to 100) - user << "It's fully intact." + user << "It's fully intact." if(65 to 85) - user << "It's slightly damaged." + user << "It's slightly damaged." if(45 to 65) - user << "It's badly damaged." + user << "It's badly damaged." if(25 to 45) - user << "It's heavily damaged." + user << "It's heavily damaged." else - user << "It's falling apart." + user << "It's falling apart." if(equipment && equipment.len) user << "It's equipped with:" for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment) @@ -634,7 +634,7 @@ user.delayNextAttack(8) src.log_message("Attacked by [W]. Attacker - [user]") if(prob(src.deflect_chance)) - user << "The [W] bounces off [src.name] armor." + user << "The [W] bounces off [src.name] armor." src.log_append_to_last("Armor saved.") /* for (var/mob/V in viewers(src)) diff --git a/code/game/objects/effects/decals/slag.dm b/code/game/objects/effects/decals/slag.dm index 81094372539..ad773a02702 100644 --- a/code/game/objects/effects/decals/slag.dm +++ b/code/game/objects/effects/decals/slag.dm @@ -97,6 +97,6 @@ slag.mats = src.mats qdel(src) else - user.visible_message("[user.name] hits \the [src] with his [W.name].", \ - "You fail to damage \the [src] with your [W.name]!", \ + user.visible_message("[user.name] hits \the [src] with his [W.name].", \ + "You fail to damage \the [src] with your [W.name]!", \ "You hear someone hitting something.") \ No newline at end of file diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 2d948bdb26d..d8764b357ee 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -685,13 +685,13 @@ if(M != user) for(var/mob/O in (viewers(M) - user - M)) - O.show_message("[M] has been stabbed in the eye with [src] by [user].", 1) - M << "[user] stabs you in the eye with [src]!" - user << "You stab [M] in the eye with [src]!" + O.show_message("[M] has been stabbed in the eye with [src] by [user].", 1) + M << "[user] stabs you in the eye with [src]!" + user << "You stab [M] in the eye with [src]!" else user.visible_message( \ - "[user] has stabbed themself with [src]!", \ - "You stab yourself in the eyes with [src]!" \ + "[user] has stabbed themself with [src]!", \ + "You stab yourself in the eyes with [src]!" \ ) eyes.damage += rand(3,4) diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index dfd0a637845..fa396251d57 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -69,7 +69,7 @@ /obj/item/device/lightreplacer/examine(mob/user) ..() - user << "It has [uses] light\s remaining." + user << "It has [uses] light\s remaining." /obj/item/device/lightreplacer/attackby(obj/item/W, mob/user) if(istype(W, /obj/item/weapon/card/emag) && emagged == 0) diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index ca621417044..1a8e4ab9f35 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -109,11 +109,12 @@ obj/item/device/multitool/ai_detect/update_icon() obj/item/device/multitool/ai_detect/examine(mob/user) ..() - if(src.detected) user << "The screen displays:" - if(src.detected & DETECT_AI) user << "AI detected" - if(src.detected & DETECT_PAI) user << "pAI detected" - if(src.detected & DETECT_RECORDER) user << "Tape recorder detected" - if(src.detected & DETECT_ANALYZER) user << "Voice analyzer detected" + if(src.detected) + user << "The screen displays:" + if(DETECT_AI) user << "AI detected" + if(DETECT_PAI) user << "pAI detected>" + if(DETECT_RECORDER) user << "Tape recorder detected" + if(DETECT_ANALYZER) user << "Voice analyzer detected" //////////////////////////////////////////////////////////////////////// #undef DETECT_TICKER_PERIOD diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm index 59e1ebee189..60e396a6c5c 100644 --- a/code/game/objects/items/devices/pipe_painter.dm +++ b/code/game/objects/items/devices/pipe_painter.dm @@ -19,7 +19,7 @@ return var/obj/machinery/atmospherics/pipe/P = A if(!(mode in P.available_colors)) - user << "\red This [P] can't be painted [mode]. Available colors: [english_list(P.available_colors)]" + user << "This [P] can't be painted [mode]. Available colors: [english_list(P.available_colors)]" return P._color = mode user.visible_message("[user] paints \the [P] [mode].","You paint \the [P] [mode].") @@ -30,4 +30,4 @@ /obj/item/device/pipe_painter/examine(mob/user) ..() - user << "It is in [mode] mode." \ No newline at end of file + user << "It is in [mode] mode." \ No newline at end of file diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 3bd4de2e7b4..654da3068ed 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -677,9 +677,9 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use /obj/item/device/radio/examine(mob/user) ..() if (b_stat) - usr.show_message("\the [src] can be attached and modified!") + user.show_message("\the [src] can be attached and modified!") else - usr.show_message("\the [src] can not be modified or attached!") + user.show_message("\the [src] can not be modified or attached!") /obj/item/device/radio/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 10f475d53da..8a4530ddb4c 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -28,7 +28,7 @@ /obj/item/stack/examine(mob/user) ..() - user << "There are [src.amount] [src.singular_name]\s in the stack." + user << "There are [src.amount] [src.singular_name]\s in the stack." /obj/item/stack/attack_self(mob/user as mob) list_recipes(user) @@ -117,18 +117,18 @@ if (!multiplier) multiplier = 1 if (src.amount < R.req_amount*multiplier) if (R.req_amount*multiplier>1) - usr << "\red You haven't got enough [src] to build \the [R.req_amount*multiplier] [R.title]\s!" + usr << "You haven't got enough [src] to build \the [R.req_amount*multiplier] [R.title]\s!" else - usr << "\red You haven't got enough [src] to build \the [R.title]!" + usr << "You haven't got enough [src] to build \the [R.title]!" return if (R.one_per_turf && (locate(R.result_type) in usr.loc)) - usr << "\red There is another [R.title] here!" + usr << "There is another [R.title] here!" return if (R.on_floor && !istype(usr.loc, /turf/simulated/floor)) - usr << "\red \The [R.title] must be constructed on the floor!" + usr << "\The [R.title] must be constructed on the floor!" return if (R.time) - usr << "\blue Building [R.title] ..." + usr << "Building [R.title] ..." if (!do_after(usr, R.time)) return if (src.amount < R.req_amount*multiplier) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 5a1feb9b2a0..7a68153a384 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -897,7 +897,7 @@ icon_state = "gooncode" suicide_act(mob/user) - viewers(user) << "[user] is using [src.name]! It looks like \he's trying to re-add poo!" + viewers(user) << "[user] is using [src.name]! It looks like \he's trying to re-add poo!" return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS) diff --git a/code/game/objects/items/weapons/airlock_painter.dm b/code/game/objects/items/weapons/airlock_painter.dm index b226d660a9b..db4d3ed941d 100644 --- a/code/game/objects/items/weapons/airlock_painter.dm +++ b/code/game/objects/items/weapons/airlock_painter.dm @@ -44,7 +44,7 @@ /obj/item/weapon/airlock_painter/examine(mob/user) ..() if(!ink) - user << "It doesn't have a toner cardridge installed." + user << "It doesn't have a toner cardridge installed." return var/ink_level = "high" if(ink.charges < 1) @@ -53,7 +53,7 @@ ink_level = "low" else if((ink.charges/ink.max_charges) > 1) //Over 100% (admin var edit) ink_level = "dangerously high" - user << "Its ink levels look [ink_level]." + user << "Its ink levels look [ink_level]." /obj/item/weapon/airlock_painter/attackby(obj/item/weapon/W, mob/user) ..() diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index de4122e240e..fd45770315e 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -274,7 +274,7 @@ src.access |= I.access if(istype(user, /mob/living) && user.mind) if(user.mind.special_role) - usr << "\blue The card's microscanners activate as you pass it over the ID, copying its access." + usr << "The card's microscanners activate as you pass it over the ID, copying its access." /obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob) if(!src.registered_name) @@ -292,7 +292,7 @@ return src.assignment = u src.name = "[src.registered_name]'s ID Card ([src.assignment])" - user << "\blue You successfully forge the ID card." + user << "You successfully forge the ID card." registered_user = user else if(!registered_user || registered_user == user) @@ -312,7 +312,7 @@ return src.assignment = u src.name = "[src.registered_name]'s ID Card ([src.assignment])" - user << "\blue You successfully forge the ID card." + user << "You successfully forge the ID card." return if("Show") ..() diff --git a/code/game/objects/items/weapons/cash.dm b/code/game/objects/items/weapons/cash.dm index a0a526370d9..6c0d4645dce 100644 --- a/code/game/objects/items/weapons/cash.dm +++ b/code/game/objects/items/weapons/cash.dm @@ -40,7 +40,7 @@ var/global/list/moneytypes=list( user << "\icon[src] This is a stack of [amount] [src]s." else user << "\icon[src] This is \a [src]s." - user << "It's worth [worth*amount] credits." + user << "It's worth [worth*amount] credits." /obj/item/weapon/spacecash/update_icon() icon_state = "cash[worth]" diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 775ce1450e4..3e45232e7aa 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -295,7 +295,7 @@ /obj/item/weapon/wrapping_paper/examine(mob/user) ..() - user << "There is about [amount] square units of paper left!" + user << "There is about [amount] square units of paper left!" /obj/item/weapon/wrapping_paper/attack(mob/target as mob, mob/user as mob) if (!istype(target, /mob/living/carbon/human)) return diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 550cee817f1..ff09a05eb29 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -40,7 +40,7 @@ inserted_cores = 0 name = "unsecured grenade with [beakers.len] containers[detonator?" and detonator":""]" if(stage > 1 && !active && clown_check(user)) - user << "You prime \the [name]!" + user << "You prime \the [name]!" log_attack("[user.name] ([user.ckey]) primed \a [src].") log_admin("ATTACK: [user] ([user.ckey]) primed \a [src].") @@ -128,7 +128,7 @@ /obj/item/weapon/grenade/chem_grenade/examine(mob/user) ..() if(detonator) - user << "With attached [detonator.name]" + user << "With an attached [detonator.name]" /obj/item/weapon/grenade/chem_grenade/activate(mob/user as mob) if(active) return @@ -280,7 +280,7 @@ obj/item/weapon/grenade/chem_grenade/exgrenade/attackby(obj/item/weapon/W as obj stage = 2 else if(stage == 2) if(active && prob(95)) - user << " You trigger the assembly!" + user << " You trigger the assembly!" prime() return else diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index 39c3fa5d0e4..677c76bc585 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -89,4 +89,4 @@ /obj/item/weapon/grenade/iedcasing/examine(mob/user) ..() if(assembled == 3) - user << "You can't tell when it will explode!" //Stops you from checking the time to detonation unlike regular grenades \ No newline at end of file + user << "You can't tell when it will explode!" //Stops you from checking the time to detonation unlike regular grenades \ No newline at end of file diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 20e31967580..d3029569ceb 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -46,15 +46,15 @@ /obj/item/weapon/grenade/examine(mob/user) ..() if(det_time > 1) - user << "The timer is set to [det_time/10] seconds." + user << "The timer is set to [det_time/10] seconds." return - user << "\The [src] is set for instant detonation." + user << "\The [src] is set for instant detonation." /obj/item/weapon/grenade/attack_self(mob/user as mob) if(!active) if(clown_check(user)) - user << "You prime \the [name]! [det_time/10] seconds!" + user << "You prime \the [name]! [det_time/10] seconds!" activate(user) add_fingerprint(user) diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index dca95f4b9ff..c11a4c99acc 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -27,11 +27,11 @@ /obj/item/weapon/storage/fancy/examine(mob/user) ..() if(contents.len <= 0) - user << "There are no [src.icon_type]s left in the box." + user << "There are no [src.icon_type]s left in the box." else if(contents.len == 1) - user << "There is one [src.icon_type] left in the box." + user << "There is one [src.icon_type] left in the box." else - user << "There are [src.contents.len] [src.icon_type]s in the box." + user << "There are [src.contents.len] [src.icon_type]s in the box." /* diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index c28a99e1fce..1b606c0b538 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -167,7 +167,6 @@ /obj/item/weapon/storage/lockbox/unlockable/examine(mob/user) ..() user << tracked_access - return 1 /obj/item/weapon/storage/lockbox/unlockable/attackby(obj/O as obj, mob/user as mob) if (istype(O, /obj/item/weapon/card/id)) diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 2150643a738..8c0e8d10c6f 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -29,7 +29,7 @@ /obj/item/weapon/storage/secure/examine(mob/user) ..() - user << text("The service panel is [src.open ? "open" : "closed"].") + user << "The service panel is [src.open ? "open" : "closed"]." /obj/item/weapon/storage/secure/attackby(obj/item/weapon/W as obj, mob/user as mob) if(locked) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 8ed700ed053..12c6b5521b0 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -55,7 +55,7 @@ /obj/item/weapon/melee/baton/examine(mob/user) ..() if(bcell) - user <<"The baton is [round(bcell.percent())]% charged." + user <<"The baton is [round(bcell.percent())]% charged." if(!bcell) user <<"The baton does not have a power source installed." @@ -121,7 +121,7 @@ playsound(loc, "swing_hit", 50, 1, -1) else if(!status) - L.visible_message("[L] has been prodded with the [src] by [user]. Luckily it was off.") + L.visible_message("[L] has been prodded with the [src] by [user]. Luckily it was off.") return if(status) diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index c1975775698..a69bb8d3d91 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -13,13 +13,6 @@ var/volume_rate = 500 //Needed for borg jetpack transfer action_button_name = "Toggle Jetpack" -/obj/item/weapon/tank/jetpack/examine(mob/user) - ..() - if(air_contents.oxygen < 10) - user << text("The meter on the [src.name] indicates you are almost out of air!") - playsound(user, 'sound/effects/alert.ogg', 50, 1) - - /obj/item/weapon/tank/jetpack/verb/toggle_rockets() set name = "Toggle Jetpack Stabilization" set category = "Object" @@ -93,12 +86,6 @@ icon_state = "jetpack-red" item_state = "jetpack-red" -/obj/item/weapon/tank/jetpack/nitrogen/examine(mob/user) - ..() - if(air_contents.nitrogen < 10) - user << text("The meter on the [src.name] indicates you are almost out of nitrogen!") - playsound(user, 'sound/effects/alert.ogg', 50, 1) - /obj/item/weapon/tank/jetpack/nitrogen/New() . = ..() air_contents.adjust(, , (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) @@ -110,12 +97,6 @@ icon_state = "jetpack-black" item_state = "jetpack-black" -/obj/item/weapon/tank/jetpack/carbondioxide/examine(mob/user) - ..() - if(air_contents.carbon_dioxide < 10) - user << text("The meter on the [src.name] indicates you are almost out of air!") - playsound(user, 'sound/effects/alert.ogg', 50, 1) - /obj/item/weapon/tank/jetpack/carbondioxide/New() . = ..() air_contents.adjust(, (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 27bee4f9a04..678045cd89d 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -16,12 +16,6 @@ icon_state = "oxygen" distribute_pressure = ONE_ATMOSPHERE*O2STANDARD -/obj/item/weapon/tank/oxygen/examine(mob/user) - ..() - if(air_contents.oxygen < 10) - user << text("The meter on the [src.name] indicates you are almost out of air!") - playsound(user, 'sound/effects/alert.ogg', 50, 1) - /obj/item/weapon/tank/oxygen/New() . = ..() air_contents.adjust((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) @@ -57,13 +51,6 @@ desc = "Mixed anyone?" icon_state = "oxygen" - -/obj/item/weapon/tank/air/examine(mob/user) - ..() - if(air_contents.oxygen < 1 && loc==usr) - user << "The meter on the [src.name] indicates you are almost out of air!" - user << sound('sound/effects/alert.ogg') - /obj/item/weapon/tank/air/New() . = ..() air_contents.adjust((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * O2STANDARD, , (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * N2STANDARD) @@ -98,12 +85,6 @@ desc = "The lifeblood of plasmamen. Warning: Extremely flammable, do not inhale (unless you're a plasman)." icon_state = "plasma_fr" -/obj/item/weapon/tank/plasma/plasmaman/examine(mob/user) - ..() - if(air_contents.toxins < 0.2 && loc==usr) - user << text("The meter on the [src.name] indicates you are almost out of plasma!") - user << sound('sound/effects/alert.ogg') - /* * Emergency Oxygen */ @@ -118,12 +99,6 @@ distribute_pressure = ONE_ATMOSPHERE*O2STANDARD volume = 2 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011) -/obj/item/weapon/tank/emergency_oxygen/examine(mob/user) - ..() - if(air_contents.oxygen < 0.2 && loc==usr) - user << text("The meter on the [src.name] indicates you are almost out of air!") - user << sound('sound/effects/alert.ogg') - /obj/item/weapon/tank/emergency_oxygen/New() . = ..() air_contents.adjust((3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) @@ -162,9 +137,3 @@ /obj/item/weapon/tank/nitrogen/New() . = ..() air_contents.adjust(, , (3 * ONE_ATMOSPHERE) * 70 / (R_IDEAL_GAS_EQUATION * T20C)) - -/obj/item/weapon/tank/nitrogen/examine(mob/user) - ..() - if(air_contents.nitrogen < 10) - user << text("The meter on the [src.name] indicates you are almost out of air!") - playsound(user, 'sound/effects/alert.ogg', 50, 1) \ No newline at end of file diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 2b06164c075..f0d02039815 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -64,9 +64,11 @@ else descriptive = "furiously hot" - user << "\The \icon[icon][src] feels [descriptive]" + user << "\The \icon[icon][src] feels [descriptive]" - return + if(air_contents.volume * 10 < volume) + user << "The meter on the [src.name] indicates you are almost out of gas!" + playsound(user, 'sound/effects/alert.ogg', 50, 1) /obj/item/weapon/tank/blob_act() if(prob(50)) @@ -87,9 +89,7 @@ icon = src.loc if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1) - for (var/mob/O in viewers(user, null)) - O << "[user] has used [W] on \icon[icon] [src]" - + user.visible_message("[user] has used [W] on \icon[icon] [src]", "You use \the [W] on \icon[icon] [src]") var/pressure = air_contents.return_pressure() manipulated_by = user.real_name //This person is aware of the contents of the tank. var/total_moles = air_contents.total_moles() diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 0e4f5c2f8f7..5cd557abc78 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -522,12 +522,12 @@ if(S.brute_dam) S.heal_damage(15,0,0,1) if(user != M) - user.visible_message("\The [user] patches some dents on \the [M]'s [S.display_name] with \the [src]",\ - "You patch some dents on \the [M]'s [S.display_name]",\ + user.visible_message("\The [user] patches some dents on \the [M]'s [S.display_name] with \the [src]",\ + "You patch some dents on \the [M]'s [S.display_name]",\ "You hear a welder.") else - user.visible_message("\The [user] patches some dents on their [S.display_name] with \the [src]",\ - "You patch some dents on your [S.display_name]",\ + user.visible_message("\The [user] patches some dents on their [S.display_name] with \the [src]",\ + "You patch some dents on your [S.display_name]",\ "You hear a welder.") else user << "Nothing to fix!" diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 515fd590991..adab58ee566 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -141,11 +141,11 @@ LINEN BINS /obj/structure/bedsheetbin/examine(mob/user) ..() if(amount == 0) - user << "There are no bed sheets in the bin." + user << "There are no bed sheets in the bin." else if(amount == 1) - user << "There is one bed sheet in the bin." + user << "There is one bed sheet in the bin." else - user << "There are [amount] bed sheets in the bin." + user << "There are [amount] bed sheets in the bin." /obj/structure/bedsheetbin/update_icon() diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 46c5a34d68f..8c21f4c6142 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -89,7 +89,7 @@ /obj/structure/displaycase/examine(mob/user) ..() - var/msg = "Peering through the glass, you see that it contains:" + var/msg = "Peering through the glass, you see that it contains:" if(occupant) msg+= "\icon[occupant] \A [occupant]" else diff --git a/code/game/objects/structures/vehicles/clowncart.dm b/code/game/objects/structures/vehicles/clowncart.dm index e86b1cb90e8..1077d65202d 100644 --- a/code/game/objects/structures/vehicles/clowncart.dm +++ b/code/game/objects/structures/vehicles/clowncart.dm @@ -47,7 +47,7 @@ var/tmp/difference = reagents.total_volume - reagents.get_reagent_amount("banana") user << "This [nick] contains [reagents.get_reagent_amount("banana")] unit\s of banana juice[(difference != 0 ? ", and [difference] unit\s of something else!" : "!")]" //yeah if(max_health > 100) - user << "It is reinforced with [(max_health-100)/20] bananium sheets." + user << "It is reinforced with [(max_health-100)/20] bananium sheets." switch(health) if(max_health*0.5 to max_health) user << "It appears slightly dented." diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index f9eafb071b8..10f0f3ca5b7 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -28,7 +28,7 @@ /obj/structure/window/examine(mob/user) ..() if(!anchored) - user << "\the [src] appears to be loose." + user << "\the [src] appears to be loose." /obj/structure/window/bullet_act(var/obj/item/projectile/Proj) health -= Proj.damage diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 7e6e34f2068..98c95c87e8b 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -107,12 +107,12 @@ user.delayNextAttack(8) if ((M_HULK in user.mutations)) if (prob(hardness)) - usr << text("\blue You smash through the wall.") + usr << text("You smash through the wall.") usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) dismantle_wall(1) return else - usr << text("\blue You punch the wall.") + usr << text("You punch the wall.") return return src.attack_hand(user) @@ -123,11 +123,11 @@ if(istype(src, /turf/simulated/wall/r_wall)) if(M.environment_smash == 3) dismantle_wall(1) - M << "You smash through the wall." + M << "You smash through the wall." else M << "This wall is far too strong for you to destroy." else - M << "You smash through the wall." + M << "You smash through the wall." dismantle_wall(1) return @@ -135,12 +135,12 @@ user.delayNextAttack(8) if (M_HULK in user.mutations) if (prob(hardness) || rotting) - usr << text("\blue You smash through the wall.") + usr << text("You smash through the wall.") usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) dismantle_wall(1) return else - usr << text("\blue You punch the wall.") + usr << text("You punch the wall.") return if(rotting) diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index be5ffa32535..ee088ee8453 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -139,9 +139,9 @@ /obj/item/device/assembly/examine(mob/user) ..() if(secured) - user << "\The [src] is ready!" + user << "\The [src] is ready!" else - user << "\The [src] can be attached!" + user << "\The [src] can be attached!" /obj/item/device/assembly/attack_self(mob/user as mob) if(!user) return 0 diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index c20d788b4bc..d6ce893cd5a 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -94,9 +94,9 @@ /obj/item/device/assembly_holder/examine(mob/user) ..() if (secured) - user << "\The [src] is ready!" + user << "\The [src] is ready!" else - user << "\The [src] can be attached!" + user << "\The [src] can be attached!" /obj/item/device/assembly_holder/HasProximity(atom/movable/AM as mob|obj) diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 51902cabfe2..0e1a0995d75 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -11,7 +11,7 @@ /obj/item/device/assembly/mousetrap/examine(mob/user) ..() if(armed) - user << "It looks like it's armed." + user << "It looks like it's armed." /obj/item/device/assembly/mousetrap/update_icon() if(armed) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index f02c512d259..83648c2704d 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -286,17 +286,19 @@ BLIND // can't see anything /obj/item/clothing/under/examine(mob/user) ..() + var/mode switch(src.sensor_mode) if(0) - user << "Its sensors appear to be disabled." + mode = "Its sensors appear to be disabled." if(1) - user << "Its binary life sensors appear to be enabled." + mode = "Its binary life sensors appear to be enabled." if(2) - user << "Its vital tracker appears to be enabled." + mode = "Its vital tracker appears to be enabled." if(3) - user << "Its vital tracker and tracking beacon appear to be enabled." + mode = "Its vital tracker and tracking beacon appear to be enabled." + user << "" + mode + "" if(hastie) - user << "\A [hastie] is clipped to it." + user << "\A [hastie] is clipped to it." /obj/item/clothing/under/proc/set_sensors(mob/usr as mob) var/mob/M = usr diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 9cf82b9ad15..f6f7ce6c1ce 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -37,26 +37,26 @@ var/state = "disabled" if(src.flags&NOSLIP) state = "enabled" - user << "Its mag-pulse traction system appears to be [state]." + user << "Its mag-pulse traction system appears to be [state]." /obj/item/clothing/shoes/magboots/elite desc = "Advanced magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle." name = "advanced magboots" icon_state = "CE-magboots0" - toggle() - if(usr.stat) - return - if(src.magpulse) - src.flags &= ~NOSLIP - src.slowdown = SHOES_SLOWDOWN - src.magpulse = 0 - icon_state = "CE-magboots0" - usr << "You disable the mag-pulse traction system." - else - src.flags |= NOSLIP - src.slowdown = 1 - src.magpulse = 1 - icon_state = "CE-magboots1" - usr << "You enable the mag-pulse traction system." - usr.update_inv_shoes() //so our mob-overlays update \ No newline at end of file +/obj/item/clothing/shoes/magboots/elite/toggle() + if(usr.stat) + return + if(src.magpulse) + src.flags &= ~NOSLIP + src.slowdown = SHOES_SLOWDOWN + src.magpulse = 0 + icon_state = "CE-magboots0" + usr << "You disable the mag-pulse traction system." + else + src.flags |= NOSLIP + src.slowdown = 1 + src.magpulse = 1 + icon_state = "CE-magboots1" + usr << "You enable the mag-pulse traction system." + usr.update_inv_shoes() //so our mob-overlays update \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm index 55b328f8868..adb7011b78f 100644 --- a/code/modules/clothing/spacesuits/ert.dm +++ b/code/modules/clothing/spacesuits/ert.dm @@ -20,7 +20,7 @@ /obj/item/clothing/head/helmet/space/ert/examine(mob/user) ..() - if(get_dist(usr,src) <= 1) + if(get_dist(user,src) <= 1) user << "This helmet has a built-in camera. It's [camera ? "" : "in"]active." /obj/item/clothing/suit/space/ert diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index 9960c249c05..d1ef0dc94ea 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -21,7 +21,7 @@ /obj/item/clothing/suit/space/plasmaman/examine(mob/user) ..() - user << "There are [extinguishes_left] extinguisher canisters left in this suit." + user << "There are [extinguishes_left] extinguisher canisters left in this suit." /obj/item/clothing/suit/space/plasmaman/proc/Extinguish(var/mob/user) var/mob/living/carbon/human/H=user diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm index ccdf0d72c3c..19a1e8a31b0 100644 --- a/code/modules/clothing/spacesuits/rig.dm +++ b/code/modules/clothing/spacesuits/rig.dm @@ -109,8 +109,8 @@ /obj/item/clothing/head/helmet/space/rig/syndi/examine(mob/user) ..() - if(get_dist(usr,src) <= 1) - user << "This helmet has a built-in camera. It's [camera ? "" : "in"]active." + if(get_dist(user,src) <= 1) + user << "This helmet has a built-in camera. It's [camera ? "" : "in"]active." /obj/item/clothing/suit/space/rig/syndi icon_state = "rig-syndi" diff --git a/code/modules/food/cooking_machines.dm b/code/modules/food/cooking_machines.dm index 9b82380016f..a62afba54fe 100644 --- a/code/modules/food/cooking_machines.dm +++ b/code/modules/food/cooking_machines.dm @@ -100,8 +100,8 @@ var/global/ingredientLimit = 10 /obj/machinery/cooking/examine(mob/user) . = ..() - if(src.active) user << "It's currently processing [src.ingredient ? src.ingredient.name : ""]." - if(src.cooks_in_reagents) user << "It seems to have [reagents.total_volume] units left." + if(src.active) user << "It's currently processing [src.ingredient ? src.ingredient.name : ""]." + if(src.cooks_in_reagents) user << "It seems to have [reagents.total_volume] units left." /obj/machinery/cooking/attack_hand(mob/user) if(istype(user,/mob/dead/observer)) user << "Your ghostly hand goes straight through." diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 2c1400e4a3d..c3f87ecac9c 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -30,10 +30,10 @@ /obj/item/seeds/examine(mob/user) ..() if(seed && !seed.roundstart) - user << "It's tagged as variety #[seed.uid]." + user << "It's tagged as variety #[seed.uid]." else - user << "Plant Yield: [(seed.yield != -1) ? seed.yield : " ERROR"]" - user << "Plant Potency: [(seed.potency != -1) ? seed.potency : "[(seed.yield != -1) ? seed.yield : " ERROR"]" + user << "Plant Potency: [(seed.potency != -1) ? seed.potency : "There is already an ID card within the machine." return var/obj/item/weapon/card/id/I = usr.get_active_hand() if(istype(I)) @@ -134,9 +134,9 @@ var/datum/money_account/acct = get_card_account(inserted_id) if(acct.charge(-credits,null,"Claimed mining credits.",dest_name = "Ore Redemption")) credits = 0 - usr << "\blue Credits transferred." + usr << "Credits transferred." else - usr << "\red Failed to claim credits." + usr << "Failed to claim credits." else if(href_list["choice"] == "insert") var/obj/item/weapon/card/id/I = usr.get_active_hand() if(istype(I)) @@ -144,14 +144,14 @@ I.loc = src inserted_id = I else - usr << "\red No valid ID." + usr << "No valid ID." return 1 else if(href_list["release"] && istype(inserted_id)) if(check_access(inserted_id)) var/release=href_list["release"] var/datum/material/mat = materials.getMaterial(release) if(!mat) - usr << "\red Unable to find material [release]!" + usr << "Unable to find material [release]!" return 1 var/desired = input("How much?","How much [mat.processed_name] to eject?",mat.stored) as num if(desired==0) @@ -262,7 +262,7 @@ usr.drop_item() I.loc = src inserted_id = I - else usr << "\red No valid ID." + else usr << "No valid ID." if(href_list["purchase"]) if(istype(inserted_id)) var/datum/data/mining_equipment/prize = locate(href_list["purchase"]) @@ -352,7 +352,7 @@ /obj/item/weapon/card/mining_point_card/examine(mob/user) ..() - user << "There's [points] credits on the card." + user << "There's [points] credits on the card." /**********************Jaunter**********************/ diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index f572373bcff..677dc8cd224 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -60,7 +60,7 @@ var/const/MAX_ACTIVE_TIME = 400 return switch(stat) if(DEAD,UNCONSCIOUS) - user << "\The [src] is not moving." + user << "\The [src] is not moving." if(CONSCIOUS) user << "\The [src] seems active." if (sterile) diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm index 9ee80683f75..c54626cc44f 100644 --- a/code/modules/mob/living/carbon/brain/brain_item.dm +++ b/code/modules/mob/living/carbon/brain/brain_item.dm @@ -35,15 +35,15 @@ if(H.mind) H.mind.transfer_to(brainmob) - brainmob << "\blue You feel slightly disoriented. That's normal when you're just a brain." + brainmob << "You feel slightly disoriented. That's normal when you're just a brain." callHook("debrain", list(brainmob)) /obj/item/organ/brain/examine(mob/user) ..() if(brainmob && brainmob.client)//if thar be a brain inside... the brain. - user << "You can feel the small spark of life still left in this one." + user << "You can feel the small spark of life still left in this one." else - user << "This one seems particularly lifeless. Perhaps it will regain some of its luster later.." + user << "This one seems particularly lifeless. Perhaps it will regain some of its luster later.." /obj/item/organ/brain/removed(var/mob/living/target,var/mob/living/user) diff --git a/code/modules/paperwork/nano_paper_bin.dm b/code/modules/paperwork/nano_paper_bin.dm index d8a232986a6..04714a7b89c 100644 --- a/code/modules/paperwork/nano_paper_bin.dm +++ b/code/modules/paperwork/nano_paper_bin.dm @@ -64,7 +64,7 @@ /obj/item/weapon/paper_bin/nano/examine(mob/user) ..() if(ressources) - user << "There is [ressources] nano paper left in the dispenser!" + user << "There is [ressources] nano paper left in the dispenser!" else user << "The nano paper dispenser is empty! add more plasteel to refil!" diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index ab486b6f353..c2da3311910 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -51,8 +51,6 @@ ..() //We don't want them to see the dumb "this is a paper" thing every time. //But we don't want to break our new mob verb indiscriminately yet. -// I didn't like the idea that people can read tiny pieces of paper from across the room. -// Now you need to be next to the paper in order to read it. if(in_range(user, src)) var/info_2 = "" if(img) diff --git a/code/modules/paperwork/paper_pack.dm b/code/modules/paperwork/paper_pack.dm index bc7148f6f74..8f0377e2a7d 100644 --- a/code/modules/paperwork/paper_pack.dm +++ b/code/modules/paperwork/paper_pack.dm @@ -64,7 +64,7 @@ /obj/item/weapon/paper_pack/examine(mob/user) ..() if(amount) - user << "There are [amount] sheets in the pack." + user << "There are [amount] sheets in the pack." /obj/item/weapon/paper_pack/verb/ribbontie() set name = "Untie Paper Pack" diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 5f2bf50789a..967b360ac94 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -80,9 +80,9 @@ /obj/item/weapon/paper_bin/examine(mob/user) ..() if(amount) - user << "There " + (amount > 1 ? "are [amount] papers" : "is one paper") + " in the bin." + user << "There " + (amount > 1 ? "are [amount] papers" : "is one paper") + " in the bin." else - user << "There are no papers in the bin." + user << "There are no papers in the bin." /obj/item/weapon/paper_bin/update_icon() diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 9df4b079826..e175de32c96 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -122,7 +122,7 @@ /obj/item/device/camera/examine(mob/user) ..() - user <<"It has [pictures_left] photos left." + user <<"It has [pictures_left] photos left." /obj/item/device/camera/ai_camera //camera AI can take pictures with diff --git a/code/modules/power/antimatter/fuel.dm b/code/modules/power/antimatter/fuel.dm index 74165744c94..f046bce4a0b 100644 --- a/code/modules/power/antimatter/fuel.dm +++ b/code/modules/power/antimatter/fuel.dm @@ -69,7 +69,7 @@ /obj/item/weapon/fuel/examine() ..() - user << "A magnetic storage ring, it contains [fuel]kg of [content ? content : "nothing"]." + user << "A magnetic storage ring, it contains [fuel]kg of [content ? content : "nothing"]." /obj/item/weapon/fuel/proc/injest(mob/M as mob) switch(content) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index b57a63fd113..c995a12e3b5 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -177,6 +177,7 @@ name = "cable coil" icon = 'icons/obj/power.dmi' icon_state = "coil_red" + gender = NEUTER var/amount = MAXCOIL var/max_amount = MAXCOIL _color = "red" diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index fc668e48b03..24c10c85ed5 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -59,7 +59,7 @@ if(crit_fail) user << "This power cell seems to be faulty." else - user << "The charge meter reads [round(src.percent() )]%." + user << "The charge meter reads [round(src.percent() )]%." /obj/item/weapon/cell/attack_self(mob/user as mob) src.add_fingerprint(user) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 5e6336ffa7f..0a47287df04 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -89,13 +89,15 @@ /obj/machinery/light_construct/examine(mob/user) ..() + var/mode switch(src.stage) if(1) - user << "It's an empty frame." + mode = "It's an empty frame." if(2) - user << "It's wired." + mode = "It's wired." if(3) - user << "The casing is closed." + mode = "The casing is closed." + user << "[mode]" /obj/machinery/light_construct/attackby(obj/item/weapon/W as obj, mob/user as mob) src.add_fingerprint(user) @@ -324,14 +326,13 @@ ..() switch(status) if(LIGHT_OK) - user << "[desc] It is turned [on? "on" : "off"]." + user << "[desc] It is turned [on? "on" : "off"]." if(LIGHT_EMPTY) - user << "[desc] The [fitting] has been removed." + user << "[desc] The [fitting] has been removed." if(LIGHT_BURNED) - user << "[desc] The [fitting] is burnt out." + user << "[desc] The [fitting] is burnt out." if(LIGHT_BROKEN) - user << "[desc] The [fitting] has been smashed." - + user << "[desc] The [fitting] has been smashed." // attack with item - insert light (if right type), otherwise try to break the light @@ -479,7 +480,7 @@ return else if (status == LIGHT_OK||status == LIGHT_BURNED) for(var/mob/M in viewers(src)) - M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2) + M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2) broken() return @@ -490,7 +491,7 @@ return else if (status == LIGHT_OK||status == LIGHT_BURNED) for(var/mob/O in viewers(src)) - O.show_message("[M.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2) + O.show_message("[M.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2) broken() return // attack with hand - remove tube/bulb diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 6fbd41d5867..1d44fee4674 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -90,9 +90,9 @@ display round(lastgen) and plasmatank amount /obj/machinery/power/port_gen/examine(mob/user) ..() if(active) - usr << "The generator is on." + usr << "The generator is on." else - usr << "The generator is off." + usr << "The generator is off." /obj/machinery/power/port_gen/pacman name = "P.A.C.M.A.N.-type Portable Generator" diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index a017d47df9e..0bd5ea85522 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -101,7 +101,7 @@ /obj/item/ammo_storage/examine(mob/user) //never change descriptions, always use examine ..() - user << "There are [stored_ammo.len] shell\s left!" + user << "There are [stored_ammo.len] shell\s left!" /obj/item/ammo_storage/attack_self(mob/user) //allows you to remove individual bullets if(stored_ammo.len) diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index d2d7ebce3cb..2868f3b804f 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -201,13 +201,13 @@ /obj/item/weapon/gun/projectile/examine(mob/user) ..() - user << "Has [getAmmo()] round\s remaining." + user << "Has [getAmmo()] round\s remaining." // if(in_chamber && !loaded.len) // usr << "However, it has a chambered round." // if(in_chamber && loaded.len) // usr << "It also has a chambered round." {R} if(istype(silenced, /obj/item/gun_part/silencer)) - user << "It has a supressor attached to the barrel." + user << "It has a supressor attached to the barrel." /obj/item/weapon/gun/projectile/proc/getAmmo() var/bullets = 0 diff --git a/code/modules/projectiles/guns/projectile/pneumatic.dm b/code/modules/projectiles/guns/projectile/pneumatic.dm index 06cce68d67d..6a130505e33 100644 --- a/code/modules/projectiles/guns/projectile/pneumatic.dm +++ b/code/modules/projectiles/guns/projectile/pneumatic.dm @@ -63,11 +63,11 @@ /obj/item/weapon/storage/pneumatic/examine(mob/user) ..() - user << "The valve is dialed to [pressure_setting]%." + user << "The valve is dialed to [pressure_setting]%." if(tank) - user << "The tank dial reads [tank.air_contents.return_pressure()] kPa." + user << "The tank dial reads [tank.air_contents.return_pressure()] kPa." else - user << "Nothing is attached to the tank valve!" + user << "Nothing is attached to the tank valve!" /obj/item/weapon/storage/pneumatic/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag, params) if (istype(target, /obj/item/weapon/storage/backpack )) diff --git a/code/modules/reagents/dartgun.dm b/code/modules/reagents/dartgun.dm index 67ea0702f03..b3c02c2ba18 100644 --- a/code/modules/reagents/dartgun.dm +++ b/code/modules/reagents/dartgun.dm @@ -61,11 +61,11 @@ /obj/item/weapon/gun/dartgun/examine(mob/user) ..() if (beakers.len) - usr << "\blue [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 << "\blue [R.volume] units of [R.name]" + user << "[R.volume] units of [R.name]" /obj/item/weapon/gun/dartgun/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/weapon/dart_cartridge)) @@ -73,34 +73,34 @@ var/obj/item/weapon/dart_cartridge/D = I if(!D.darts) - user << "\blue [D] is empty." + user << "[D] is empty." return 0 if(cartridge) if(cartridge.darts <= 0) src.remove_cartridge() else - user << "\blue There's already a cartridge in [src]." + user << "There's already a cartridge in [src]." return 0 user.drop_item() cartridge = D D.loc = src - user << "\blue You slot [D] into [src]." + user << "You slot [D] into [src]." update_icon() return if(istype(I, /obj/item/weapon/reagent_containers/glass)) if(!istype(I, container_type)) - user << "\blue [I] doesn't seem to fit into [src]." + user << "[I] doesn't seem to fit into [src]." return if(beakers.len >= max_beakers) - user << "\blue [src] already has [max_beakers] vials in it - another one isn't going to fit!" + user << "[src] already has [max_beakers] vials 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 << "\blue You slot [B] into [src]." + user << "You slot [B] into [src]." src.updateUsrDialog() /obj/item/weapon/gun/dartgun/can_fire() @@ -114,7 +114,7 @@ /obj/item/weapon/gun/dartgun/proc/remove_cartridge() if(cartridge) - usr << "\blue You pop the cartridge out of [src]." + usr << "You pop the cartridge out of [src]." var/obj/item/weapon/dart_cartridge/C = cartridge C.loc = get_turf(src) C.update_icon() @@ -144,10 +144,10 @@ var/obj/effect/syringe_gun_dummy/D = new/obj/effect/syringe_gun_dummy(get_turf(src)) var/obj/item/weapon/reagent_containers/syringe/S = get_mixed_syringe() if(!S) - user << "\red There are no darts in [src]!" + user << "There are no darts in [src]!" return if(!S.reagents) - user << "\red There are no reagents available!" + user << "There are no reagents available!" return cartridge.darts-- src.update_icon() @@ -300,7 +300,7 @@ if(cartridge) spawn(0) fire_dart(target,user) else - usr << "\red [src] is empty." + usr << "[src] is empty." /obj/item/weapon/gun/dartgun/vox diff --git a/code/modules/reagents/grenade_launcher.dm b/code/modules/reagents/grenade_launcher.dm index ae9bc2d6af1..a7c26e86549 100644 --- a/code/modules/reagents/grenade_launcher.dm +++ b/code/modules/reagents/grenade_launcher.dm @@ -17,7 +17,7 @@ /obj/item/weapon/gun/grenadelauncher/examine(mob/user) ..() if(!(grenades.len)) - user << "It is empty." + user << "It is empty." return user << "It has [grenades.len] / [max_grenades] grenades loaded." for(var/obj/item/weapon/grenade/G in grenades) diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index efd11bd3d10..afd21c516ab 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -229,18 +229,18 @@ return -/obj/item/weapon/reagent_containers/food/drinks/examine() +/obj/item/weapon/reagent_containers/food/drinks/examine(mob/user) ..() if(!reagents || reagents.total_volume==0) - usr << "\The [src] is empty!" + user << "\The [src] is empty!" else if (reagents.total_volume<=src.volume/4) - usr << "\The [src] is almost empty!" + user << "\The [src] is almost empty!" else if (reagents.total_volume<=src.volume*0.66) - usr << "\The [src] is half full!" + user << "\The [src] is half full!" else if (reagents.total_volume<=src.volume*0.90) - usr << "\The [src] is almost full!" + user << "\The [src] is almost full!" else - usr << "\The [src] is full!" + user << "\The [src] is full!" /obj/item/weapon/reagent_containers/food/drinks/proc/imbibe(mob/user) //drink the liquid within user << "You swallow a gulp of [src]." diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index c5e4d31a69d..e39781e4699 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -126,11 +126,11 @@ if(bitecount == 0) return else if(bitecount == 1) - user << "[src] was bitten by someone!" + user << "[src] was bitten by someone!" else if(bitecount <= 3) - user << "[src] was bitten [bitecount] times!" + user << "[src] was bitten [bitecount] times!" else - user << "[src] was bitten multiple times!" + user << "[src] was bitten multiple times!" /obj/item/weapon/reagent_containers/food/snacks/attackby(obj/item/weapon/W, mob/user) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 6c2c4b66282..422448a4749 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -91,6 +91,6 @@ /obj/item/weapon/reagent_containers/hypospray/autoinjector/examine(mob/user) ..() if(reagents && reagents.reagent_list.len) - usr << "It is currently loaded." + user << "It is currently loaded." else - usr << "\blue It is spent." \ No newline at end of file + user << "It is spent." diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 9f0db22dd62..6918c7d44b7 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -24,9 +24,9 @@ user << "It contains:" if(reagents && reagents.reagent_list.len) for(var/datum/reagent/R in reagents.reagent_list) - user << "[R.volume] units of [R.name]" + user << "[R.volume] units of [R.name]" else - user << "Nothing." + user << "Nothing." /obj/structure/reagent_dispensers/verb/set_APTFT() //set amount_per_transfer_from_this set name = "Set transfer amount" diff --git a/code/modules/research/fabricators.dm b/code/modules/research/fabricators.dm index dae3c33d5f2..6468da9350b 100644 --- a/code/modules/research/fabricators.dm +++ b/code/modules/research/fabricators.dm @@ -49,9 +49,9 @@ /obj/machinery/r_n_d/fabricator/examine(mob/user) ..() if(being_built) - user << "It's building \a [src.being_built]." + user << "It's building \a [src.being_built]." else - user << "Nothing's being built." + user << "Nothing's being built." /obj/machinery/r_n_d/fabricator/RefreshParts() var/T = 0 diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index 1febbca01d2..28507b92366 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -25,7 +25,7 @@ opened = 1 if(istype(W, /obj/item/bluespace_crystal) && opened) if(amplifier) - user << "\red There's something in the booster coil already." + user << "There's something in the booster coil already." return playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) user << " You jam \the [W] into \the [src]'s booster coil." @@ -34,7 +34,7 @@ amplifier=W return if(istype(W, /obj/item/weapon/crowbar) && opened && amplifier) - user << "\blue You carefully pry \the [amplifier] from \the [src]." + user << "You carefully pry \the [amplifier] from \the [src]." var/obj/item/bluespace_crystal/C=amplifier C.loc=get_turf(src) amplifier=null @@ -122,7 +122,7 @@ /obj/item/weapon/rcs/examine(mob/user) ..() - user << "There are [rcharges] charges left." + user << "There are [rcharges] charges left." /obj/item/weapon/rcs/Destroy() processing_objects.Remove(src) diff --git a/code/modules/virus2/items_devices.dm b/code/modules/virus2/items_devices.dm index 93c38077e90..f9e16e53efa 100644 --- a/code/modules/virus2/items_devices.dm +++ b/code/modules/virus2/items_devices.dm @@ -61,7 +61,7 @@ /obj/item/weapon/virusdish/examine(mob/user) ..() if(src.info) - user << "It has the following information about its contents" + user << "It has the following information about its contents" user << src.info ///////////////GNA DISK/////////////// diff --git a/code/stylesheet.dm b/code/stylesheet.dm index 75115baa675..8ee15952bc5 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -55,6 +55,7 @@ h1.alert, h2.alert {color: #000000;} .warning {color: #ff0000; font-style: italic;} .sinister {color: #800080; font-weight: bold; font-style: italic;} /* /vg/ */ .blob {color: #006221; font-weight: bold; font-style: italic;} +.confirm {color: #00af3b;} .rose {color: #ff5050;} .info {color: #0000CC;} .notice {color: #000099;} diff --git a/code/unused/disease2/isolator.dm b/code/unused/disease2/isolator.dm index c372705d0b8..b3c6bb71f2c 100644 --- a/code/unused/disease2/isolator.dm +++ b/code/unused/disease2/isolator.dm @@ -135,5 +135,5 @@ /obj/item/weapon/virusdish/examine(mob/user) ..() if(src.info) - user << "It has the following information about its contents" + user << "It has the following information about its contents" user << src.info diff --git a/code/unused/goonheist/genetics2/geneticsScanner.dm b/code/unused/goonheist/genetics2/geneticsScanner.dm index 7f4890994ba..16e9f686422 100644 --- a/code/unused/goonheist/genetics2/geneticsScanner.dm +++ b/code/unused/goonheist/genetics2/geneticsScanner.dm @@ -99,13 +99,13 @@ var/list/genescanner_addresses = list() examine(mob/user) ..() if (src.occupant) - user << "[src.occupant.name] is inside the scanner." + user << "[src.occupant.name] is inside the scanner." else - user << "There is nobody currently inside the scanner." + user << "There is nobody currently inside the scanner." if (src.locked) - user << "The scanner is currently locked." + user << "The scanner is currently locked." else - user << "The scanner is not currently locked." + user << "The scanner is not currently locked." verb/move_inside() set name = "Enter"