Merge pull request #4711 from MistakeNot4892/rework/mining_icons

Breaking up mining.dmi.
NebulaSS13 · Jan 14, 2025 · 3110671 · 3110671
2 parents dd67528 + f58faeb
commit 3110671
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 12 deletions.
diff --git a/code/game/objects/items/weapons/storage/specialized.dm b/code/game/objects/items/weapons/storage/specialized.dm
@@ -12,8 +12,8 @@
 /obj/item/ore
 	name = "mining satchel"
 	desc = "This sturdy bag can be used to store and transport ores."
-	icon = 'icons/obj/mining.dmi'
-	icon_state = "satchel"
+	icon = 'icons/obj/items/mining_satchel.dmi'
+	icon_state = ICON_STATE_WORLD
 	slot_flags = SLOT_LOWER_BODY
 	w_class = ITEM_SIZE_LARGE
 	storage = /datum/storage/ore
@@ -57,8 +57,8 @@
 
 /obj/item/sheetsnatcher
 	name = "sheet snatcher"
-	icon = 'icons/obj/mining.dmi'
-	icon_state = "sheetsnatcher"
+	icon = 'icons/obj/items/sheet_snatcher.dmi'
+	icon_state = ICON_STATE_WORLD
 	desc = "A patented storage system designed for any kind of mineral sheet."
 	material = /decl/material/solid/organic/plastic
 	storage = /datum/storage/sheets

diff --git a/code/modules/mining/ore_box.dm b/code/modules/mining/ore_box.dm
@@ -4,8 +4,8 @@
 /obj/structure/ore_box
 	name                   = "ore box"
 	desc                   = "A heavy box used for storing ore."
-	icon                   = 'icons/obj/mining.dmi'
-	icon_state             = "orebox0"
+	icon                   = 'icons/obj/structures/ore_box.dmi'
+	icon_state             = ICON_STATE_WORLD
 	density                = TRUE
 	material               = /decl/material/solid/organic/wood/oak
 	atom_flags             = ATOM_FLAG_CLIMBABLE

diff --git a/code/modules/xenoarcheaology/artifacts/standalone/gigadrill.dm b/code/modules/xenoarcheaology/artifacts/standalone/gigadrill.dm
@@ -1,7 +1,7 @@
 /obj/machinery/giga_drill
 	name = "alien drill"
 	desc = "A giant, alien drill mounted on long treads."
-	icon = 'icons/obj/mining.dmi'
+	icon = 'icons/obj/machines/gigadrill.dmi'
 	icon_state = "gigadrill"
 	var/active = 0
 	var/drill_time = 10

diff --git a/code/modules/xenoarcheaology/boulder.dm b/code/modules/xenoarcheaology/boulder.dm
@@ -1,8 +1,8 @@
 /obj/structure/boulder
 	name = "boulder"
 	desc = "A large boulder, somewhat bigger than a small boulder."
-	icon = 'icons/obj/mining.dmi'
-	icon_state = "boulder1"
+	icon = 'icons/obj/structures/boulder.dmi'
+	icon_state = ICON_STATE_WORLD
 	density = TRUE
 	opacity = TRUE
 	anchored = TRUE
@@ -30,7 +30,7 @@
 
 /obj/structure/boulder/Initialize(var/ml, var/_mat, var/coloration)
 	. = ..()
-	icon_state = "boulder[rand(1,6)]"
+	icon_state = "[initial(icon_state)][rand(1,6)]"
 	if(coloration)
 		color = coloration
 	excavation_level = rand(5, 50)

diff --git a/code/modules/xenoarcheaology/tools/tools.dm b/code/modules/xenoarcheaology/tools/tools.dm
@@ -10,8 +10,8 @@
 /obj/item/bag/fossils
 	name = "fossil satchel"
 	desc = "Transports delicate fossils in suspension so they don't break during transit."
-	icon = 'icons/obj/mining.dmi'
-	icon_state = "satchel"
+	icon = 'icons/obj/items/mining_satchel.dmi'
+	icon_state = ICON_STATE_WORLD
 	slot_flags = SLOT_LOWER_BODY | SLOT_POCKET
 	w_class = ITEM_SIZE_NORMAL
 	storage = /datum/storage/bag/fossils

diff --git a/icons/obj/items/mining_satchel.dmi b/icons/obj/items/mining_satchel.dmi
diff --git a/icons/obj/items/sheet_snatcher.dmi b/icons/obj/items/sheet_snatcher.dmi
diff --git a/icons/obj/machines/gigadrill.dmi b/icons/obj/machines/gigadrill.dmi
diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi
diff --git a/icons/obj/structures/boulder.dmi b/icons/obj/structures/boulder.dmi
diff --git a/icons/obj/structures/ore_box.dmi b/icons/obj/structures/ore_box.dmi