Skip to content

Commit 91a70c3

Browse files
Smith Polish: Upgrades - Now in Color! (#29208)
Signed-off-by: PollardTheDragon <[email protected]>
1 parent c46bc26 commit 91a70c3

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

code/modules/smithing/smith_datums.dm

+16
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@
8888
var/secondary_goal_candidate = FALSE
8989
/// How much is this secondary goal worth?
9090
var/secondary_goal_difficulty
91+
/// What color does the material tint?
92+
var/color_tint = "#ffffff"
9193

9294
/datum/smith_material/metal
9395
name = "metal"
@@ -101,6 +103,7 @@
101103
durability_mult = MINOR_MATERIAL_BUFF
102104
secondary_goal_candidate = TRUE
103105
secondary_goal_difficulty = SMITH_GOAL_EASY
106+
color_tint = "#78787b"
104107

105108
/datum/smith_material/silver
106109
name = "silver"
@@ -113,6 +116,7 @@
113116
projectile_damage_multiplier = MINOR_MATERIAL_DEBUFF
114117
secondary_goal_candidate = TRUE
115118
secondary_goal_difficulty = SMITH_GOAL_MEDIUM
119+
color_tint = "#f0f0f0"
116120

117121
/datum/smith_material/gold
118122
name = "gold"
@@ -129,6 +133,7 @@
129133
durability_mult = MINOR_MATERIAL_DEBUFF
130134
secondary_goal_candidate = TRUE
131135
secondary_goal_difficulty = SMITH_GOAL_MEDIUM
136+
color_tint = "#ffd659"
132137

133138
/datum/smith_material/plasma
134139
name = "plasma"
@@ -141,6 +146,7 @@
141146
durability_mult = MINOR_MATERIAL_DEBUFF
142147
secondary_goal_candidate = TRUE
143148
secondary_goal_difficulty = SMITH_GOAL_EASY
149+
color_tint = "#ba3692"
144150

145151
/datum/smith_material/titanium
146152
name = "titanium"
@@ -155,6 +161,7 @@
155161
fire_rate_multiplier = MINOR_MATERIAL_DEBUFF
156162
secondary_goal_candidate = TRUE
157163
secondary_goal_difficulty = SMITH_GOAL_EASY
164+
color_tint = "#c1c9cf"
158165

159166
/datum/smith_material/uranium
160167
name = "uranium"
@@ -174,6 +181,7 @@
174181
durability_mult = MINOR_MATERIAL_BUFF
175182
secondary_goal_candidate = TRUE
176183
secondary_goal_difficulty = SMITH_GOAL_MEDIUM
184+
color_tint = "#2c8c46"
177185
/// Radioactive, woah
178186
var/radiation_amount = 15
179187

@@ -186,6 +194,7 @@
186194
tool_failure_mult = MINOR_MATERIAL_DEBUFF
187195
tool_productivity_mult = MAJOR_MATERIAL_BUFF
188196
durability_mult = MAJOR_MATERIAL_BUFF
197+
color_tint = "#aef2f4"
189198

190199
/datum/smith_material/bluespace
191200
name = "bluespace"
@@ -199,6 +208,7 @@
199208
tool_productivity_mult = MAJOR_MATERIAL_BUFF
200209
power_draw_mult = MAJOR_MATERIAL_BUFF
201210
projectile_damage_multiplier = MAJOR_MATERIAL_BUFF
211+
color_tint = "#2e50b7"
202212

203213
/datum/smith_material/plasteel
204214
name = "plasteel"
@@ -216,6 +226,7 @@
216226
durability_mult = MAJOR_MATERIAL_BUFF
217227
secondary_goal_candidate = TRUE
218228
secondary_goal_difficulty = SMITH_GOAL_MEDIUM
229+
color_tint = "#555053"
219230

220231
/datum/smith_material/plastitanium
221232
name = "plastitanium"
@@ -234,6 +245,7 @@
234245
durability_mult = MAJOR_MATERIAL_BUFF
235246
secondary_goal_candidate = TRUE
236247
secondary_goal_difficulty = SMITH_GOAL_HARD
248+
color_tint = "#8a838a"
237249

238250
/datum/smith_material/iridium
239251
name = "iridium"
@@ -250,6 +262,7 @@
250262
power_draw_mult = MINOR_MATERIAL_BUFF
251263
projectile_damage_multiplier = MINOR_MATERIAL_BUFF
252264
durability_mult = MINOR_MATERIAL_BUFF
265+
color_tint = "#62c3cc"
253266

254267
/datum/smith_material/palladium
255268
name = "palladium"
@@ -266,6 +279,7 @@
266279
power_draw_mult = MINOR_MATERIAL_DEBUFF
267280
projectile_damage_multiplier = MINOR_MATERIAL_DEBUFF
268281
durability_mult = MINOR_MATERIAL_BUFF
282+
color_tint = "#d36717"
269283

270284
/datum/smith_material/platinum
271285
name = "platinum"
@@ -282,6 +296,7 @@
282296
projectile_damage_multiplier = MINOR_MATERIAL_BUFF
283297
power_draw_mult = MINOR_MATERIAL_BUFF
284298
durability_mult = MINOR_MATERIAL_BUFF
299+
color_tint = "#c7d3f9"
285300

286301
/datum/smith_material/brass
287302
name = "brass"
@@ -301,6 +316,7 @@
301316
durability_mult = MINOR_MATERIAL_DEBUFF
302317
secondary_goal_candidate = TRUE
303318
secondary_goal_difficulty = SMITH_GOAL_MEDIUM
319+
color_tint = "#97681b"
304320

305321
#undef MAJOR_MATERIAL_BUFF
306322
#undef MINOR_MATERIAL_BUFF

code/modules/smithing/smith_item.dm

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
return
2929

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

0 commit comments

Comments
 (0)