cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve extended examination text for many objects (#31381)

Browse Source 
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
This commit is contained in:
Tad Hardesty
2017-10-10 01:06:46 -07:00
committed by CitadelStationBot
parent eb9737912c
commit 01ecdff51a
47 changed files with 143 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm
View File

@@ -55,7 +55,7 @@
/obj/effect/clockwork/spatial_gateway/examine(mob/user)
..()
if(is_servant_of_ratvar(user) || isobserver(user))
to_chat(user, "<span class='brass'>It has [uses] uses remaining.</span>")
to_chat(user, "<span class='brass'>It has [uses] use\s remaining.</span>")
/obj/effect/clockwork/spatial_gateway/attack_ghost(mob/user)
if(linked_gateway)

2
code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
View File

@@ -122,7 +122,7 @@
continue
var/datum/clockwork_scripture/quickbind_slot = quickbound[i]
to_chat(user, "<b>Quickbind</b> button: <span class='[get_component_span(initial(quickbind_slot.primary_component))]'>[initial(quickbind_slot.name)]</span>.")
to_chat(user, "<b>Available Power:</b> <span class='bold brass'>[DisplayPower(get_clockwork_power())]</span>")
to_chat(user, "<b>Available power:</b> <span class='bold brass'>[DisplayPower(get_clockwork_power())].</span>")
//Slab actions; Hierophant, Quickbind
/obj/item/clockwork/slab/ui_action_click(mob/user, action)

2
code/game/gamemodes/cult/cult_items.dm
View File

@@ -503,7 +503,7 @@
/obj/item/device/cult_shift/examine(mob/user)
..()
if(uses)
to_chat(user, "<span class='cult'>It has [uses] uses remaining.</span>")
to_chat(user, "<span class='cult'>It has [uses] use\s remaining.</span>")
else
to_chat(user, "<span class='cult'>It seems drained.</span>")

2
code/game/gamemodes/nuclear/pinpointer.dm
View File

@@ -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()
..()

2
code/game/machinery/Sleeper.dm
View File

@@ -174,7 +174,7 @@
/obj/machinery/sleeper/emag_act(mob/user)
scramble_chem_buttons()
to_chat(user, "<span class='warning'>You scramble the sleepers user interface!</span>")
to_chat(user, "<span class='warning'>You scramble the sleeper's user interface!</span>")
/obj/machinery/sleeper/proc/inject_chem(chem)
if((chem in available_chems) && chem_allowed(chem))

6
code/game/machinery/_machinery.dm
View File

@@ -443,14 +443,14 @@ Class Procs:
return 0
/obj/machinery/proc/display_parts(mob/user)
to_chat(user, "<span class='notice'>Following parts detected in the machine:</span>")
to_chat(user, "<span class='notice'>It contains the following parts:</span>")
for(var/obj/item/C in component_parts)
to_chat(user, "<span class='notice'>[icon2html(C, user)] [C.name]</span>")
to_chat(user, "<span class='notice'>[icon2html(C, user)] \A [C].</span>")
/obj/machinery/examine(mob/user)
..()
if(stat & BROKEN)
to_chat(user, "<span class='notice'>It looks broken and non functional.</span>")
to_chat(user, "<span class='notice'>It looks broken and non-functional.</span>")
if(!(resistance_flags & INDESTRUCTIBLE))
if(resistance_flags & ON_FIRE)
to_chat(user, "<span class='warning'>It's on fire!</span>")

2
code/game/machinery/cell_charger.dm
View File

@@ -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))

20
code/game/machinery/doors/airlock.dm
View File

@@ -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, "<span class='warning'>You need at least 2 metal sheets to reinforce [src].</span>")
return
to_chat(user, "<span class='notice'>You start reinforcing [src]</span>")
to_chat(user, "<span class='notice'>You start reinforcing [src].</span>")
if(do_after(user, 20, 1, target = src))
if(!panel_open || !S.use(2))
return

12
code/game/machinery/doors/firedoor.dm
View File

