shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests 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
code/modules/atmospherics/machinery/other/meter.dm
+3 -5
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)]°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)
..()
code/modules/atmospherics/machinery/other/miner.dm
+1 -1
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)
code/modules/cargo/export_scanner.dm
+1 -1
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)
code/modules/clothing/clothing.dm
+1 -1
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"
code/modules/clothing/shoes/bananashoes.dm
+1 -1
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)
code/modules/clothing/spacesuits/plasmamen.dm
+1 -1
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)
code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+1 -1
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)
code/modules/hydroponics/beekeeping/beebox.dm
+1 -1
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)
code/modules/hydroponics/hydroponics.dm
+5 -5
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, "" )
code/modules/mining/equipment/kinetic_crusher.dm
+3 -3
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)
. = ..()
code/modules/mining/fulton.dm
+1 -1
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()
code/modules/mob/living/simple_animal/parrot.dm
+1 -1
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)
code/modules/modular_computers/hardware/ai_slot.dm
+1 -1
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)
code/modules/modular_computers/hardware/printer.dm
+2 -2
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 = "")
code/modules/ninja/suit/gloves.dm
+1 -1
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>.")
code/modules/paperwork/photography.dm
+1 -1
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)
code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+3 -3
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>")
code/modules/power/singularity/particle_accelerator/particle_control.dm
+3 -3
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)
code/modules/projectiles/gun.dm
+1 -1
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.")
code/modules/projectiles/guns/ballistic.dm
+1 -1
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
code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+1 -1
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))
code/modules/reagents/reagent_dispenser.dm
+7 -2
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)
code/modules/recycling/disposal-structures.dm
+1 -1
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.")