diff --git a/code/game/atom/atom_examine.dm b/code/game/atom/atom_examine.dm
index a41a8fc7651..a81f90b2c46 100644
--- a/code/game/atom/atom_examine.dm
+++ b/code/game/atom/atom_examine.dm
@@ -92,14 +92,19 @@
. += FONT_SMALL(SPAN_ALERT("Antagonism"))
. += FONT_SMALL(SPAN_ALERT("- [desc_antag]"))
else
- if(desc_extended || desc_info || (desc_antag && player_is_antag(user.mind))) // Checks if the object has a extended description, a mechanics description, and/or an antagonist description (and if the user is an antagonist).
- . += FONT_SMALL(SPAN_NOTICE("\[?\] This object has additional examine information available. \[Show in Chat\]")) // If any of the above are true, show that the object has more information available.
+ if(desc_extended || desc_info || desc_build || desc_upgrade || (desc_antag && (player_is_antag(user.mind) || isghost(user) || isstoryteller(user)))) // Checks if the object has a extended description, a mechanics description, and/or an antagonist description (and if the user is an antagonist).
+ . += FONT_SMALL(SPAN_NOTICE("\[?\] This object has additional examine information available.")) // If any of the above are true, show that the object has more information available.
if(desc_extended) // If the item has a extended description, show that it is available.
- . += FONT_SMALL("- This object has an extended description.")
+ . += FONT_SMALL("- Extended Description")
if(desc_info) // If the item has a description regarding game mechanics, show that it is available.
- . += FONT_SMALL(SPAN_NOTICE("- This object has additional information about mechanics."))
- if(desc_antag && player_is_antag(user.mind)) // If the item has an antagonist description and the user is an antagonist, show that it is available.
- . += FONT_SMALL(SPAN_ALERT("- This object has additional information for antagonists."))
+ . += FONT_SMALL(SPAN_NOTICE("- Mechanics"))
+ if(desc_build) // If the item has a description regarding game mechanics, show that it is available.
+ . += FONT_SMALL(SPAN_NOTICE("- Assembly/Disassembly"))
+ if(desc_upgrade) // If the item has a description regarding game mechanics, show that it is available.
+ . += FONT_SMALL(SPAN_NOTICE("- Upgrades"))
+ if(desc_antag && (player_is_antag(user.mind) || isghost(user) || isstoryteller(user))) // If the item has an antagonist description and the user is an antagonist, show that it is available.
+ . += FONT_SMALL(SPAN_ALERT("- Antagonist Info"))
+ . += FONT_SMALL(SPAN_NOTICE("\[Show in Chat\]"))
if(ishuman(user))
var/mob/living/carbon/human/H = user
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index ab242cb8d45..1f322d5e2bb 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -373,6 +373,7 @@ Class Procs:
return S
/obj/machinery/proc/RefreshParts()
+ /*
if(parts_power_mgmt)
var/new_idle_power
var/new_active_power
@@ -389,6 +390,7 @@ Class Procs:
change_power_consumption(new_idle_power)
change_power_consumption(new_active_power, POWER_USE_ACTIVE)
+ */
GetPartUpgradeDesc()
/obj/machinery/proc/assign_uid()
@@ -500,6 +502,9 @@ Class Procs:
if(parts_replaced) //only play sound when RPED actually replaces parts
playsound(src, 'sound/items/rped.ogg', 40, TRUE)
return TRUE
+ else
+ to_chat(user, SPAN_NOTICE("The following parts have been detected in \the [src]:"))
+ to_chat(user, counting_english_list(component_parts))
else return FALSE
/obj/machinery/proc/GetPartUpgradeDesc()
diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm
index 5f5843841ee..f6345a8caf2 100644
--- a/code/modules/overmap/ships/computers/sensors.dm
+++ b/code/modules/overmap/ships/computers/sensors.dm
@@ -579,6 +579,9 @@
if(use_power && health == 0)
toggle()
+/obj/machinery/shipsensors/RefreshParts()
+ GetPartUpgradeDesc()
+
// For small shuttles
/obj/machinery/shipsensors/weak
heat_reduction = 1.7 // Can sustain range 4
diff --git a/html/changelogs/Batrachophreno-UpgradePartsFix.yml b/html/changelogs/Batrachophreno-UpgradePartsFix.yml
new file mode 100644
index 00000000000..58a3a2a1ad3
--- /dev/null
+++ b/html/changelogs/Batrachophreno-UpgradePartsFix.yml
@@ -0,0 +1,60 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# - (fixes bugs)
+# wip
+# - (work in progress)
+# qol
+# - (quality of life)
+# soundadd
+# - (adds a sound)
+# sounddel
+# - (removes a sound)
+# rscadd
+# - (adds a feature)
+# rscdel
+# - (removes a feature)
+# imageadd
+# - (adds an image or sprite)
+# imagedel
+# - (removes an image or sprite)
+# spellcheck
+# - (fixes spelling or grammar)
+# experiment
+# - (experimental change)
+# balance
+# - (balance changes)
+# code_imp
+# - (misc internal code change)
+# refactor
+# - (refactors code)
+# config
+# - (makes a change to the config files)
+# admin
+# - (makes changes to administrator tools)
+# server
+# - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Batrachophrenoboocosmomachia
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
+# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - bugfix: "Object examine text for upgrade components now correctly displays as available."
+ - bugfix: "Missing RPED component detection text restored."
+ - rscdel: "Remove component power draw multiplier factor."