@@ -33,14 +33,12 @@
..()
if(!density)
to_chat(user, "<span class='notice'>It is open, but could be <b>pried</b> closed.</span>")
else if(!welded)
to_chat(user, "<span class='notice'>It is closed, but could be <i>pried</i> open. Deconstruction would require it to be <b>welded</b> shut.</span>")
else if(boltslocked)
to_chat(user, "<span class='notice'>It is <i>welded</i> shut. The floor bolts have been locked by <b>screws</b>.</span>")
else
if(!welded)
to_chat(user, "<span class='notice'>It is closed, but could be <i>pried</i> open. Deconstruction would require it to be <b>welded</b> shut.</span>")
else
if(boltslocked)
to_chat(user, "<span class='notice'>It is <i>welded</i> shut. The floor bolt have been locked by <b>screws</b>.</span>")
else
to_chat(user, "<span class='notice'>The bolt locks have been <i>unscrewed</i>, but the bolts themselves are still <b>wrenched</b> to the floor.</span>")
to_chat(user, "<span class='notice'>The bolt locks have been <i>unscrewed</i>, but the bolts themselves are still <b>wrenched</b> to the floor.</span>")
/obj/machinery/door/firedoor/proc/CalculateAffectingAreas()
remove_from_areas()

47
code/game/machinery/droneDispenser.dm
View File

@@ -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("<span class='notice'>\
[src] [begin_create_message]</span>")
visible_message("<span class='notice'>[src] [begin_create_message]</span>")
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("<span class='notice'>[src] \
[end_create_message]</span>")
visible_message("<span class='notice'>[src] [end_create_message]</span>")
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("<span class='notice'>\
[src] [recharge_message]</span>")
visible_message("<span class='notice'>[src] [recharge_message]</span>")
mode = DRONE_READY
update_icon()
@@ -246,10 +232,8 @@
playsound(src, WT.usesound, 50, 1)
user.visible_message(
"<span class='notice'>[user] begins patching up \
[src] with [WT].</span>",
"<span class='notice'>You begin restoring the \
damage to [src]...</span>")
"<span class='notice'>[user] begins patching up [src] with [WT].</span>",
"<span class='notice'>You begin restoring the damage to [src]...</span>")
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("<span class='warning'>[src] \
[break_message]</span>")
audible_message("<span class='warning'>[src] [break_message]</span>")
if(break_sound)
playsound(src, break_sound, 50, 1)
stat |= BROKEN

35
code/game/machinery/status_display.dm
View File

@@ -123,10 +123,37 @@
/obj/machinery/status_display/examine(mob/user)
. = ..()
switch(mode)
if(1,2,4,5)
to_chat(user, "The display says:<br>\t<xmp>[message1]</xmp><br>\t<xmp>[message2]</xmp>")
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:<br>\t<xmp>Shuttle?</xmp>")
else if (shuttle.timer)
to_chat(user, "The display says:<br>\t<xmp>[shuttle.getModeStr()]: [shuttle.getTimerStr()]</xmp>")
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:<br>\t<xmp>[shuttleMsg]</xmp>")
if(2) // Custom message
if (message1 || message2)
var/msg = "The display says:"
if (message1)
msg += "<br>\t<xmp>[message1]</xmp>"
if (message2)
msg += "<br>\t<xmp>[message2]</xmp>"
to_chat(user, msg)
/obj/machinery/status_display/proc/set_message(m1, m2)

2
code/game/mecha/mecha.dm
View File

@@ -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()

2
code/game/objects/effects/countdown.dm
View File

@@ -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

2
code/game/objects/effects/decals/cleanable/humans.dm
View File

@@ -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 <B>[initial(S.name)]</B> [icon2html(initial(S.icon), user)]\n"
. += "[icon2html(initial(S.icon), user)] Some <B>[initial(S.name)]</B>.\n"
to_chat(user, .)

3
code/game/objects/items/bodybag.dm
View File

@@ -36,7 +36,8 @@
/obj/item/bodybag/bluespace/examine(mob/user)
..()
if(contents.len)
to_chat(user, "<span class='notice'>You can make out the shapes of [contents.len] objects through the fabric.</span>")
var/s = contents.len == 1 ? "" : "s"
to_chat(user, "<span class='notice'>You can make out the shape[s] of [contents.len] object[s] through the fabric.</span>")
/obj/item/bodybag/bluespace/Destroy()
for(var/atom/movable/A in contents)

2
code/game/objects/items/crayons.dm
View File

@@ -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.")

4
code/game/objects/items/devices/radio/radio.dm
View File

@@ -512,9 +512,9 @@
/obj/item/device/radio/examine(mob/user)
..()
if (b_stat)
to_chat(user, "<span class='notice'>[name] can be attached and modified.</span>")
to_chat(user, "<span class='notice'>It can be attached and modified.</span>")
else
to_chat(user, "<span class='notice'>[name] can not be modified or attached.</span>")
to_chat(user, "<span class='notice'>It cannot be modified or attached.</span>")
/obj/item/device/radio/attackby(obj/item/W, mob/user, params)
add_fingerprint(user)

