diff --git a/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_ash_walker1_skyrat.dmm b/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_ash_walker1_skyrat.dmm
index b2c5a56c30a..19223c30baf 100644
--- a/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_ash_walker1_skyrat.dmm
+++ b/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_ash_walker1_skyrat.dmm
@@ -498,9 +498,7 @@
/turf/open/misc/sandy_dirt/icemoon,
/area/ruin/unpowered/ash_walkers)
"mV" = (
-/obj/structure/reagent_anvil{
- primitive = 1
- },
+/obj/structure/reagent_anvil,
/obj/item/forging/hammer/primitive,
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 10
@@ -699,9 +697,7 @@
/turf/open/lava/plasma/ice_moon,
/area/ruin/unpowered/ash_walkers)
"rX" = (
-/obj/structure/reagent_forge{
- primitive = 1
- },
+/obj/structure/reagent_forge,
/turf/open/floor/stone/icemoon,
/area/ruin/unpowered/ash_walkers)
"rZ" = (
@@ -1676,9 +1672,7 @@
/turf/open/misc/asteroid/snow/icemoon,
/area/ruin/unpowered/ash_walkers)
"ST" = (
-/obj/structure/reagent_forge{
- primitive = 1
- },
+/obj/structure/reagent_forge,
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 6
},
diff --git a/modular_skyrat/modules/reagent_forging/code/anvil.dm b/modular_skyrat/modules/reagent_forging/code/anvil.dm
index b7eb4f52477..99cfb0fe8e2 100644
--- a/modular_skyrat/modules/reagent_forging/code/anvil.dm
+++ b/modular_skyrat/modules/reagent_forging/code/anvil.dm
@@ -6,14 +6,9 @@
anchored = TRUE
density = TRUE
- ///if on the mining zlevel, it is primitive and has a different icon
- var/primitive = FALSE
/obj/structure/reagent_anvil/Initialize(mapload)
. = ..()
- if(is_mining_level(z))
- primitive = TRUE
- icon_state = "primitive_anvil_empty"
/obj/structure/reagent_anvil/update_appearance()
. = ..()
@@ -22,7 +17,7 @@
return
var/image/overlayed_item = image(icon = contents[1].icon, icon_state = contents[1].icon_state)
- overlayed_item.transform = matrix(1.5, 0, 0, 0, 0.8, 0)
+ overlayed_item.transform = matrix(, 0, 0, 0, 0.8, 0)
add_overlay(overlayed_item)
/obj/structure/reagent_anvil/wrench_act(mob/living/user, obj/item/tool)
diff --git a/modular_skyrat/modules/reagent_forging/code/crafting_bench.dm b/modular_skyrat/modules/reagent_forging/code/crafting_bench.dm
index f6e89e8f8d4..94a918217ab 100644
--- a/modular_skyrat/modules/reagent_forging/code/crafting_bench.dm
+++ b/modular_skyrat/modules/reagent_forging/code/crafting_bench.dm
@@ -96,7 +96,6 @@
return
var/image/overlayed_item = image(icon = contents[1].icon, icon_state = contents[1].icon_state)
- overlayed_item.transform = matrix(1.5, 0, 0, 0, 0.8, 0)
add_overlay(overlayed_item)
//when picking a design or clearing a design
diff --git a/modular_skyrat/modules/reagent_forging/code/forge.dm b/modular_skyrat/modules/reagent_forging/code/forge.dm
index ea410255081..9b9f598e8ad 100644
--- a/modular_skyrat/modules/reagent_forging/code/forge.dm
+++ b/modular_skyrat/modules/reagent_forging/code/forge.dm
@@ -50,8 +50,6 @@
COOLDOWN_DECLARE(forging_cooldown)
///the variable that stops spamming
var/in_use = FALSE
- ///if it isn't on the station zlevel, it is primitive (different icon)
- var/primitive = FALSE
///the forge level, which will upgrade the forge (goliath/sinew/core upgrades)
var/forge_level = FORGE_LEVEL_ZERO
var/static/list/choice_list = list(
@@ -125,20 +123,26 @@
. += span_notice("
[src] is currently [forge_temperature] degrees hot, going towards [target_temperature] degrees.
")
if(reagent_forging)
- . += span_warning("[src] has a red tinge, it is ready to imbue chemicals into reagent objects.")
+ . += span_warning("[src] has a fine gold trim, it is ready to imbue chemicals into reagent objects.")
/obj/structure/reagent_forge/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)
-
- if(is_mining_level(z))
- primitive = TRUE
- icon_state = "primitive_forge_empty"
+ update_appearance()
/obj/structure/reagent_forge/Destroy()
STOP_PROCESSING(SSobj, src)
+ QDEL_NULL(particles)
. = ..()
+/obj/structure/reagent_forge/update_appearance(updates)
+ . = ..()
+ cut_overlays()
+ if(!reagent_forging)
+ return
+ var/image/gold_overlay = image(icon = icon, icon_state = "forge_masterwork_trim")
+ add_overlay(gold_overlay)
+
/**
* Here we check both strong (coal) and weak (wood) fuel
*/
@@ -162,8 +166,6 @@
if(reagent_forging) //We really only need to do it once!
return
reagent_forging = TRUE
- balloon_alert_to_viewers("gurgles!")
- color = "#ff5151"
name = "reagent forge"
desc = "[initial(desc)]
It has the ability to imbue forged metals with chemicals!"
@@ -183,18 +185,18 @@
return
forge_temperature -= 5
+ if(particles)
+ QDEL_NULL(particles)
return
else if(forge_temperature < target_temperature && (forge_fuel_weak || forge_fuel_strong)) //below temp with fuel needs to rise
forge_temperature += 5
-
- if(forge_temperature > 0)
- icon_state = "[primitive ? "primitive_" : ""]forge_full"
+ icon_state = "forge_full"
set_light(3, 1, LIGHT_COLOR_FIRE)
-
- else if(forge_temperature <= 0)
- icon_state = "[primitive ? "primitive_" : ""]forge_empty"
- set_light(0)
+ if(particles)
+ return
+ particles = new /particles/smoke
+ particles.position = list(6, 4, 0)
/**
* Here we fix any weird in_use bugs
diff --git a/modular_skyrat/modules/reagent_forging/code/water_basin.dm b/modular_skyrat/modules/reagent_forging/code/water_basin.dm
index e6381bed37d..63c852d6a5f 100644
--- a/modular_skyrat/modules/reagent_forging/code/water_basin.dm
+++ b/modular_skyrat/modules/reagent_forging/code/water_basin.dm
@@ -11,8 +11,6 @@
/obj/structure/reagent_water_basin/Initialize(mapload)
. = ..()
- if(is_mining_level(z))
- icon_state = "primitive_water_basin"
/obj/structure/reagent_water_basin/Destroy()
QDEL_NULL(fishable)
diff --git a/modular_skyrat/modules/reagent_forging/icons/obj/forge_structures.dmi b/modular_skyrat/modules/reagent_forging/icons/obj/forge_structures.dmi
index facb6092a58..d3cbe12a542 100644
Binary files a/modular_skyrat/modules/reagent_forging/icons/obj/forge_structures.dmi and b/modular_skyrat/modules/reagent_forging/icons/obj/forge_structures.dmi differ