Merge pull request #2488 from CHOMPStationBot/upstream-merge-10993

[MIRROR] Stack Examine Improvements, Log Examine Fix
This commit is contained in:
Nadyr
2021-07-10 01:47:29 -04:00
committed by GitHub
6 changed files with 39 additions and 7 deletions
+6 -1
View File
@@ -54,13 +54,18 @@
if(amount>1)
name = "[material.use_name] [material.sheet_plural_name]"
desc = "A stack of [material.use_name] [material.sheet_plural_name]."
desc = "A [material.sheet_collective_name] of [material.use_name] [material.sheet_plural_name]."
gender = PLURAL
else
name = "[material.use_name] [material.sheet_singular_name]"
desc = "A [material.sheet_singular_name] of [material.use_name]."
gender = NEUTER
/obj/item/stack/material/get_examine_string()
if(!uses_charge)
return "There [amount == 1 ? "is" : "are"] [amount] [material.sheet_singular_name]\s in the [material.sheet_collective_name]."
return ..()
/obj/item/stack/material/use(var/used)
. = ..()
update_strings()