2
code/game/objects/items/extinguisher.dm
View File

@@ -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, "<span class='notice'>Alt-click to empty it.</span>")
else
to_chat(user, "It is empty.")

2
code/game/objects/items/flamethrower.dm
View File

@@ -144,7 +144,7 @@
/obj/item/flamethrower/examine(mob/user)
..()
if(ptank)
to_chat(user, "<span class='notice'>\The [src] has \the [ptank] attached. Alt-click to remove it.</span>")
to_chat(user, "<span class='notice'>\The [src] has \a [ptank] attached. Alt-click to remove it.</span>")
/obj/item/flamethrower/proc/toggle_igniter(mob/user)
if(!ptank)

29
code/game/objects/items/inducer.dm
View File

@@ -48,15 +48,15 @@
/obj/item/inducer/proc/cantbeused(mob/user)
if(!user.IsAdvancedToolUser())
to_chat(user, "<span class='warning'>You don't have the dexterity to use \the [src]!</span>")
to_chat(user, "<span class='warning'>You don't have the dexterity to use [src]!</span>")
return TRUE
if(!cell)
to_chat(user, "<span class='warning'>\The [src] doesn't have a power cell installed!</span>")
to_chat(user, "<span class='warning'>[src] doesn't have a power cell installed!</span>")
return TRUE
if(!cell.charge)
to_chat(user, "<span class='warning'>\The [src]'s battery is dead!</span>")
to_chat(user, "<span class='warning'>[src]'s battery is dead!</span>")
return TRUE
return FALSE
@@ -79,12 +79,12 @@
if(!cell)
if(!user.transferItemToLoc(W, src))
return
to_chat(user, "<span class='notice'>You insert \the [W] into \the [src].</span>")
to_chat(user, "<span class='notice'>You insert [W] into [src].</span>")
cell = W
update_icon()
return
else
to_chat(user, "<span class='notice'>\The [src] already has \a [cell] installed!</span>")
to_chat(user, "<span class='notice'>[src] already has \a [cell] installed!</span>")
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, "<span class='notice'>\The [A] is fully charged!</span>")
to_chat(user, "<span class='notice'>[A] is fully charged!</span>")
recharging = FALSE
return TRUE
user.visible_message("[user] starts recharging \the [A] with \the [src]","<span class='notice'>You start recharging [A] with \the [src]</span>")
user.visible_message("[user] starts recharging [A] with [src].","<span class='notice'>You start recharging [A] with [src].</span>")
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]!","<span class='notice'>You recharged \the [A]!</span>")
if(done_any) // Only show a message if we succeeded at least once
user.visible_message("[user] recharged [A]!","<span class='notice'>You recharged [A]!</span>")
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]!","<span class='notice'>You remove \the [cell].</span>")
user.visible_message("[user] removes [cell] from [src]!","<span class='notice'>You remove [cell].</span>")
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, "<span class='notice'>It's display shows: [DisplayPower(cell.charge)]</span>")
to_chat(M, "<span class='notice'>Its display shows: [DisplayPower(cell.charge)].</span>")
else
to_chat(M,"<span class='notice'>It's display is dark.</span>")
to_chat(M,"<span class='notice'>Its display is dark.</span>")
if(opened)
to_chat(M,"<span class='notice'>It's battery compartment is open.</span>")
to_chat(M,"<span class='notice'>Its battery compartment is open.</span>")
/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

4
code/game/objects/items/pneumaticCannon.dm
View File

@@ -38,10 +38,10 @@
out += "<span class='notice'>You'll need to get closer to see any more.</span>"
return
for(var/obj/item/I in loadedItems)
out += "<span class='info'>[icon2html(I, user)] It has \the [I] loaded.</span>"
out += "<span class='info'>[icon2html(I, user)] It has \a [I] loaded.</span>"
CHECK_TICK
if(tank)
out += "<span class='notice'>[icon2html(tank, user)] It has \the [tank] mounted onto it.</span>"
out += "<span class='notice'>[icon2html(tank, user)] It has \a [tank] mounted onto it.</span>"
to_chat(user, out.Join("<br>"))
/obj/item/pneumatic_cannon/attackby(obj/item/W, mob/user, params)

2
code/game/objects/items/powerfist.dm
View File

