Moves a few sprites out of items.dmi (ParadiseSS13#23301)

* fuck you items.dmi * banhammer
Qwertytoforty · Nov 24, 2023 · 6a109ad · 6a109ad
1 parent bc43bda
commit 6a109ad
Show file tree

Hide file tree

Showing 30 changed files with 24 additions and 16 deletions.
diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
@@ -68,7 +68,6 @@
 /obj/item/restraints/legcuffs/bola/cult
 	name = "runed bola"
 	desc = "A strong bola, bound with dark magic. Throw it to trip and slow your victim. Will not hit fellow cultists."
-	icon = 'icons/obj/items.dmi'
 	icon_state = "bola_cult"
 	item_state = "bola_cult"
 	breakouttime = 45

diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
@@ -357,6 +357,7 @@
 /obj/item/holo/esword
 	name = "holographic energy sword"
 	desc = "This looks like a real energy sword!"
+	icon = 'icons/obj/energy_melee.dmi'
 	lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
 	icon_state = "sword0"

diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
@@ -176,6 +176,7 @@
 /obj/item/toy/sword
 	name = "toy sword"
 	desc = "A cheap, plastic replica of an energy sword. Realistic sounds! Ages 8 and up."
+	icon = 'icons/obj/energy_melee.dmi'
 	lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
 	icon_state = "sword0"

diff --git a/code/game/objects/items/weapons/batons.dm b/code/game/objects/items/weapons/batons.dm
@@ -8,6 +8,7 @@
 /obj/item/melee/classic_baton
 	name = "police baton"
 	desc = "A wooden truncheon for beating criminal scum."
+	icon = 'icons/obj/baton.dmi'
 	icon_state = "baton"
 	item_state = "classic_baton"
 	slot_flags = SLOT_FLAG_BELT

diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
@@ -1,13 +1,13 @@
 /obj/item/restraints
 	name = "bugged restraints" //This item existed before this pr, but had no name or such. Better warn people if it exists
 	desc = "Should not exist. Report me to a(n) coder/admin!"
+	icon = 'icons/obj/restraints.dmi'
 	var/cuffed_state = "handcuff"
 
 /obj/item/restraints/handcuffs
 	name = "handcuffs"
 	desc = "Use this to keep prisoners in line."
 	gender = PLURAL
-	icon = 'icons/obj/items.dmi'
 	icon_state = "handcuff"
 	belt_icon = "handcuffs"
 	flags = CONDUCT

diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm
@@ -208,6 +208,7 @@
 /obj/item/nullrod/claymore/saber
 	name = "light energy blade"
 	hitsound = 'sound/weapons/blade1.ogg'
+	icon = 'icons/obj/energy_melee.dmi'
 	icon_state = "swordblue"
 	item_state = "swordblue"
 	desc = "If you strike me down, I shall become more robust than you can possibly imagine."

diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm
@@ -2,7 +2,6 @@
 	name = "leg cuffs"
 	desc = "Use this to keep prisoners in line."
 	gender = PLURAL
-	icon = 'icons/obj/items.dmi'
 	icon_state = "handcuff"
 	cuffed_state = "legcuff"
 	flags = CONDUCT
@@ -154,7 +153,7 @@
 /obj/item/restraints/legcuffs/beartrap/energy
 	name = "energy snare"
 	armed = TRUE
-	icon_state = "e_snare"
+	icon_state = "e_snare1"
 	trap_damage = 0
 	flags = DROPDEL
 	breakouttime = 6 SECONDS

diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm
@@ -2,7 +2,7 @@
 /obj/item/lighter
 	name = "cheap lighter"
 	desc = "A cheap-as-free lighter."
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/lighter.dmi'
 	lefthand_file = 'icons/mob/inhands/lighter_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/lighter_righthand.dmi'
 	icon_state = "lighter-g"

diff --git a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm
@@ -1,4 +1,5 @@
 /obj/item/melee/energy
+	icon = 'icons/obj/energy_melee.dmi'
 	var/active = FALSE
 	var/force_on = 30 //force when active
 	var/throwforce_on = 20

diff --git a/code/game/objects/items/weapons/paint_bucket.dm b/code/game/objects/items/weapons/paint_bucket.dm
@@ -3,7 +3,7 @@
 /obj/item/reagent_containers/glass/paint
 	desc = "It's a paint bucket."
 	name = "paint bucket"
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/paint.dmi'
 	icon_state = "paint_neutral"
 	item_state = "paintcan"
 	materials = list(MAT_METAL = 400)

diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm
@@ -1,5 +1,6 @@
 /obj/item/shield
 	name = "shield"
+	icon = 'icons/obj/shield.dmi'
 	lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
 	armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 0, BOMB = 30, RAD = 0, FIRE = 80, ACID = 70)

diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
@@ -1,6 +1,7 @@
 /obj/item/melee/baton
 	name = "stunbaton"
 	desc = "A stun baton for incapacitating people with."
+	icon = 'icons/obj/baton.dmi'
 	icon_state = "stunbaton"
 	var/base_icon = "stunbaton"
 	item_state = null

diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
@@ -96,6 +96,7 @@
 /obj/item/dualsaber
 	name = "double-bladed energy sword"
 	desc = "Handle with care."
+	icon = 'icons/obj/energy_melee.dmi'
 	lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
 	icon_state = "dualsaber0"
@@ -229,9 +230,13 @@
 
 //spears
 /obj/item/spear
-	icon_state = "spearglass0"
 	name = "spear"
 	desc = "A haphazardly-constructed yet still deadly weapon of ancient design."
+	icon = 'icons/obj/spear.dmi'
+	base_icon_state = "spearglass"
+	icon_state = "spearglass0"
+	lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
 	force = 10
 	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = SLOT_FLAG_BACK
@@ -249,9 +254,6 @@
 	max_integrity = 200
 	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 30)
 	needs_permit = TRUE
-	lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
-	base_icon_state = "spearglass"
 
 /obj/item/spear/Initialize(mapload)
 	. = ..()

diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
@@ -4,7 +4,7 @@
 /obj/item/banhammer
 	desc = "A banhammer"
 	name = "banhammer"
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "toyhammer"
 	slot_flags = SLOT_FLAG_BELT
 	throwforce = 0

diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
@@ -7,7 +7,7 @@ LINEN BINS
 /obj/item/bedsheet
 	name = "bedsheet"
 	desc = "A surprisingly soft linen bedsheet."
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/bedsheet.dmi'
 	icon_state = "sheet"
 	item_state = "bedsheet"
 	lefthand_file = 'icons/mob/inhands/bedsheet_lefthand.dmi'

diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm
@@ -1,7 +1,7 @@
 /*****************Pickaxes & Drills & Shovels****************/
 /obj/item/pickaxe
 	name = "pickaxe"
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/mining_tool.dmi'
 	icon_state = "pickaxe"
 	flags = CONDUCT
 	slot_flags = SLOT_FLAG_BELT
@@ -124,7 +124,7 @@
 /obj/item/shovel
 	name = "shovel"
 	desc = "A large tool for digging and moving dirt."
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/mining_tool.dmi'
 	icon_state = "shovel"
 	flags = CONDUCT
 	slot_flags = SLOT_FLAG_BELT

diff --git a/code/modules/mining/equipment/resonator.dm b/code/modules/mining/equipment/resonator.dm
@@ -1,7 +1,7 @@
 /**********************Resonator**********************/
 /obj/item/resonator
 	name = "resonator"
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/mining_tool.dmi'
 	icon_state = "resonator"
 	item_state = "resonator"
 	origin_tech = "magnets=3;engineering=3"

diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
@@ -374,7 +374,7 @@
 /obj/item/mining_voucher
 	name = "mining voucher"
 	desc = "A token to redeem a piece of equipment. Use it on a mining equipment vendor."
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/mining_tool.dmi'
 	icon_state = "mining_voucher"
 	w_class = WEIGHT_CLASS_TINY
 

diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm
@@ -1,6 +1,7 @@
 /obj/item/katana/energy
 	name = "energy katana"
 	desc = "A katana infused with a strong energy"
+	icon = 'icons/obj/energy_melee.dmi'
 	icon_state = "energy_katana"
 	item_state = "energy_katana"
 	force = 40

diff --git a/icons/obj/baton.dmi b/icons/obj/baton.dmi
diff --git a/icons/obj/bedsheet.dmi b/icons/obj/bedsheet.dmi
diff --git a/icons/obj/energy_melee.dmi b/icons/obj/energy_melee.dmi
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
diff --git a/icons/obj/lighter.dmi b/icons/obj/lighter.dmi
diff --git a/icons/obj/mining_tool.dmi b/icons/obj/mining_tool.dmi
diff --git a/icons/obj/paint.dmi b/icons/obj/paint.dmi
diff --git a/icons/obj/restraints.dmi b/icons/obj/restraints.dmi
diff --git a/icons/obj/shield.dmi b/icons/obj/shield.dmi
diff --git a/icons/obj/spear.dmi b/icons/obj/spear.dmi
diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi