mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-19 02:56:14 +01:00
Merge pull request #10993 from MarinaGryphon/issue/logpile
Stack Examine Improvements, Log Examine Fix
This commit is contained in:
@@ -165,6 +165,7 @@ var/list/name_to_material
|
||||
var/flags = 0 // Various status modifiers.
|
||||
var/sheet_singular_name = "sheet"
|
||||
var/sheet_plural_name = "sheets"
|
||||
var/sheet_collective_name = "stack"
|
||||
var/is_fusion_fuel
|
||||
|
||||
// Shards/tables/structures
|
||||
|
||||
@@ -67,10 +67,12 @@
|
||||
|
||||
/datum/material/wood/log
|
||||
name = MAT_LOG
|
||||
display_name = "wood" // will lead to "wood log"
|
||||
icon_base = "log"
|
||||
stack_type = /obj/item/stack/material/log
|
||||
sheet_singular_name = null
|
||||
sheet_plural_name = "pile"
|
||||
sheet_singular_name = "log"
|
||||
sheet_plural_name = "logs"
|
||||
sheet_collective_name = "pile"
|
||||
pass_stack_colors = TRUE
|
||||
supply_conversion_value = 1
|
||||
|
||||
@@ -81,6 +83,7 @@
|
||||
|
||||
/datum/material/wood/log/sif
|
||||
name = MAT_SIFLOG
|
||||
display_name = "alien wood"
|
||||
icon_colour = "#0099cc" // Cyan-ish
|
||||
stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2)
|
||||
stack_type = /obj/item/stack/material/log/sif
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user