@@ -26,7 +26,7 @@
to_chat(user, "<span class='notice'>You'll need to get closer to see any more.</span>")
return
if(tank)
to_chat(user, "<span class='notice'>[icon2html(tank, user)] It has \the [tank] mounted onto it.</span>")
to_chat(user, "<span class='notice'>[icon2html(tank, user)] It has \a [tank] mounted onto it.</span>")
/obj/item/melee/powerfist/attackby(obj/item/W, mob/user, params)

2
code/game/objects/items/toys.dm
View File

@@ -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.", "<span class='notice'>The card reads: [cardname]</span>")
cardUser.visible_message("[cardUser] checks [cardUser.p_their()] card.", "<span class='notice'>The card reads: [cardname].</span>")
else
to_chat(cardUser, "<span class='warning'>You need to have the card in your hand to check it!</span>")

2
code/game/objects/structures/beds_chairs/bed.dm
View File

@@ -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)

8
code/modules/atmospherics/machinery/other/meter.dm
View File

@@ -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)]&deg;C)"
. = "The pressure gauge reads [round(environment.return_pressure(), 0.01)] kPa; [round(environment.temperature,0.01)] K ([round(environment.temperature-T0C,0.01)]&deg;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)
..()

2
code/modules/atmospherics/machinery/other/miner.dm
View File

@@ -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)

2
code/modules/cargo/export_scanner.dm
View File

@@ -13,7 +13,7 @@
/obj/item/device/export_scanner/examine(user)
..()
if(!cargo_console)
to_chat(user, "<span class='notice'>The [src] is currently not linked to a cargo console.</span>")
to_chat(user, "<span class='notice'>[src] is not currently linked to a cargo console.</span>")
/obj/item/device/export_scanner/afterattack(obj/O, mob/user, proximity)
if(!istype(O) || !proximity)

2
code/modules/clothing/clothing.dm
View File

@@ -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"

2
code/modules/clothing/shoes/bananashoes.dm
View File

@@ -34,7 +34,7 @@
/obj/item/clothing/shoes/clown_shoes/banana_shoes/examine(mob/user)
..()
to_chat(user, "<span class='notice'>The shoes are [on ? "enabled" : "disabled"]</span>")
to_chat(user, "<span class='notice'>The shoes are [on ? "enabled" : "disabled"].</span>")
/obj/item/clothing/shoes/clown_shoes/banana_shoes/ui_action_click(mob/user)
GET_COMPONENT(bananium, /datum/component/material_container)

2
code/modules/clothing/spacesuits/plasmamen.dm
View File

@@ -16,7 +16,7 @@
/obj/item/clothing/suit/space/eva/plasmaman/examine(mob/user)
..()
to_chat(user, "<span class='notice'>There are [extinguishes_left] extinguisher charges left in this suit.</span>")
to_chat(user, "<span class='notice'>There [extinguishes_left == 1 ? "is" : "are"] [extinguishes_left] extinguisher charge\s left in this suit.</span>")
/obj/item/clothing/suit/space/eva/plasmaman/proc/Extinguish(mob/living/carbon/human/H)

2
code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
View File

@@ -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)

2
code/modules/hydroponics/beekeeping/beebox.dm
View File

@@ -136,7 +136,7 @@
to_chat(user, "<span class='notice'>There [plural? "are" : "is"] [honeycombs.len] uncollected honeycomb[plural ? "s":""] in the apiary.</span>")
if(honeycombs.len >= get_max_honeycomb())
to_chat(user, "<span class='warning'>there's no room for more honeycomb!</span>")
to_chat(user, "<span class='warning'>There's no room for more honeycomb!</span>")
/obj/structure/beebox/attackby(obj/item/I, mob/user, params)

10
code/modules/hydroponics/hydroponics.dm
View File

