diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 2c3a6fa18b..fc6cac785a 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -29,7 +29,7 @@ if(charging) . += "Current charge: [round(charging.percent(), 1)]%." if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Charge rate at [charge_rate]J per cycle.") + . += "The status display reads: Charge rate at [charge_rate]J per cycle." /obj/machinery/cell_charger/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/stock_parts/cell) && !panel_open) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index ba5c4c9998..711b221c54 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -106,7 +106,7 @@ if(mess) . += "It's filled with blood and viscera. You swear you can see it moving..." if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Speed [speed_coeff*50]%.
Predicted amount of cellular damage: [100-heal_level]%.") + . += "The status display reads: Cloning speed at [speed_coeff*50]%.
Predicted amount of cellular damage: [100-heal_level]%." if(efficiency > 5) to_chat(user, "Pod has been upgraded to support autoprocessing.") if(is_operational() && mob_occupant) diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index 648e9f5e71..cff2e361bd 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -28,11 +28,11 @@ damage_coeff = P.rating /obj/machinery/dna_scannernew/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Radiation pulse accuracy increased by factor [precision_coeff**2].
Radiation pulse damage decreased by factor [damage_coeff**2].") + . += "The status display reads: Radiation pulse accuracy increased by factor [precision_coeff**2].
Radiation pulse damage decreased by factor [damage_coeff**2]." if(scan_level >= 3) - to_chat(user, "Scanner has been upgraded to support autoprocessing.") + . += "Scanner has been upgraded to support autoprocessing." /obj/machinery/dna_scannernew/update_icon() diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 0429db5792..f5bf8c8a1b 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -32,7 +32,7 @@ CalculateAffectingAreas() /obj/machinery/door/firedoor/examine(mob/user) - ..() + . = ..() if(!density) . += "It is open, but could be pried closed." else if(!welded) diff --git a/code/game/machinery/harvester.dm b/code/game/machinery/harvester.dm index 40e898e29c..40430b37b7 100644 --- a/code/game/machinery/harvester.dm +++ b/code/game/machinery/harvester.dm @@ -193,4 +193,4 @@ else if(!harvesting) . += "Alt-click [src] to start harvesting." if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Harvest speed at [interval*0.1] seconds per organ.") + . += "The status display reads: Harvest speed at [interval*0.1] seconds per organ." diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 53a75445c0..f3e446c686 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -144,9 +144,9 @@ GLOBAL_LIST_EMPTY(network_holopads) holo_range = holograph_range /obj/machinery/holopad/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Current projection range: [holo_range] units.") + . += "The status display reads: Current projection range: [holo_range] units." /obj/machinery/holopad/attackby(obj/item/P, mob/user, params) if(default_deconstruction_screwdriver(user, "holopad_open", "holopad0", P)) diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm index 4a51a7b0c5..b4a9584368 100644 --- a/code/game/machinery/launch_pad.dm +++ b/code/game/machinery/launch_pad.dm @@ -24,9 +24,9 @@ range = E /obj/machinery/launchpad/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Maximum range: [range] units.") + . += "The status display reads: Maximum range: [range] units." /obj/machinery/launchpad/attackby(obj/item/I, mob/user, params) if(stationary) diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index 9c2bd0744b..28afea817b 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -159,9 +159,9 @@ prod_coeff = min(1,max(0,T)) // Coeff going 1 -> 0,8 -> 0,6 -> 0,4 /obj/machinery/limbgrower/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Storing up to [reagents.maximum_volume]u of synthflesh.
Synthflesh consumption at [prod_coeff*100]%.") + . += "The status display reads: Storing up to [reagents.maximum_volume]u of synthflesh.
Synthflesh consumption at [prod_coeff*100]%." /obj/machinery/limbgrower/proc/main_win(mob/user) var/dat = "

Limb Grower Menu:


" diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 373fb4df37..2211397f3e 100755 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -24,9 +24,21 @@ recharge_coeff = C.rating /obj/machinery/recharger/examine(mob/user) - ..() - if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Recharging [recharge_coeff*10]% cell charge per cycle.") + . = ..() + if(!in_range(user, src) && !issilicon(user) && !isobserver(user)) + . += "You're too far away to examine [src]'s contents and display!" + return + + if(charging) + . += {"\The [src] contains: + - \A [charging]."} + + if(!(stat & (NOPOWER|BROKEN))) + . += "The status display reads:" + . += "- Recharging [recharge_coeff*10]% cell charge per cycle." + if(charging) + var/obj/item/stock_parts/cell/C = charging.get_cell() + . += "- \The [charging]'s cell is at [C.percent()]%." /obj/machinery/recharger/proc/setCharging(new_charging) charging = new_charging diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 9667386790..374c0c71b9 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -51,9 +51,9 @@ recharge_speed *= C.maxcharge / 10000 /obj/machinery/recharge_station/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Recharging [recharge_speed]J per cycle.") + . += "The status display reads: Recharging [recharge_speed]J per cycle." if(repairs) to_chat(user, "[src] has been upgraded to support automatic repairs.") diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 968ff69e66..6eca52aa0e 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -53,7 +53,7 @@ else . += "There is no power cell installed." if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Temperature range at [settableTemperatureRange]°C.
Heating power at [heatingPower*0.001]kJ.
Power consumption at [(efficiency*-0.0025)+150]%.") //100%, 75%, 50%, 25% + . += "The status display reads: Temperature range at [settableTemperatureRange]°C.
Heating power at [heatingPower*0.001]kJ.
Power consumption at [(efficiency*-0.0025)+150]%." //100%, 75%, 50%, 25% /obj/machinery/space_heater/update_icon() if(on) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 3a52e652d3..3cc71df0f1 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -32,9 +32,9 @@ accuracy = A /obj/machinery/teleport/hub/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Probability of malfunction decreased by [(accuracy*25)-25]%.") + . += "The status display reads: Probability of malfunction decreased by [(accuracy*25)-25]%." /obj/machinery/teleport/hub/proc/link_power_station() if(power_station) @@ -131,13 +131,13 @@ efficiency = E - 1 /obj/machinery/teleport/station/examine(mob/user) - ..() + . = ..() if(!panel_open) - to_chat(user, "The panel is screwed in, obstructing the linking device and wiring panel.") + . += "The panel is screwed in, obstructing the linking device and wiring panel." else - to_chat(user, "The linking device is now able to be scanned with a multitool.
The wiring can be connected to a nearby console and hub with a pair of wirecutters.") + . += "The linking device is now able to be scanned with a multitool.
The wiring can be connected to a nearby console and hub with a pair of wirecutters." if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: This station can be linked to [efficiency] other station(s).") + . += "The status display reads: This station can be linked to [efficiency] other station(s)." /obj/machinery/teleport/station/proc/link_console_and_hub() for(var/direction in GLOB.cardinals) diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index 9903fa00b1..90f037c279 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -37,9 +37,9 @@ max_charge = MC * 25 /obj/machinery/mech_bay_recharge_port/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Base recharge rate at [max_charge]J per cycle.") + . += "The status display reads: Base recharge rate at [max_charge]J per cycle." /obj/machinery/mech_bay_recharge_port/process() if(stat & NOPOWER || !recharge_console) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 2e95894361..98e4eb4258 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -63,10 +63,10 @@ time_coeff = round(initial(time_coeff) - (initial(time_coeff)*(T))/5,0.01) /obj/machinery/mecha_part_fabricator/examine(mob/user) - ..() + . = ..() var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Storing up to [materials.max_amount] material units.
Material consumption at [component_coeff*100]%.
Build time reduced by [100-time_coeff*100]%.") + . += "The status display reads: Storing up to [materials.max_amount] material units.
Material consumption at [component_coeff*100]%.
Build time reduced by [100-time_coeff*100]%." /obj/machinery/mecha_part_fabricator/emag_act() . = ..() diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 51485e4925..1f2f1ddda2 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -57,12 +57,12 @@ return ..() /obj/item/laser_pointer/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) if(!diode) - to_chat(user, "The diode is missing.") + . += "The diode is missing." else - to_chat(user, "A class [diode.rating] laser diode is installed. It is screwed in place.") + . += "A class [diode.rating] laser diode is installed. It is screwed in place." /obj/item/laser_pointer/afterattack(atom/target, mob/living/user, flag, params) . = ..() diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 0eabc652c4..539b5ce57a 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -58,9 +58,9 @@ conduction_coefficient = initial(conduction_coefficient) * C /obj/machinery/atmospherics/components/unary/cryo_cell/examine(mob/user) //this is leaving out everything but efficiency since they follow the same idea of "better matter bin, better results" - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Efficiency at [efficiency*100]%.") + . += "The status display reads: Efficiency at [efficiency*100]%." /obj/machinery/atmospherics/components/unary/cryo_cell/Destroy() QDEL_NULL(radio) 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 253dfcd728..f3b8e466f3 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -71,7 +71,7 @@ God bless America. if(frying) . += "You can make out \a [frying] in the oil." if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Frying at [fry_speed*100]% speed.
Using [oil_use*10] units of oil per second.") + . += "The status display reads: Frying at [fry_speed*100]% speed.
Using [oil_use*10] units of oil per second." /obj/machinery/deepfryer/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/reagent_containers/pill)) diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 1369341d40..4406491f10 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -31,12 +31,12 @@ ignore_clothing = TRUE /obj/machinery/gibber/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Outputting [meat_produced] meat slab(s) after [gibtime*0.1] seconds of processing.") + . += "The status display reads: Outputting [meat_produced] meat slab(s) after [gibtime*0.1] seconds of processing." for(var/obj/item/stock_parts/manipulator/M in component_parts) if(M.rating >= 2) - to_chat(user, "Gibber has been upgraded to process inorganic materials.") + . += "Gibber has been upgraded to process inorganic materials." /obj/machinery/gibber/update_icon() cut_overlays() diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm index 27c0376f63..3d7341308b 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm @@ -24,9 +24,9 @@ required_grind = req_grind /obj/machinery/monkey_recycler/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Producing [cube_production] cube(s) for every [required_grind] monkey(s) inserted.") + . += "The status display reads: Producing [cube_production] cubes for every monkey inserted." /obj/machinery/monkey_recycler/attackby(obj/item/O, mob/user, params) if(default_deconstruction_screwdriver(user, "grinder_open", "grinder", O)) diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index ae16b9cb66..b81c127523 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -22,9 +22,9 @@ rating_speed = M.rating /obj/machinery/processor/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Outputting [rating_amount] item(s) at [rating_speed*100]% speed.") + . += "The status display reads: Outputting [rating_amount] item(s) at [rating_speed*100]% speed." /obj/machinery/processor/proc/process_food(datum/food_processor_process/recipe, atom/movable/what) if (recipe.output && loc && !QDELETED(src)) diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index d259b39b31..7619f68448 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -34,9 +34,9 @@ max_n_of_items = 1500 * B.rating /obj/machinery/smartfridge/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: This unit can hold a maximum of [max_n_of_items] items.") + . += "The status display reads: This unit can hold a maximum of [max_n_of_items] items." /obj/machinery/smartfridge/power_change() ..() diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 3acff55d38..2376010408 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -54,9 +54,9 @@ /obj/machinery/biogenerator/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Productivity at [productivity*100]%.
Matter consumption reduced by [(efficiency*25)-25]%.
Machine can hold up to [max_items] pieces of produce.") + . += "The status display reads: Productivity at [productivity*100]%.
Matter consumption reduced by [(efficiency*25)-25]%.
Machine can hold up to [max_items] pieces of produce." /obj/machinery/biogenerator/on_reagent_change(changetype) //When the reagents change, change the icon as well. update_icon() diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 0d53d5eb76..f122f7cc4a 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -47,9 +47,9 @@ maxnutri = tmp_capacity * 5 // Up to 30 /obj/machinery/hydroponics/constructable/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Tray efficiency at [rating*100]%.") + . += "The status display reads: Tray efficiency at [rating*100]%." /obj/machinery/hydroponics/Destroy() if(myseed) diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm index f4ca3e95c6..617b980654 100644 --- a/code/modules/hydroponics/seed_extractor.dm +++ b/code/modules/hydroponics/seed_extractor.dm @@ -57,9 +57,9 @@ seed_multiplier = M.rating /obj/machinery/seed_extractor/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Extracting [seed_multiplier] seed(s) per piece of produce.
Machine can store up to [max_seeds]% seeds.") + . += "The status display reads: Extracting [seed_multiplier] seed(s) per piece of produce.
Machine can store up to [max_seeds]% seeds." /obj/machinery/seed_extractor/attackby(obj/item/O, mob/user, params) diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index ce219656d7..3a6a98d681 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -104,7 +104,7 @@ if(crit_fail) . += "The generator seems to have broken down." if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Fuel efficiency increased by [(consumption*100)-100]%.") + . += "The status display reads: Fuel efficiency increased by [(consumption*100)-100]%." /obj/machinery/power/port_gen/pacman/HasFuel() if(sheets >= 1 / (time_per_sheet / power_output) - sheet_left) diff --git a/code/modules/power/rtg.dm b/code/modules/power/rtg.dm index 21095944dd..fd97ea52ba 100644 --- a/code/modules/power/rtg.dm +++ b/code/modules/power/rtg.dm @@ -37,9 +37,9 @@ power_gen = initial(power_gen) * part_level /obj/machinery/power/rtg/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Power generation now at [power_gen*0.001]kW.") + . += "The status display reads: Power generation now at [power_gen*0.001]kW." /obj/machinery/power/rtg/attackby(obj/item/I, mob/user, params) if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-open", initial(icon_state), I)) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 7f0e6f23f0..d8b0ede3a2 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -69,9 +69,9 @@ sparks.set_up(1, TRUE, src) /obj/machinery/power/emitter/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Emitting one beam each [fire_delay*0.1] seconds.
Power consumption at [active_power_usage]W.") + . += "The status display reads: Emitting one beam each [fire_delay*0.1] seconds.
Power consumption at [active_power_usage]W." /obj/machinery/power/emitter/ComponentInitialize() . = ..() diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index 8d2b81e48a..e29ffa865e 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -37,9 +37,9 @@ input_power_multiplier = power_multiplier /obj/machinery/power/tesla_coil/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Power generation at [input_power_multiplier*100]%.
Shock interval at [zap_cooldown*0.1] seconds.") + . += "The status display reads: Power generation at [input_power_multiplier*100]%.
Shock interval at [zap_cooldown*0.1] seconds." /obj/machinery/power/tesla_coil/on_construction() if(anchored) diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 8487d72afb..423aaae3f9 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -95,9 +95,9 @@ efficiency = E / 6 /obj/machinery/power/compressor/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Efficiency at [efficiency*100]%.") + . += "The status display reads: Efficiency at [efficiency*100]%." /obj/machinery/power/compressor/attackby(obj/item/I, mob/user, params) if(default_deconstruction_screwdriver(user, initial(icon_state), initial(icon_state), I)) @@ -182,9 +182,9 @@ productivity = P / 6 /obj/machinery/power/turbine/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Productivity at [productivity*100]%.") + . += "The status display reads: Productivity at [productivity*100]%." /obj/machinery/power/turbine/locate_machinery() if(compressor) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 424f2bce30..ce839f33d7 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -113,7 +113,9 @@ if(panel_open) . += "[src]'s maintenance hatch is open!" if(in_range(user, src) || isobserver(user)) - . += "The status display reads:
Recharging [recharge_amount] power units per interval.
Power efficiency increased by [(powerefficiency*1000)-100]%." + . += "The status display reads:\n\ + Recharging [recharge_amount] power units per interval.\n\ + Power efficiency increased by [round((powerefficiency*1000)-100, 1)]%." switch(macrotier) if(1) . += "Macro granularity at 5u." diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index 6d6b21bf74..f4014387c6 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -53,9 +53,9 @@ heater_coefficient *= M.rating /obj/machinery/chem_heater/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Heating reagents at [heater_coefficient*1000]% speed.") + . += "The status display reads: Heating reagents at [heater_coefficient*1000]% speed." /obj/machinery/chem_heater/process() ..() diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index a418fc77a4..681195bcc3 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -82,10 +82,10 @@ for(var/obj/item/stock_parts/micro_laser/M in component_parts) badThingCoeff += M.rating -/obj/machinery/reagentgrinder/examine(mob/user) - ..() +/obj/machinery/rnd/experimentor/examine(mob/user) + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Grinding reagents at [speed*100]%.") + . += "The status display reads: Malfunction probability reduced by [badThingCoeff]%.
Cooldown interval between experiments at [resetTime*0.1] seconds." /obj/machinery/rnd/experimentor/proc/checkCircumstances(obj/item/O) //snowflake check to only take "made" bombs diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index 2fbe2ae7aa..659a83c703 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -77,7 +77,7 @@ . = ..() var/datum/component/remote_materials/materials = GetComponent(/datum/component/remote_materials) if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Storing up to [materials.local_size] material units locally.
Material usage efficiency at [efficiency_coeff*50]%." + . += "The status display reads: Storing up to [materials.local_size] material units locally.
Material usage efficiency at [efficiency_coeff*100]%." //we eject the materials upon deconstruction. /obj/machinery/rnd/production/on_deconstruction() diff --git a/code/modules/research/nanites/nanite_chamber.dm b/code/modules/research/nanites/nanite_chamber.dm index 90ee9ddf9f..515231c24c 100644 --- a/code/modules/research/nanites/nanite_chamber.dm +++ b/code/modules/research/nanites/nanite_chamber.dm @@ -30,9 +30,9 @@ scan_level += P.rating /obj/machinery/nanite_chamber/examine(mob/user) - ..() + . = ..() if(in_range(user, src) || isobserver(user)) - to_chat(user, "The status display reads: Scanning module has been upgraded to level [scan_level].") + . += "The status display reads: Scanning module has been upgraded to level [scan_level]." /obj/machinery/nanite_chamber/proc/set_busy(status, message, working_icon) busy = status