diff --git a/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm b/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm index 8f8a4bfcbf..731a8e1d7a 100644 --- a/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm +++ b/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm @@ -55,7 +55,7 @@ /obj/effect/clockwork/spatial_gateway/examine(mob/user) ..() if(is_servant_of_ratvar(user) || isobserver(user)) - to_chat(user, "It has [uses] uses remaining.") + to_chat(user, "It has [uses] use\s remaining.") /obj/effect/clockwork/spatial_gateway/attack_ghost(mob/user) if(linked_gateway) diff --git a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm index 563e83e9cd..3d2d646143 100644 --- a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm +++ b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm @@ -122,7 +122,7 @@ continue var/datum/clockwork_scripture/quickbind_slot = quickbound[i] to_chat(user, "Quickbind button: [initial(quickbind_slot.name)].") - to_chat(user, "Available Power: [DisplayPower(get_clockwork_power())]") + to_chat(user, "Available power: [DisplayPower(get_clockwork_power())].") //Slab actions; Hierophant, Quickbind /obj/item/clockwork/slab/ui_action_click(mob/user, action) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index a3da1c6cbe..1b760617d0 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -503,7 +503,7 @@ /obj/item/device/cult_shift/examine(mob/user) ..() if(uses) - to_chat(user, "It has [uses] uses remaining.") + to_chat(user, "It has [uses] use\s remaining.") else to_chat(user, "It seems drained.") diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index 461ef78ef3..2df573dc6d 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -16,7 +16,7 @@ to_chat(user, msg) for(var/obj/machinery/nuclearbomb/bomb in GLOB.machines) if(bomb.timing) - to_chat(user, "Extreme danger. Arming signal detected. Time remaining: [bomb.get_time_left()]") + to_chat(user, "Extreme danger. Arming signal detected. Time remaining: [bomb.get_time_left()].") /obj/item/pinpointer/nuke/process() ..() diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 94025dae31..007ef41ac1 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -174,7 +174,7 @@ /obj/machinery/sleeper/emag_act(mob/user) scramble_chem_buttons() - to_chat(user, "You scramble the sleepers user interface!") + to_chat(user, "You scramble the sleeper's user interface!") /obj/machinery/sleeper/proc/inject_chem(chem) if((chem in available_chems) && chem_allowed(chem)) diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 23b398605c..7858480f5c 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -443,14 +443,14 @@ Class Procs: return 0 /obj/machinery/proc/display_parts(mob/user) - to_chat(user, "Following parts detected in the machine:") + to_chat(user, "It contains the following parts:") for(var/obj/item/C in component_parts) - to_chat(user, "[icon2html(C, user)] [C.name]") + to_chat(user, "[icon2html(C, user)] \A [C].") /obj/machinery/examine(mob/user) ..() if(stat & BROKEN) - to_chat(user, "It looks broken and non functional.") + to_chat(user, "It looks broken and non-functional.") if(!(resistance_flags & INDESTRUCTIBLE)) if(resistance_flags & ON_FIRE) to_chat(user, "It's on fire!") diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 63c63ce120..c39c66f6fc 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -27,7 +27,7 @@ ..() to_chat(user, "There's [charging ? "a" : "no"] cell in the charger.") if(charging) - to_chat(user, "Current charge: [round(charging.percent(), 1)]%") + to_chat(user, "Current charge: [round(charging.percent(), 1)]%.") /obj/machinery/cell_charger/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/stock_parts/cell)) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 99f174b94c..c3af2043ad 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -568,24 +568,24 @@ if(panel_open) switch(security_level) if(AIRLOCK_SECURITY_NONE) - to_chat(user, "Wires are exposed!") + to_chat(user, "Its wires are exposed!") if(AIRLOCK_SECURITY_METAL) - to_chat(user, "Wires are hidden behind welded metal cover") + to_chat(user, "Its wires are hidden behind a welded metal cover.") if(AIRLOCK_SECURITY_PLASTEEL_I_S) - to_chat(user, "There is some shredded plasteel inside") + to_chat(user, "There is some shredded plasteel inside.") if(AIRLOCK_SECURITY_PLASTEEL_I) - to_chat(user, "Wires are behind inner layer of plasteel") + to_chat(user, "Its wires are behind an inner layer of plasteel.") if(AIRLOCK_SECURITY_PLASTEEL_O_S) - to_chat(user, "There is some shredded plasteel inside") + to_chat(user, "There is some shredded plasteel inside.") if(AIRLOCK_SECURITY_PLASTEEL_O) - to_chat(user, "There is welded plasteel cover hiding wires") + to_chat(user, "There is a welded plasteel cover hiding its wires.") if(AIRLOCK_SECURITY_PLASTEEL) - to_chat(user, "There is protective grille over panel") + to_chat(user, "There is a protective grille over its panel.") else if(security_level) if(security_level == AIRLOCK_SECURITY_METAL) - to_chat(user, "It looks a bit stronger") + to_chat(user, "It looks a bit stronger.") else - to_chat(user, "It looks very robust") + to_chat(user, "It looks very robust.") /obj/machinery/door/airlock/attack_ai(mob/user) if(!src.canAIControl(user)) @@ -1015,7 +1015,7 @@ if(S.get_amount() < 2) to_chat(user, "You need at least 2 metal sheets to reinforce [src].") return - to_chat(user, "You start reinforcing [src]") + to_chat(user, "You start reinforcing [src].") if(do_after(user, 20, 1, target = src)) if(!panel_open || !S.use(2)) return diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 542989fa15..37500b2589 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -33,14 +33,12 @@ ..() if(!density) to_chat(user, "It is open, but could be pried closed.") + else if(!welded) + to_chat(user, "It is closed, but could be pried open. Deconstruction would require it to be welded shut.") + else if(boltslocked) + to_chat(user, "It is welded shut. The floor bolts have been locked by screws.") else - if(!welded) - to_chat(user, "It is closed, but could be pried open. Deconstruction would require it to be welded shut.") - else - if(boltslocked) - to_chat(user, "It is welded shut. The floor bolt have been locked by screws.") - else - to_chat(user, "The bolt locks have been unscrewed, but the bolts themselves are still wrenched to the floor.") + to_chat(user, "The bolt locks have been unscrewed, but the bolts themselves are still wrenched to the floor.") /obj/machinery/door/firedoor/proc/CalculateAffectingAreas() remove_from_areas() diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm index 5d7be7fbd8..0efe730f22 100644 --- a/code/game/machinery/droneDispenser.dm +++ b/code/game/machinery/droneDispenser.dm @@ -4,9 +4,7 @@ /obj/machinery/droneDispenser //Most customizable machine 2015 name = "drone shell dispenser" - desc = "A hefty machine that, when supplied with metal and glass, \ - will periodically create a drone shell. \ - Does not need to be manually operated." + desc = "A hefty machine that, when supplied with metal and glass, will periodically create a drone shell. Does not need to be manually operated." icon = 'icons/obj/machines/droneDispenser.dmi' icon_state = "on" @@ -46,8 +44,7 @@ var/begin_create_message = "whirs to life!" var/end_create_message = "dispenses a drone shell." var/recharge_message = "pings." - var/recharging_text = "It is whirring and clicking. \ - It seems to be recharging." + var/recharging_text = "It is whirring and clicking. It seems to be recharging." var/break_message = "lets out a tinny alarm before falling dark." var/break_sound = 'sound/machines/warning-buzzer.ogg' @@ -72,18 +69,14 @@ /obj/machinery/droneDispenser/syndrone/badass //Please forgive me name = "badass syndrone shell dispenser" - desc = "A suspicious machine that will create Syndicate \ - exterminator drones when supplied with metal and glass. \ - Disgusting. This one seems ominous." + desc = "A suspicious machine that will create Syndicate exterminator drones when supplied with metal and glass. Disgusting. This one seems ominous." dispense_type = /obj/item/drone_shell/syndrone/badass end_create_message = "dispenses an ominous suspicious drone shell." // I don't need your forgiveness, this is awesome. /obj/machinery/droneDispenser/snowflake name = "snowflake drone shell dispenser" - desc = "A hefty machine that, when supplied with metal and glass, \ - will periodically create a snowflake drone shell. \ - Does not need to be manually operated." + desc = "A hefty machine that, when supplied with metal and glass, will periodically create a snowflake drone shell. Does not need to be manually operated." dispense_type = /obj/item/drone_shell/snowflake end_create_message = "dispenses a snowflake drone shell." // Those holoprojectors aren't cheap @@ -96,8 +89,7 @@ // This one requires no materials and creates basic hivebots /obj/machinery/droneDispenser/hivebot name = "hivebot fabricator" - desc = "A large, bulky machine that whirs with activity, \ - steam hissing from vents in its sides." + desc = "A large, bulky machine that whirs with activity, steam hissing from vents in its sides." icon = 'icons/obj/objects.dmi' icon_state = "hivebot_fab" icon_off = "hivebot_fab" @@ -110,14 +102,13 @@ cooldownTime = 10 //Only 1 second - hivebots are extremely weak dispense_type = /mob/living/simple_animal/hostile/hivebot begin_create_message = "closes and begins fabricating something within." - end_create_message = "slams open, revealing out a hivebot!" + end_create_message = "slams open, revealing a hivebot!" recharge_sound = null recharge_message = null /obj/machinery/droneDispenser/swarmer name = "swarmer fabricator" - desc = "An alien machine of unknown origin. \ - It whirs and hums with green-blue light, the air above it shimmering." + desc = "An alien machine of unknown origin. It whirs and hums with green-blue light, the air above it shimmering." icon = 'icons/obj/machines/gateway.dmi' icon_state = "toffcenter" icon_off = "toffcenter" @@ -129,10 +120,8 @@ cooldownTime = 300 //30 seconds maximum_idle = 0 // Swarmers have no restraint dispense_type = /obj/effect/mob_spawn/swarmer - begin_create_message = "hums softly as an interface appears above it, \ - scrolling by at unreadable speed." - end_create_message = "materializes a strange shell, which drops to the \ - ground." + begin_create_message = "hums softly as an interface appears above it, scrolling by at unreadable speed." + end_create_message = "materializes a strange shell, which drops to the ground." recharging_text = "Its lights are slowly increasing in brightness." work_sound = 'sound/effects/empulse.ogg' create_sound = 'sound/effects/phasein.ogg' @@ -171,8 +160,7 @@ if(maximum_idle && (count_shells() >= maximum_idle)) return // then do nothing; check again next tick if(begin_create_message) - visible_message("\ - [src] [begin_create_message]") + visible_message("[src] [begin_create_message]") if(work_sound) playsound(src, work_sound, 50, 1) mode = DRONE_PRODUCTION @@ -190,8 +178,7 @@ if(create_sound) playsound(src, create_sound, 50, 1) if(end_create_message) - visible_message("[src] \ - [end_create_message]") + visible_message("[src] [end_create_message]") mode = DRONE_RECHARGING timer = world.time + cooldownTime @@ -201,8 +188,7 @@ if(recharge_sound) playsound(src, recharge_sound, 50, 1) if(recharge_message) - visible_message("\ - [src] [recharge_message]") + visible_message("[src] [recharge_message]") mode = DRONE_READY update_icon() @@ -246,10 +232,8 @@ playsound(src, WT.usesound, 50, 1) user.visible_message( - "[user] begins patching up \ - [src] with [WT].", - "You begin restoring the \ - damage to [src]...") + "[user] begins patching up [src] with [WT].", + "You begin restoring the damage to [src]...") if(!do_after(user, 40*O.toolspeed, target = src)) return @@ -270,8 +254,7 @@ if(!(flags_1 & NODECONSTRUCT_1)) if(!(stat & BROKEN)) if(break_message) - audible_message("[src] \ - [break_message]") + audible_message("[src] [break_message]") if(break_sound) playsound(src, break_sound, 50, 1) stat |= BROKEN diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 5d6370188b..83681475fd 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -123,10 +123,37 @@ /obj/machinery/status_display/examine(mob/user) . = ..() switch(mode) - if(1,2,4,5) - to_chat(user, "The display says:
\t[message1]
\t[message2]") - if(mode == 1 && SSshuttle.emergency) - to_chat(user, "Current Shuttle: [SSshuttle.emergency.name]") + if(1,5) // Emergency or generic shuttle + var/obj/docking_port/mobile/shuttle + if(mode == 1) + shuttle = SSshuttle.emergency + else + shuttle = SSshuttle.getShuttle(shuttle_id) + + if (!shuttle) + to_chat(user, "The display says:
\tShuttle?") + else if (shuttle.timer) + to_chat(user, "The display says:
\t[shuttle.getModeStr()]: [shuttle.getTimerStr()]") + if (mode == 1 && shuttle) + to_chat(user, "Current shuttle: [shuttle.name].") + if(4) // Supply shuttle + var/obj/docking_port/mobile/shuttle = SSshuttle.supply + var/shuttleMsg = null + if (shuttle.mode == SHUTTLE_IDLE) + if (shuttle.z in GLOB.station_z_levels) + shuttleMsg = "Docked" + else + shuttleMsg = "[shuttle.getModeStr()]: [shuttle.getTimerStr()]" + if (shuttleMsg) + to_chat(user, "The display says:
\t[shuttleMsg]") + if(2) // Custom message + if (message1 || message2) + var/msg = "The display says:" + if (message1) + msg += "
\t[message1]" + if (message2) + msg += "
\t[message2]" + to_chat(user, msg) /obj/machinery/status_display/proc/set_message(m1, m2) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index f06d355078..4a80d13215 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -276,7 +276,7 @@ if(equipment && equipment.len) to_chat(user, "It's equipped with:") for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment) - to_chat(user, "[icon2html(ME, user)] [ME]") + to_chat(user, "[icon2html(ME, user)] \A [ME].") //processing internal damage, temperature, air regulation, alert updates, lights power use. /obj/mecha/process() diff --git a/code/game/objects/effects/countdown.dm b/code/game/objects/effects/countdown.dm index 76208f54fa..ea5fc3a88f 100644 --- a/code/game/objects/effects/countdown.dm +++ b/code/game/objects/effects/countdown.dm @@ -20,7 +20,7 @@ /obj/effect/countdown/examine(mob/user) . = ..() - to_chat(user, "This countdown is displaying: [displayed_text]") + to_chat(user, "This countdown is displaying: [displayed_text].") /obj/effect/countdown/proc/attach(atom/A) attached_to = A diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm index dfb3567b11..bd01f717da 100644 --- a/code/game/objects/effects/decals/cleanable/humans.dm +++ b/code/game/objects/effects/decals/cleanable/humans.dm @@ -174,7 +174,7 @@ . += "You recognise the footprints as belonging to:\n" for(var/shoe in shoe_types) var/obj/item/clothing/shoes/S = shoe - . += "some [initial(S.name)] [icon2html(initial(S.icon), user)]\n" + . += "[icon2html(initial(S.icon), user)] Some [initial(S.name)].\n" to_chat(user, .) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index d0dc220d4d..a7ebf8251d 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -36,7 +36,8 @@ /obj/item/bodybag/bluespace/examine(mob/user) ..() if(contents.len) - to_chat(user, "You can make out the shapes of [contents.len] objects through the fabric.") + var/s = contents.len == 1 ? "" : "s" + to_chat(user, "You can make out the shape[s] of [contents.len] object[s] through the fabric.") /obj/item/bodybag/bluespace/Destroy() for(var/atom/movable/A in contents) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 882335d5e7..3b24626737 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -549,7 +549,7 @@ /obj/item/toy/crayon/spraycan/examine(mob/user) . = ..() if(charges_left) - to_chat(user, "It has [charges_left] uses left.") + to_chat(user, "It has [charges_left] use\s left.") else to_chat(user, "It is empty.") diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 83d29457f6..ccf5e985c8 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -512,9 +512,9 @@ /obj/item/device/radio/examine(mob/user) ..() if (b_stat) - to_chat(user, "[name] can be attached and modified.") + to_chat(user, "It can be attached and modified.") else - to_chat(user, "[name] can not be modified or attached.") + to_chat(user, "It cannot be modified or attached.") /obj/item/device/radio/attackby(obj/item/W, mob/user, params) add_fingerprint(user) diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index c42322044a..c6c8dbe749 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -68,7 +68,7 @@ /obj/item/extinguisher/examine(mob/user) ..() if(reagents.total_volume) - to_chat(user, "It contains [round(reagents.total_volume)] units.") + to_chat(user, "It contains [round(reagents.total_volume)] unit\s.") to_chat(user, "Alt-click to empty it.") else to_chat(user, "It is empty.") diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm index 0757479868..720aacf619 100644 --- a/code/game/objects/items/flamethrower.dm +++ b/code/game/objects/items/flamethrower.dm @@ -144,7 +144,7 @@ /obj/item/flamethrower/examine(mob/user) ..() if(ptank) - to_chat(user, "\The [src] has \the [ptank] attached. Alt-click to remove it.") + to_chat(user, "\The [src] has \a [ptank] attached. Alt-click to remove it.") /obj/item/flamethrower/proc/toggle_igniter(mob/user) if(!ptank) diff --git a/code/game/objects/items/inducer.dm b/code/game/objects/items/inducer.dm index a0a493530b..d6f789a1b7 100644 --- a/code/game/objects/items/inducer.dm +++ b/code/game/objects/items/inducer.dm @@ -48,15 +48,15 @@ /obj/item/inducer/proc/cantbeused(mob/user) if(!user.IsAdvancedToolUser()) - to_chat(user, "You don't have the dexterity to use \the [src]!") + to_chat(user, "You don't have the dexterity to use [src]!") return TRUE if(!cell) - to_chat(user, "\The [src] doesn't have a power cell installed!") + to_chat(user, "[src] doesn't have a power cell installed!") return TRUE if(!cell.charge) - to_chat(user, "\The [src]'s battery is dead!") + to_chat(user, "[src]'s battery is dead!") return TRUE return FALSE @@ -79,12 +79,12 @@ if(!cell) if(!user.transferItemToLoc(W, src)) return - to_chat(user, "You insert \the [W] into \the [src].") + to_chat(user, "You insert [W] into [src].") cell = W update_icon() return else - to_chat(user, "\The [src] already has \a [cell] installed!") + to_chat(user, "[src] already has \a [cell] installed!") return if(cantbeused(user)) @@ -110,15 +110,17 @@ if(istype(A, /obj)) O = A if(C) + var/done_any = FALSE if(C.charge >= C.maxcharge) - to_chat(user, "\The [A] is fully charged!") + to_chat(user, "[A] is fully charged!") recharging = FALSE return TRUE - user.visible_message("[user] starts recharging \the [A] with \the [src]","You start recharging [A] with \the [src]") + user.visible_message("[user] starts recharging [A] with [src].","You start recharging [A] with [src].") while(C.charge < C.maxcharge) if(E) E.chambered = null // Prevents someone from firing continuously while recharging the gun. if(do_after(user, 10, target = user) && cell.charge) + done_any = TRUE induce(C, coefficient) do_sparks(1, FALSE, A) if(O) @@ -127,7 +129,8 @@ break if(E) E.recharge_newshot() //We're done charging, so we'll let someone fire it now. - user.visible_message("[user] recharged \the [A]!","You recharged \the [A]!") + if(done_any) // Only show a message if we succeeded at least once + user.visible_message("[user] recharged [A]!","You recharged [A]!") recharging = FALSE return TRUE recharging = FALSE @@ -147,7 +150,7 @@ /obj/item/inducer/attack_self(mob/user) if(opened && cell) - user.visible_message("[user] removes \the [cell] from \the [src]!","You remove \the [cell].") + user.visible_message("[user] removes [cell] from [src]!","You remove [cell].") cell.update_icon() user.put_in_hands(cell) cell = null @@ -157,11 +160,11 @@ /obj/item/inducer/examine(mob/living/M) ..() if(cell) - to_chat(M, "It's display shows: [DisplayPower(cell.charge)]") + to_chat(M, "Its display shows: [DisplayPower(cell.charge)].") else - to_chat(M,"It's display is dark.") + to_chat(M,"Its display is dark.") if(opened) - to_chat(M,"It's battery compartment is open.") + to_chat(M,"Its battery compartment is open.") /obj/item/inducer/update_icon() cut_overlays() @@ -174,7 +177,7 @@ /obj/item/inducer/sci icon_state = "inducer-sci" item_state = "inducer-sci" - desc = "A tool for inductively charging internal power cells. This one has a science color scheme, and is less potent than it's engineering counterpart." + desc = "A tool for inductively charging internal power cells. This one has a science color scheme, and is less potent than its engineering counterpart." cell_type = null powertransfer = 500 opened = TRUE diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm index 9400303b84..6e9cbfa35f 100644 --- a/code/game/objects/items/pneumaticCannon.dm +++ b/code/game/objects/items/pneumaticCannon.dm @@ -38,10 +38,10 @@ out += "You'll need to get closer to see any more." return for(var/obj/item/I in loadedItems) - out += "[icon2html(I, user)] It has \the [I] loaded." + out += "[icon2html(I, user)] It has \a [I] loaded." CHECK_TICK if(tank) - out += "[icon2html(tank, user)] It has \the [tank] mounted onto it." + out += "[icon2html(tank, user)] It has \a [tank] mounted onto it." to_chat(user, out.Join("
")) /obj/item/pneumatic_cannon/attackby(obj/item/W, mob/user, params) diff --git a/code/game/objects/items/powerfist.dm b/code/game/objects/items/powerfist.dm index c40ba3c458..f2f0a8b3e5 100644 --- a/code/game/objects/items/powerfist.dm +++ b/code/game/objects/items/powerfist.dm @@ -26,7 +26,7 @@ to_chat(user, "You'll need to get closer to see any more.") return if(tank) - to_chat(user, "[icon2html(tank, user)] It has \the [tank] mounted onto it.") + to_chat(user, "[icon2html(tank, user)] It has \a [tank] mounted onto it.") /obj/item/melee/powerfist/attackby(obj/item/W, mob/user, params) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 85f5de7526..0ed1a7c566 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -840,7 +840,7 @@ if(ishuman(user)) var/mob/living/carbon/human/cardUser = user if(cardUser.is_holding(src)) - cardUser.visible_message("[cardUser] checks [cardUser.p_their()] card.", "The card reads: [cardname]") + cardUser.visible_message("[cardUser] checks [cardUser.p_their()] card.", "The card reads: [cardname].") else to_chat(cardUser, "You need to have the card in your hand to check it!") diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm index 5c36c5a6ba..117695da84 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -144,7 +144,7 @@ /obj/item/roller/robo/examine(mob/user) ..() - to_chat(user, "The dock is [loaded ? "loaded" : "empty"]") + to_chat(user, "The dock is [loaded ? "loaded" : "empty"].") /obj/item/roller/robo/deploy_roller(mob/user, atom/location) if(loaded) diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index bcb6305344..124caa23be 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -75,16 +75,14 @@ radio_connection.post_signal(src, signal) /obj/machinery/meter/proc/status() - var/t = "" if (src.target) var/datum/gas_mixture/environment = target.return_air() if(environment) - t += "The pressure gauge reads [round(environment.return_pressure(), 0.01)] kPa; [round(environment.temperature,0.01)] K ([round(environment.temperature-T0C,0.01)]°C)" + . = "The pressure gauge reads [round(environment.return_pressure(), 0.01)] kPa; [round(environment.temperature,0.01)] K ([round(environment.temperature-T0C,0.01)]°C)." else - t += "The sensor error light is blinking." + . = "The sensor error light is blinking." else - t += "The connect error light is blinking." - return t + . = "The connect error light is blinking." /obj/machinery/meter/examine(mob/user) ..() diff --git a/code/modules/atmospherics/machinery/other/miner.dm b/code/modules/atmospherics/machinery/other/miner.dm index 1db4c5edd3..75e6807fa5 100644 --- a/code/modules/atmospherics/machinery/other/miner.dm +++ b/code/modules/atmospherics/machinery/other/miner.dm @@ -36,7 +36,7 @@ /obj/machinery/atmospherics/miner/examine(mob/user) ..() if(broken) - to_chat(user, "Its debug output is printing \"[broken_message]\"") + to_chat(user, "Its debug output is printing \"[broken_message]\".") /obj/machinery/atmospherics/miner/proc/check_operation() if(!active) diff --git a/code/modules/cargo/export_scanner.dm b/code/modules/cargo/export_scanner.dm index 2a9cd4a891..79f6b9dfaf 100644 --- a/code/modules/cargo/export_scanner.dm +++ b/code/modules/cargo/export_scanner.dm @@ -13,7 +13,7 @@ /obj/item/device/export_scanner/examine(user) ..() if(!cargo_console) - to_chat(user, "The [src] is currently not linked to a cargo console.") + to_chat(user, "[src] is not currently linked to a cargo console.") /obj/item/device/export_scanner/afterattack(obj/O, mob/user, proximity) if(!istype(O) || !proximity) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 2f6b632ae8..02d3b8e094 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -147,7 +147,7 @@ how_cool_are_your_threads += "[src]'s storage opens when clicked.\n" else how_cool_are_your_threads += "[src]'s storage opens when dragged to yourself.\n" - how_cool_are_your_threads += "[src] can store [pockets.storage_slots] item[pockets.storage_slots > 1 ? "s" : ""].\n" + how_cool_are_your_threads += "[src] can store [pockets.storage_slots] item\s.\n" how_cool_are_your_threads += "[src] can store items that are [weightclass2text(pockets.max_w_class)] or smaller.\n" if(pockets.quickdraw) how_cool_are_your_threads += "You can quickly remove an item from [src] using Alt-Click.\n" diff --git a/code/modules/clothing/shoes/bananashoes.dm b/code/modules/clothing/shoes/bananashoes.dm index bf3a1f28e0..561b0c15d7 100644 --- a/code/modules/clothing/shoes/bananashoes.dm +++ b/code/modules/clothing/shoes/bananashoes.dm @@ -34,7 +34,7 @@ /obj/item/clothing/shoes/clown_shoes/banana_shoes/examine(mob/user) ..() - to_chat(user, "The shoes are [on ? "enabled" : "disabled"]") + to_chat(user, "The shoes are [on ? "enabled" : "disabled"].") /obj/item/clothing/shoes/clown_shoes/banana_shoes/ui_action_click(mob/user) GET_COMPONENT(bananium, /datum/component/material_container) diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index b42562e8ff..a3b68dc151 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -16,7 +16,7 @@ /obj/item/clothing/suit/space/eva/plasmaman/examine(mob/user) ..() - to_chat(user, "There are [extinguishes_left] extinguisher charges left in this suit.") + to_chat(user, "There [extinguishes_left == 1 ? "is" : "are"] [extinguishes_left] extinguisher charge\s left in this suit.") /obj/item/clothing/suit/space/eva/plasmaman/proc/Extinguish(mob/living/carbon/human/H) diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index df323a99ff..a9d3d3489d 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -40,7 +40,7 @@ insert ascii eagle on american flag background here /obj/machinery/deepfryer/examine() ..() if(frying) - to_chat(usr, "You can make out [frying] in the oil.") + to_chat(usr, "You can make out \a [frying] in the oil.") /obj/machinery/deepfryer/attackby(obj/item/I, mob/user) if(!reagents.total_volume) diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm index 316b2298ca..141336cf5d 100644 --- a/code/modules/hydroponics/beekeeping/beebox.dm +++ b/code/modules/hydroponics/beekeeping/beebox.dm @@ -136,7 +136,7 @@ to_chat(user, "There [plural? "are" : "is"] [honeycombs.len] uncollected honeycomb[plural ? "s":""] in the apiary.") if(honeycombs.len >= get_max_honeycomb()) - to_chat(user, "there's no room for more honeycomb!") + to_chat(user, "There's no room for more honeycomb!") /obj/structure/beebox/attackby(obj/item/I, mob/user, params) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 4f5f9cbaf7..a0b26718d5 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -313,11 +313,11 @@ else if (plant_health <= (myseed.endurance / 2)) to_chat(user, "It looks unhealthy.") else - to_chat(user, "[src] is empty.") + to_chat(user, "It's empty.") if(!self_sustaining) - to_chat(user, "Water: [waterlevel]/[maxwater]") - to_chat(user, "Nutrient: [nutrilevel]/[maxnutri]") + to_chat(user, "Water: [waterlevel]/[maxwater].") + to_chat(user, "Nutrient: [nutrilevel]/[maxnutri].") if(self_sufficiency_progress > 0) var/percent_progress = round(self_sufficiency_progress * 100 / self_sufficiency_req) to_chat(user, "Treatment for self-sustenance are [percent_progress]% complete.") @@ -325,9 +325,9 @@ to_chat(user, "It doesn't require any water or nutrients.") if(weedlevel >= 5) - to_chat(user, "[src] is filled with weeds!") + to_chat(user, "It's filled with weeds!") if(pestlevel >= 5) - to_chat(user, "[src] is filled with tiny worms!") + to_chat(user, "It's filled with tiny worms!") to_chat(user, "" ) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index c02737a2fd..20e292eaa2 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -36,7 +36,7 @@ to_chat(user, "Does 80 damage if the target is backstabbed, instead of 50.") for(var/t in trophies) var/obj/item/crusher_trophy/T = t - to_chat(user, "It has \a [T] attached, which cause [T.effect_desc()].") + to_chat(user, "It has \a [T] attached, which causes [T.effect_desc()].") /obj/item/twohanded/required/kinetic_crusher/attackby(obj/item/A, mob/living/user) if(istype(A, /obj/item/crowbar)) @@ -220,7 +220,7 @@ bonus_value = 8 /obj/item/crusher_trophy/watcher_wing/effect_desc() - return "mark detonation to prevent certain creatures from using certain attacks for [bonus_value*0.1] second[bonus_value*0.1 == 1 ? "":"s"]" + return "mark detonation to prevent certain creatures from using certain attacks for [bonus_value*0.1] second\s" /obj/item/crusher_trophy/watcher_wing/on_mark_detonation(mob/living/target, mob/living/user) if(ishostile(target)) @@ -265,7 +265,7 @@ bonus_value = 3 /obj/item/crusher_trophy/legion_skull/effect_desc() - return "a kinetic crusher to recharge [bonus_value*0.1] second[bonus_value*0.1 == 1 ? "":"s"] faster" + return "a kinetic crusher to recharge [bonus_value*0.1] second\s faster" /obj/item/crusher_trophy/legion_skull/add_to(obj/item/twohanded/required/kinetic_crusher/H, mob/living/user) . = ..() diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm index d76278a410..ecbd8a4135 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -14,7 +14,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) /obj/item/extraction_pack/examine() . = ..() - usr.show_message("It has [uses_left] uses remaining.", 1) + usr.show_message("It has [uses_left] use\s remaining.", 1) /obj/item/extraction_pack/attack_self(mob/user) var/list/possible_beacons = list() diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 941f459c01..16e09b59c8 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -125,7 +125,7 @@ /mob/living/simple_animal/parrot/examine(mob/user) ..() if(stat) - to_chat(user, pick("This parrot is no more", "This is a late parrot", "This is an ex-parrot")) + to_chat(user, pick("This parrot is no more.", "This is a late parrot.", "This is an ex-parrot.")) /mob/living/simple_animal/parrot/death(gibbed) if(held_item) diff --git a/code/modules/modular_computers/hardware/ai_slot.dm b/code/modules/modular_computers/hardware/ai_slot.dm index b36780d6e7..edd78839c3 100644 --- a/code/modules/modular_computers/hardware/ai_slot.dm +++ b/code/modules/modular_computers/hardware/ai_slot.dm @@ -14,7 +14,7 @@ /obj/item/computer_hardware/ai_slot/examine(mob/user) ..() if(stored_card) - to_chat(user, "There appears to be an intelliCard loaded. There appears to be a pinhole protecting a manual eject button. A screwdriver could probably press it") + to_chat(user, "There appears to be an intelliCard loaded. There appears to be a pinhole protecting a manual eject button. A screwdriver could probably press it.") /obj/item/computer_hardware/ai_slot/on_install(obj/item/device/modular_computer/M, mob/living/user = null) M.add_verb(device_type) diff --git a/code/modules/modular_computers/hardware/printer.dm b/code/modules/modular_computers/hardware/printer.dm index 699ba1587a..27eb050655 100644 --- a/code/modules/modular_computers/hardware/printer.dm +++ b/code/modules/modular_computers/hardware/printer.dm @@ -11,11 +11,11 @@ /obj/item/computer_hardware/printer/diagnostics(mob/living/user) ..() - to_chat(user, "Paper level: [stored_paper]/[max_paper]") + to_chat(user, "Paper level: [stored_paper]/[max_paper].") /obj/item/computer_hardware/printer/examine(mob/user) ..() - to_chat(user, "Paper level: [stored_paper]/[max_paper]") + to_chat(user, "Paper level: [stored_paper]/[max_paper].") /obj/item/computer_hardware/printer/proc/print_text(var/text_to_print, var/paper_title = "") diff --git a/code/modules/ninja/suit/gloves.dm b/code/modules/ninja/suit/gloves.dm index 8eaaa40097..54ed7b4983 100644 --- a/code/modules/ninja/suit/gloves.dm +++ b/code/modules/ninja/suit/gloves.dm @@ -78,4 +78,4 @@ /obj/item/clothing/gloves/space_ninja/examine(mob/user) ..() if(flags_1 & NODROP_1) - to_chat(user, "The energy drain mechanism is: [candrain?"active":"inactive"].") + to_chat(user, "The energy drain mechanism is [candrain?"active":"inactive"].") diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 1cb8295df3..2693b5e5cf 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -185,7 +185,7 @@ /obj/item/device/camera/examine(mob/user) ..() - to_chat(user, "It has [pictures_left] photos left.") + to_chat(user, "It has [pictures_left] photo\s left.") /obj/item/device/camera/proc/camera_get_icon(list/turfs, turf/center) diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index 54d27d04c0..e1c80913e9 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -40,11 +40,11 @@ switch(construction_state) if(PA_CONSTRUCTION_UNSECURED) - to_chat(user, "Looks like it's not attached to the flooring") + to_chat(user, "Looks like it's not attached to the flooring.") if(PA_CONSTRUCTION_UNWIRED) - to_chat(user, "It is missing some cables") + to_chat(user, "It is missing some cables.") if(PA_CONSTRUCTION_PANEL_OPEN) - to_chat(user, "The panel is open") + to_chat(user, "The panel is open.") to_chat(user, "Alt-click to rotate it clockwise.") diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index d0f17c5210..dd98f092ea 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -257,11 +257,11 @@ ..() switch(construction_state) if(PA_CONSTRUCTION_UNSECURED) - to_chat(user, "Looks like it's not attached to the flooring") + to_chat(user, "Looks like it's not attached to the flooring.") if(PA_CONSTRUCTION_UNWIRED) - to_chat(user, "It is missing some cables") + to_chat(user, "It is missing some cables.") if(PA_CONSTRUCTION_PANEL_OPEN) - to_chat(user, "The panel is open") + to_chat(user, "The panel is open.") /obj/machinery/particle_accelerator/control_box/attackby(obj/item/W, mob/user, params) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 564bcd04d8..5933046064 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -87,7 +87,7 @@ /obj/item/gun/examine(mob/user) ..() if(pin) - to_chat(user, "It has [pin] installed.") + to_chat(user, "It has \a [pin] installed.") else to_chat(user, "It doesn't have a firing pin installed, and won't fire.") diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 58ff061e9d..0b6a9f1de7 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -126,7 +126,7 @@ /obj/item/gun/ballistic/examine(mob/user) ..() - to_chat(user, "Has [get_ammo()] round\s remaining.") + to_chat(user, "It has [get_ammo()] round\s remaining.") /obj/item/gun/ballistic/proc/get_ammo(countchambered = 1) var/boolets = 0 //mature var names for mature people diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 96777a050a..c333cbd6f9 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -32,7 +32,7 @@ to_chat(user, "[get_remaining_mod_capacity()]% mod capacity remaining.") for(var/A in get_modkits()) var/obj/item/borg/upgrade/modkit/M = A - to_chat(user, "There is a [M.name] mod installed, using [M.cost]% capacity.") + to_chat(user, "There is \a [M] installed, using [M.cost]% capacity.") /obj/item/gun/energy/kinetic_accelerator/attackby(obj/item/A, mob/user) if(istype(A, /obj/item/crowbar)) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 67d15f7240..1f4dd47734 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -31,7 +31,7 @@ /obj/structure/reagent_dispensers/examine(mob/user) ..() if(reagents.total_volume) - to_chat(user, "It has [reagents.total_volume] units left.") + to_chat(user, "It has [reagents.total_volume] unit\s left.") else to_chat(user, "It's empty.") @@ -146,7 +146,12 @@ /obj/structure/reagent_dispensers/water_cooler/examine(mob/user) ..() - to_chat(user, "There are [paper_cups ? paper_cups : "no"] paper cups left.") + if (paper_cups > 1) + to_chat(user, "There are [paper_cups] paper cups left.") + else if (paper_cups == 1) + to_chat(user, "There is one paper cup left.") + else + to_chat(user, "There are no paper cups left.") /obj/structure/reagent_dispensers/water_cooler/attack_hand(mob/living/user) if(!paper_cups) diff --git a/code/modules/recycling/disposal-structures.dm b/code/modules/recycling/disposal-structures.dm index 2fe36972e0..9b57c41826 100644 --- a/code/modules/recycling/disposal-structures.dm +++ b/code/modules/recycling/disposal-structures.dm @@ -422,7 +422,7 @@ if(sortTypes.len>0) to_chat(user, "It is tagged with the following tags:") for(var/t in sortTypes) - to_chat(user, GLOB.TAGGERLOCATIONS[t]) + to_chat(user, "\t[GLOB.TAGGERLOCATIONS[t]].") else to_chat(user, "It has no sorting tags set.")