@@ -313,11 +313,11 @@
else if (plant_health <= (myseed.endurance / 2))
to_chat(user, "<span class='warning'>It looks unhealthy.</span>")
else
to_chat(user, "<span class='info'>[src] is empty.</span>")
to_chat(user, "<span class='info'>It's empty.</span>")
if(!self_sustaining)
to_chat(user, "<span class='info'>Water: [waterlevel]/[maxwater]</span>")
to_chat(user, "<span class='info'>Nutrient: [nutrilevel]/[maxnutri]</span>")
to_chat(user, "<span class='info'>Water: [waterlevel]/[maxwater].</span>")
to_chat(user, "<span class='info'>Nutrient: [nutrilevel]/[maxnutri].</span>")
if(self_sufficiency_progress > 0)
var/percent_progress = round(self_sufficiency_progress * 100 / self_sufficiency_req)
to_chat(user, "<span class='info'>Treatment for self-sustenance are [percent_progress]% complete.</span>")
@@ -325,9 +325,9 @@
to_chat(user, "<span class='info'>It doesn't require any water or nutrients.</span>")
if(weedlevel >= 5)
to_chat(user, "<span class='warning'>[src] is filled with weeds!</span>")
to_chat(user, "<span class='warning'>It's filled with weeds!</span>")
if(pestlevel >= 5)
to_chat(user, "<span class='warning'>[src] is filled with tiny worms!</span>")
to_chat(user, "<span class='warning'>It's filled with tiny worms!</span>")
to_chat(user, "" )

6
code/modules/mining/equipment/kinetic_crusher.dm
View File

@@ -36,7 +36,7 @@
to_chat(user, "<span class='notice'>Does <b>80</b> damage if the target is backstabbed, instead of <b>50</b>.</span>")
for(var/t in trophies)
var/obj/item/crusher_trophy/T = t
to_chat(user, "<span class='notice'>It has \a [T] attached, which cause [T.effect_desc()].</span>")
to_chat(user, "<span class='notice'>It has \a [T] attached, which causes [T.effect_desc()].</span>")
/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 <b>[bonus_value*0.1]</b> second[bonus_value*0.1 == 1 ? "":"s"]"
return "mark detonation to prevent certain creatures from using certain attacks for <b>[bonus_value*0.1]</b> 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 <b>[bonus_value*0.1]</b> second[bonus_value*0.1 == 1 ? "":"s"] faster"
return "a kinetic crusher to recharge <b>[bonus_value*0.1]</b> second\s faster"
/obj/item/crusher_trophy/legion_skull/add_to(obj/item/twohanded/required/kinetic_crusher/H, mob/living/user)
. = ..()

2
code/modules/mining/fulton.dm
View File

@@ -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()

2
code/modules/mob/living/simple_animal/parrot.dm
View File

@@ -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)

2
code/modules/modular_computers/hardware/ai_slot.dm
View File

@@ -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)

4
code/modules/modular_computers/hardware/printer.dm
View File

@@ -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, "<span class='notice'>Paper level: [stored_paper]/[max_paper]</span>")
to_chat(user, "<span class='notice'>Paper level: [stored_paper]/[max_paper].</span>")
/obj/item/computer_hardware/printer/proc/print_text(var/text_to_print, var/paper_title = "")

2
code/modules/ninja/suit/gloves.dm
View File

@@ -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: <B>[candrain?"active":"inactive"]</B>.")
to_chat(user, "The energy drain mechanism is <B>[candrain?"active":"inactive"]</B>.")

2
code/modules/paperwork/photography.dm
View File

@@ -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)

6
code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
View File

@@ -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, "<span class='notice'>Alt-click to rotate it clockwise.</span>")

6
code/modules/power/singularity/particle_accelerator/particle_control.dm
View File

@@ -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)

2
code/modules/projectiles/gun.dm
View File

@@ -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.")

2
code/modules/projectiles/guns/ballistic.dm
View File

@@ -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

2
code/modules/projectiles/guns/energy/kinetic_accelerator.dm
View File

@@ -32,7 +32,7 @@
to_chat(user, "<b>[get_remaining_mod_capacity()]%</b> mod capacity remaining.")
for(var/A in get_modkits())
var/obj/item/borg/upgrade/modkit/M = A
to_chat(user, "<span class='notice'>There is a [M.name] mod installed, using <b>[M.cost]%</b> capacity.</span>")
to_chat(user, "<span class='notice'>There is \a [M] installed, using <b>[M.cost]%</b> capacity.</span>")
/obj/item/gun/energy/kinetic_accelerator/attackby(obj/item/A, mob/user)
if(istype(A, /obj/item/crowbar))

9
code/modules/reagents/reagent_dispenser.dm
View File

@@ -31,7 +31,7 @@
/obj/structure/reagent_dispensers/examine(mob/user)
..()
if(reagents.total_volume)
to_chat(user, "<span class='notice'>It has [reagents.total_volume] units left.</span>")
to_chat(user, "<span class='notice'>It has [reagents.total_volume] unit\s left.</span>")
else
to_chat(user, "<span class='danger'>It's empty.</span>")
@@ -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)

2
code/modules/recycling/disposal-structures.dm
View File

@@ -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.")