[MIRROR] Fix: red circles at graffiti and pickaxes

SierraBay · Jan 18, 2024 · 30f4023 · 30f4023
1 parent 37b4b91
commit 30f4023
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 33 deletions.
diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm
@@ -1,7 +1,7 @@
 /obj/decal/cleanable/crayon
 	name = "rune"
 	desc = "A rune drawn in crayon."
-	icon = 'icons/obj/rune.dmi'
+	icon = 'icons/effects/crayondecal.dmi'
 
 /obj/decal/cleanable/crayon/New(location, main = "#ffffff", shade = "#000000", type = "rune")
 	..()

diff --git a/code/game/objects/items/weapons/gifts.dm b/code/game/objects/items/weapons/gifts.dm
@@ -26,7 +26,7 @@
 		/obj/item/storage/fancy/crayons,
 		/obj/item/storage/backpack/holding,
 		/obj/item/storage/belt/champion,
-		/obj/item/pickaxe/silver,
+		/obj/item/pickaxe/hand/silver,
 		/obj/item/pen/invisible,
 		/obj/item/lipstick/random,
 		/obj/item/grenade/smokebomb,

diff --git a/code/modules/item_worth/worths_list.dm b/code/modules/item_worth/worths_list.dm
@@ -99,12 +99,12 @@ var/global/list/worths = list(
 					/obj/item/ore = -10,
 					/obj/item/device/scanner/mining =  130,
 //PICK AXES,
-					/obj/item/pickaxe/silver = 300,
+					/obj/item/pickaxe/hand/silver = 300,
 					/obj/item/pickaxe/drill = 100,
 					/obj/item/pickaxe/jackhammer = 90,
-					/obj/item/pickaxe/gold = 400,
+					/obj/item/pickaxe/hand/gold = 400,
 					/obj/item/gun/energy/plasmacutter = 100,
-					/obj/item/pickaxe/diamond = 600,
+					/obj/item/pickaxe/hand/diamond = 600,
 					/obj/item/pickaxe/diamonddrill = 700,
 					/obj/item/pickaxe = 30,
 					/obj/item/shovel/spade = 20,

diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm
@@ -82,17 +82,17 @@
 				var/newitem = pick(typesof(/obj/item/stock_parts) - /obj/item/stock_parts - /obj/item/stock_parts/subspace)
 				new newitem(src)
 		if(69 to 70)
-			new/obj/item/pickaxe/silver(src)
+			new/obj/item/pickaxe/hand/silver(src)
 		if(71 to 72)
 			new/obj/item/pickaxe/drill(src)
 		if(73 to 74)
 			new/obj/item/pickaxe/jackhammer(src)
 		if(75 to 76)
-			new/obj/item/pickaxe/diamond(src)
+			new/obj/item/pickaxe/hand/diamond(src)
 		if(77 to 78)
 			new/obj/item/pickaxe/diamonddrill(src)
 		if(79 to 80)
-			new/obj/item/pickaxe/gold(src)
+			new/obj/item/pickaxe/hand/gold(src)
 		if(81 to 82)
 			new/obj/item/gun/energy/plasmacutter(src)
 		if(83 to 84)

diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
@@ -47,13 +47,6 @@
 	var/build_from_parts = FALSE
 	var/hardware_color
 
-/obj/item/pickaxe/Initialize()
-	if(build_from_parts)
-		icon_state = "pick_hardware"
-		color = hardware_color
-		AddOverlays(overlay_image(icon, "pick_handle", flags=RESET_COLOR))
-	. = ..()
-
 /obj/item/pickaxe/hammer
 	name = "sledgehammer"
 	desc = "A mining hammer made of reinforced metal. You feel like smashing your boss in the face with this."
@@ -96,40 +89,45 @@
 	drill_verb = "drilling"
 
 //****************************actual pickaxes***********************
-/obj/item/pickaxe/silver
-	name = "silver pickaxe"
-	desc = "This makes no metallurgic sense."
+
+/obj/item/pickaxe/hand
+	name = "steel pickaxe"
+	desc = "Time-tested miner's tool."
+	icon = 'icons/obj/tools/pickaxe.dmi'
 	icon_state = "pick_preview"
 	item_state = "pickaxe"
-	digspeed = 30
-	origin_tech = list(TECH_MATERIAL = 3)
+	origin_tech = list(TECH_MATERIAL = 1)
 	drill_verb = "picking"
 	sharp = TRUE
 	build_from_parts = TRUE
+	hardware_color = COLOR_STEEL
+
+/obj/item/pickaxe/hand/Initialize()
+	if(build_from_parts)
+		icon_state = "pick_hardware"
+		color = hardware_color
+		AddOverlays(overlay_image(icon, "pick_handle", flags=RESET_COLOR))
+	. = ..()
+
+/obj/item/pickaxe/hand/silver
+	name = "silver pickaxe"
+	desc = "This makes no metallurgic sense."
+	digspeed = 30
+	origin_tech = list(TECH_MATERIAL = 3)
 	hardware_color = COLOR_SILVER
 
-/obj/item/pickaxe/gold
+/obj/item/pickaxe/hand/gold
 	name = "golden pickaxe"
 	desc = "This makes no metallurgic sense."
-	icon_state = "pick_preview"
-	item_state = "pickaxe"
 	digspeed = 20
 	origin_tech = list(TECH_MATERIAL = 4)
-	drill_verb = "picking"
-	sharp = TRUE
-	build_from_parts = TRUE
 	hardware_color = COLOR_GOLD
 
-/obj/item/pickaxe/diamond
+/obj/item/pickaxe/hand/diamond
 	name = "diamond pickaxe"
 	desc = "A pickaxe with a diamond pick head."
-	icon_state = "pick_preview"
-	item_state = "pickaxe"
 	digspeed = 10
 	origin_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 4)
-	drill_verb = "picking"
-	sharp = TRUE
-	build_from_parts = TRUE
 	hardware_color = COLOR_DIAMOND
 
 /*****************************Shovel********************************/

diff --git a/code/modules/research/designs/designs_mining.dm b/code/modules/research/designs/designs_mining.dm
@@ -27,7 +27,7 @@
 	id = "pick_diamond"
 	req_tech = list(TECH_MATERIAL = 6)
 	materials = list(MATERIAL_DIAMOND = 3000)
-	build_path = /obj/item/pickaxe/diamond
+	build_path = /obj/item/pickaxe/hand/diamond
 	sort_string = "KAAAD"
 
 /datum/design/item/mining/drill_diamond