Skip to content

Smith Polish: Upgrades - Now in Color! #29208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 17, 2025
Merged

Smith Polish: Upgrades - Now in Color! #29208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
393ab3c
Smith Polish: Upgrades - Now in Color!
PollardTheDragon May 3, 2025
662f004
Merge branch 'master' into smith-material-colors
PollardTheDragon May 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions code/modules/smithing/smith_datums.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@
var/secondary_goal_candidate = FALSE
/// How much is this secondary goal worth?
var/secondary_goal_difficulty
/// What color does the material tint?
var/color_tint = "#ffffff"

/datum/smith_material/metal
name = "metal"
Expand All @@ -101,6 +103,7 @@
durability_mult = MINOR_MATERIAL_BUFF
secondary_goal_candidate = TRUE
secondary_goal_difficulty = SMITH_GOAL_EASY
color_tint = "#78787b"

/datum/smith_material/silver
name = "silver"
Expand All @@ -113,6 +116,7 @@
projectile_damage_multiplier = MINOR_MATERIAL_DEBUFF
secondary_goal_candidate = TRUE
secondary_goal_difficulty = SMITH_GOAL_MEDIUM
color_tint = "#f0f0f0"

/datum/smith_material/gold
name = "gold"
Expand All @@ -129,6 +133,7 @@
durability_mult = MINOR_MATERIAL_DEBUFF
secondary_goal_candidate = TRUE
secondary_goal_difficulty = SMITH_GOAL_MEDIUM
color_tint = "#ffd659"

/datum/smith_material/plasma
name = "plasma"
Expand All @@ -141,6 +146,7 @@
durability_mult = MINOR_MATERIAL_DEBUFF
secondary_goal_candidate = TRUE
secondary_goal_difficulty = SMITH_GOAL_EASY
color_tint = "#ba3692"

/datum/smith_material/titanium
name = "titanium"
Expand All @@ -155,6 +161,7 @@
fire_rate_multiplier = MINOR_MATERIAL_DEBUFF
secondary_goal_candidate = TRUE
secondary_goal_difficulty = SMITH_GOAL_EASY
color_tint = "#c1c9cf"

/datum/smith_material/uranium
name = "uranium"
Expand All @@ -174,6 +181,7 @@
durability_mult = MINOR_MATERIAL_BUFF
secondary_goal_candidate = TRUE
secondary_goal_difficulty = SMITH_GOAL_MEDIUM
color_tint = "#2c8c46"
/// Radioactive, woah
var/radiation_amount = 15

Expand All @@ -186,6 +194,7 @@
tool_failure_mult = MINOR_MATERIAL_DEBUFF
tool_productivity_mult = MAJOR_MATERIAL_BUFF
durability_mult = MAJOR_MATERIAL_BUFF
color_tint = "#aef2f4"

/datum/smith_material/bluespace
name = "bluespace"
Expand All @@ -199,6 +208,7 @@
tool_productivity_mult = MAJOR_MATERIAL_BUFF
power_draw_mult = MAJOR_MATERIAL_BUFF
projectile_damage_multiplier = MAJOR_MATERIAL_BUFF
color_tint = "#2e50b7"

/datum/smith_material/plasteel
name = "plasteel"
Expand All @@ -216,6 +226,7 @@
durability_mult = MAJOR_MATERIAL_BUFF
secondary_goal_candidate = TRUE
secondary_goal_difficulty = SMITH_GOAL_MEDIUM
color_tint = "#555053"

/datum/smith_material/plastitanium
name = "plastitanium"
Expand All @@ -234,6 +245,7 @@
durability_mult = MAJOR_MATERIAL_BUFF
secondary_goal_candidate = TRUE
secondary_goal_difficulty = SMITH_GOAL_HARD
color_tint = "#8a838a"

/datum/smith_material/iridium
name = "iridium"
Expand All @@ -250,6 +262,7 @@
power_draw_mult = MINOR_MATERIAL_BUFF
projectile_damage_multiplier = MINOR_MATERIAL_BUFF
durability_mult = MINOR_MATERIAL_BUFF
color_tint = "#62c3cc"

/datum/smith_material/palladium
name = "palladium"
Expand All @@ -266,6 +279,7 @@
power_draw_mult = MINOR_MATERIAL_DEBUFF
projectile_damage_multiplier = MINOR_MATERIAL_DEBUFF
durability_mult = MINOR_MATERIAL_BUFF
color_tint = "#d36717"

/datum/smith_material/platinum
name = "platinum"
Expand All @@ -282,6 +296,7 @@
projectile_damage_multiplier = MINOR_MATERIAL_BUFF
power_draw_mult = MINOR_MATERIAL_BUFF
durability_mult = MINOR_MATERIAL_BUFF
color_tint = "#c7d3f9"

/datum/smith_material/brass
name = "brass"
Expand All @@ -301,6 +316,7 @@
durability_mult = MINOR_MATERIAL_DEBUFF
secondary_goal_candidate = TRUE
secondary_goal_difficulty = SMITH_GOAL_MEDIUM
color_tint = "#97681b"

#undef MAJOR_MATERIAL_BUFF
#undef MINOR_MATERIAL_BUFF
Expand Down
1 change: 1 addition & 0 deletions code/modules/smithing/smith_item.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
return

/obj/item/smithed_item/proc/set_stats()
color = material.color_tint
if((material == /datum/smith_material/uranium || istype(material, /datum/smith_material/uranium)) && quality)
var/datum/component/inherent_radioactivity/radioactivity = AddComponent(/datum/component/inherent_radioactivity, 100 * quality.stat_mult, 0, 0, 1.5)
START_PROCESSING(SSradiation, radioactivity)
Expand Down