diff --git a/code/datums/martial.dm b/code/datums/martial.dm
index 3bd823e3502..bfd5a3b6757 100644
--- a/code/datums/martial.dm
+++ b/code/datums/martial.dm
@@ -520,7 +520,6 @@
throwforce = 20
attack_verb = list("smashed", "slammed", "whacked", "thwacked")
icon = 'icons/obj/weapons.dmi'
- icon_override = 'icons/mob/in-hand/staff.dmi'
icon_state = "bostaff0"
diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm
index ae9bce1e1bc..974879a0553 100644
--- a/code/game/gamemodes/changeling/powers/mutations.dm
+++ b/code/game/gamemodes/changeling/powers/mutations.dm
@@ -124,7 +124,6 @@
icon_state = "arm_blade"
item_state = "arm_blade"
flags = ABSTRACT | NODROP
- icon_override = 'icons/mob/in-hand/changeling.dmi'
w_class = 5.0
sharp = 1
edge = 1
@@ -206,7 +205,6 @@
flags = NODROP
icon = 'icons/obj/weapons.dmi'
icon_state = "ling_shield"
- icon_override = 'icons/mob/in-hand/changeling.dmi'
var/remaining_uses //Set by the changeling ability.
diff --git a/code/game/gamemodes/wizard/godhand.dm b/code/game/gamemodes/wizard/godhand.dm
index 2e374240149..aead5dfcf5d 100644
--- a/code/game/gamemodes/wizard/godhand.dm
+++ b/code/game/gamemodes/wizard/godhand.dm
@@ -39,7 +39,6 @@
on_use_sound = "sound/magic/Disintegrate.ogg"
icon_state = "disintegrate"
item_state = "disintegrate"
- icon_override = 'icons/mob/in-hand/spells.dmi'
/obj/item/weapon/melee/touch_attack/disintegrate/afterattack(atom/target, mob/living/carbon/user, proximity)
if(!proximity || target == user || !ismob(target) || !iscarbon(user) || user.lying || user.handcuffed) //exploding after touching yourself would be bad
@@ -64,7 +63,6 @@
on_use_sound = "sound/magic/FleshToStone.ogg"
icon_state = "fleshtostone"
item_state = "fleshtostone"
- icon_override = 'icons/mob/in-hand/spells.dmi'
/obj/item/weapon/melee/touch_attack/fleshtostone/afterattack(atom/target, mob/living/carbon/user, proximity)
if(!proximity || target == user || !ismob(target) || !iscarbon(user) || user.lying || user.handcuffed) //getting hard after touching yourself would also be bad
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 00def7263cf..716b2a0a895 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -6,6 +6,8 @@
var/image/blood_overlay = null //this saves our blood splatter overlay, which will be processed not to go over the edges of the sprite
var/blood_overlay_color = null
var/item_state = null
+ var/lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
+ var/righthand_file = 'icons/mob/inhands/items_righthand.dmi'
var/r_speed = 1.0
var/health = null
var/hitsound = null
diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm
index 48a976cac1f..ad6f64c706e 100644
--- a/code/game/objects/items/devices/camera_bug.dm
+++ b/code/game/objects/items/devices/camera_bug.dm
@@ -11,7 +11,6 @@
icon_state = "camera_bug"
w_class = 1.0
item_state = "camera_bug"
- icon_override = 'icons/mob/in-hand/tools.dmi'
throw_speed = 4
throw_range = 20
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index f78f420d8d8..42653c3ff1b 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -3,7 +3,6 @@
desc = "A powerful and versatile flashbulb device, with applications ranging from disorienting attackers to acting as visual receptors in robot production."
icon_state = "flash"
item_state = "flashtool" //looks exactly like a flash (and nothing like a flashbang)
- icon_override = 'icons/mob/in-hand/tools.dmi'
throwforce = 0
w_class = 1
throw_speed = 3
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index b3dbe66619e..0b461af0861 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -95,7 +95,6 @@
desc = "A robust flashlight used by security."
icon_state = "seclite"
item_state = "seclite"
- icon_override = 'icons/mob/in-hand/tools.dmi'
force = 9 // Not as good as a stun baton.
brightness_on = 5 // A little better than the standard flashlight.
hitsound = 'sound/weapons/genhit1.ogg'
diff --git a/code/game/objects/items/devices/guitar.dm b/code/game/objects/items/devices/guitar.dm
index fa6a7dbc3f3..546989c3c6e 100644
--- a/code/game/objects/items/devices/guitar.dm
+++ b/code/game/objects/items/devices/guitar.dm
@@ -6,7 +6,6 @@
icon = 'icons/obj/musician.dmi'
icon_state = "guitar"
item_state = "guitar"
- icon_override = 'icons/mob/in-hand/tools.dmi'
force = 10
var/datum/song/handheld/song
hitsound = 'sound/effects/guitarsmash.ogg'
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index c66d9c88cae..19812645eea 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -113,7 +113,6 @@ REAGENT SCANNER
name = "Health Analyzer"
icon_state = "health"
item_state = "healthanalyzer"
- icon_override = 'icons/mob/in-hand/tools.dmi'
desc = "A hand-held body scanner able to distinguish vital signs of the subject."
flags = CONDUCT
slot_flags = SLOT_BELT
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index b90f987adf5..2b613ca2d5f 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -76,7 +76,6 @@ effective or pretty fucking useless.
name = "Health Analyzer"
icon_state = "health2"
item_state = "healthanalyzer"
- icon_override = 'icons/mob/in-hand/tools.dmi'
desc = "A hand-held body scanner able to distinguish vital signs of the subject. A strange microlaser is hooked on to the scanning end."
flags = CONDUCT
slot_flags = SLOT_BELT
diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm
index b629fb685c9..bfe90bf709d 100644
--- a/code/game/objects/items/devices/whistle.dm
+++ b/code/game/objects/items/devices/whistle.dm
@@ -3,7 +3,6 @@
desc = "Used by obese officers to save their breath for running."
icon_state = "voice0"
item_state = "flashtool" //looks exactly like a flash (and nothing like a flashbang)
- icon_override = 'icons/mob/in-hand/tools.dmi'
w_class = 1.0
flags = CONDUCT
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 5a05aa0b9cc..c4c45fefb79 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -131,6 +131,8 @@
icon = 'icons/obj/gun.dmi'
icon_state = "revolver"
item_state = "gun"
+ lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
flags = CONDUCT
slot_flags = SLOT_BELT
w_class = 3.0
@@ -207,6 +209,8 @@
icon = 'icons/obj/gun.dmi'
icon_state = "crossbow"
item_state = "crossbow"
+ lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
w_class = 2.0
attack_verb = list("attacked", "struck", "hit")
var/bullets = 5
@@ -1100,7 +1104,6 @@ obj/item/toy/cards/deck/syndicate/black
icon = 'icons/obj/toy.dmi'
icon_state = "foamblade"
item_state = "arm_blade"
- icon_override = 'icons/mob/in-hand/changeling.dmi'
attack_verb = list("pricked", "absorbed", "gored")
w_class = 2
@@ -1113,7 +1116,6 @@ obj/item/toy/cards/deck/syndicate/black
icon = 'icons/obj/device.dmi'
icon_state = "flash"
item_state = "flashtool"
- icon_override = 'icons/mob/in-hand/tools.dmi'
w_class = 1
/obj/item/toy/flash/attack(mob/living/M, mob/user)
diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm
index 02f1e5d9cee..1fca60b065e 100644
--- a/code/game/objects/items/weapons/chrono_eraser.dm
+++ b/code/game/objects/items/weapons/chrono_eraser.dm
@@ -41,7 +41,6 @@
icon = 'icons/obj/chronos.dmi'
icon_state = "chronogun"
item_state = "chronogun"
- icon_override = 'icons/mob/in-hand/guns.dmi'
w_class = 3.0
projectile_type = "/obj/item/projectile/energy/chrono_beam"
fire_sound = 'sound/weapons/Laser.ogg'
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index 51fe775d82c..0e16bfe18ae 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -6,7 +6,6 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "defibunit"
item_state = "defibunit"
- icon_override = 'icons/mob/in-hand/tools.dmi'
slot_flags = SLOT_BACK
force = 5
throwforce = 6
@@ -249,7 +248,6 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "defibpaddles"
item_state = "defibpaddles"
- icon_override = 'icons/mob/in-hand/tools.dmi'
force = 0
throwforce = 6
w_class = 4
diff --git a/code/game/objects/items/weapons/grenades/bananade.dm b/code/game/objects/items/weapons/grenades/bananade.dm
index cdaa19066f2..998c19e9837 100644
--- a/code/game/objects/items/weapons/grenades/bananade.dm
+++ b/code/game/objects/items/weapons/grenades/bananade.dm
@@ -8,7 +8,6 @@ var/turf/T
icon = 'icons/obj/grenade.dmi'
icon_state = "banana"
item_state = "flashbang"
- icon_override = 'icons/mob/in-hand/tools.dmi'
var/deliveryamt = 8
var/spawner_type = /obj/item/weapon/bananapeel
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index c5705d31069..16edef5ddf9 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -7,7 +7,6 @@
desc = "A do it yourself grenade casing!"
icon_state = "chemg"
item_state = "flashbang"
- icon_override = 'icons/mob/in-hand/tools.dmi'
var/bomb_state = "chembomb"
var/payload_name = null // used for spawned grenades
w_class = 2
diff --git a/code/game/objects/items/weapons/grenades/clowngrenade.dm b/code/game/objects/items/weapons/grenades/clowngrenade.dm
index 2cb7e36c4d0..3066c762cd3 100644
--- a/code/game/objects/items/weapons/grenades/clowngrenade.dm
+++ b/code/game/objects/items/weapons/grenades/clowngrenade.dm
@@ -3,7 +3,6 @@
desc = "HONK! brand Bananas. In a special applicator for rapid slipping of wide areas."
icon_state = "banana"
item_state = "flashbang"
- icon_override = 'icons/mob/in-hand/tools.dmi'
w_class = 2.0
force = 2.0
var/stage = 0
diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm
index d4d90b3f094..65fab5cbbe0 100644
--- a/code/game/objects/items/weapons/grenades/emgrenade.dm
+++ b/code/game/objects/items/weapons/grenades/emgrenade.dm
@@ -2,7 +2,6 @@
name = "classic emp grenade"
icon_state = "emp"
item_state = "emp"
- icon_override = 'icons/mob/in-hand/tools.dmi'
origin_tech = "materials=2;magnets=3"
prime()
diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm
index c8dc3883819..9efb53e3207 100644
--- a/code/game/objects/items/weapons/grenades/flashbang.dm
+++ b/code/game/objects/items/weapons/grenades/flashbang.dm
@@ -2,7 +2,6 @@
name = "flashbang"
icon_state = "flashbang"
item_state = "flashbang"
- icon_override = 'icons/mob/in-hand/tools.dmi'
origin_tech = "materials=2;combat=1"
var/banglet = 0
diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm
index d7d3dfb88e2..13ac74d5e3f 100644
--- a/code/game/objects/items/weapons/grenades/ghettobomb.dm
+++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm
@@ -21,7 +21,6 @@
icon = 'icons/obj/grenade.dmi'
icon_state = "improvised_grenade"
item_state = "flashbang"
- icon_override = 'icons/mob/in-hand/tools.dmi'
throw_speed = 3
throw_range = 7
flags = CONDUCT
diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index a2b5dccd963..4fdd0edbd65 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -5,7 +5,6 @@
icon = 'icons/obj/grenade.dmi'
icon_state = "grenade"
item_state = "flashbang"
- icon_override = 'icons/mob/in-hand/tools.dmi'
throw_speed = 4
throw_range = 20
flags = CONDUCT
diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm
index fc216a1e455..1a7df430726 100644
--- a/code/game/objects/items/weapons/grenades/smokebomb.dm
+++ b/code/game/objects/items/weapons/grenades/smokebomb.dm
@@ -5,7 +5,6 @@
icon_state = "flashbang"
det_time = 20
item_state = "flashbang"
- icon_override = 'icons/mob/in-hand/tools.dmi'
slot_flags = SLOT_BELT
var/datum/effect/effect/system/bad_smoke_spread/smoke
diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade.dm b/code/game/objects/items/weapons/grenades/spawnergrenade.dm
index 224624549c7..dbcb27c5f16 100644
--- a/code/game/objects/items/weapons/grenades/spawnergrenade.dm
+++ b/code/game/objects/items/weapons/grenades/spawnergrenade.dm
@@ -4,7 +4,6 @@
icon = 'icons/obj/grenade.dmi'
icon_state = "delivery"
item_state = "flashbang"
- icon_override = 'icons/mob/in-hand/tools.dmi'
origin_tech = "materials=3;magnets=4"
var/banglet = 0
var/spawner_type = null // must be an object path
diff --git a/code/game/objects/items/weapons/grenades/syndieminibomb.dm b/code/game/objects/items/weapons/grenades/syndieminibomb.dm
index 52efab0a48b..160c6846d3c 100644
--- a/code/game/objects/items/weapons/grenades/syndieminibomb.dm
+++ b/code/game/objects/items/weapons/grenades/syndieminibomb.dm
@@ -4,7 +4,6 @@
icon = 'icons/obj/grenade.dmi'
icon_state = "syndicate"
item_state = "flashbang"
- icon_override = 'icons/mob/in-hand/tools.dmi'
origin_tech = "materials=3;magnets=4;syndicate=4"
/obj/item/weapon/grenade/syndieminibomb/prime()
diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm
index 1925455529c..d7c1e63c3ee 100644
--- a/code/game/objects/items/weapons/legcuffs.dm
+++ b/code/game/objects/items/weapons/legcuffs.dm
@@ -110,7 +110,6 @@
desc = "An entangling bolas. Throw at your foes to trip them and prevent them from running."
gender = NEUTER
icon = 'icons/obj/weapons.dmi'
- icon_override = 'icons/mob/in-hand/swords.dmi'
icon_state = "bolas"
siemens_coefficient = 1
slot_flags = SLOT_BELT
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index 27f233e75b3..8af5840b3db 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -36,7 +36,6 @@
name = "energy sword"
desc = "May the force be within you."
icon_state = "sword0"
- icon_override = 'icons/mob/in-hand/swords.dmi'
force = 3.0
throwforce = 5.0
throw_speed = 1
diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm
index 16ea25939d8..5c414831bf7 100644
--- a/code/game/objects/items/weapons/shields.dm
+++ b/code/game/objects/items/weapons/shields.dm
@@ -88,7 +88,6 @@
desc = "An advanced riot shield made of lightweight materials that collapses for easy storage."
icon = 'icons/obj/weapons.dmi'
icon_state = "teleriot0"
- icon_override = 'icons/mob/in-hand/tools.dmi'
slot_flags = null
force = 3
throwforce = 3
diff --git a/code/game/objects/items/weapons/signs.dm b/code/game/objects/items/weapons/signs.dm
index 988273c5b1e..7ad4f40b668 100644
--- a/code/game/objects/items/weapons/signs.dm
+++ b/code/game/objects/items/weapons/signs.dm
@@ -1,7 +1,6 @@
/obj/item/weapon/picket_sign
icon_state = "picket"
item_state = "picket"
- icon_override = 'icons/mob/in-hand/tools.dmi'
name = "blank picket sign"
desc = "It's blank"
force = 5
diff --git a/code/game/objects/items/weapons/staff.dm b/code/game/objects/items/weapons/staff.dm
index 021c3a7618f..9cf7b4cce63 100644
--- a/code/game/objects/items/weapons/staff.dm
+++ b/code/game/objects/items/weapons/staff.dm
@@ -17,7 +17,6 @@
icon = 'icons/obj/wizard.dmi'
icon_state = "broom"
item_state = "broom0"
- icon_override = 'icons/mob/in-hand/staff.dmi'
/obj/item/weapon/twohanded/staff/broom/attack_self(mob/user as mob)
..()
@@ -58,7 +57,6 @@
icon = 'icons/obj/wizard.dmi'
icon_state = "horsebroom"
item_state = "horsebroom0"
- icon_override = 'icons/mob/in-hand/staff.dmi'
/obj/item/weapon/twohanded/staff/broom/horsebroom/attack_self(mob/user as mob)
..()
diff --git a/code/game/objects/items/weapons/stock_parts.dm b/code/game/objects/items/weapons/stock_parts.dm
index 205f2c2e234..debbe18d023 100644
--- a/code/game/objects/items/weapons/stock_parts.dm
+++ b/code/game/objects/items/weapons/stock_parts.dm
@@ -5,7 +5,6 @@
desc = "Special mechanical module made to store, sort, and apply standard machine parts."
icon_state = "RPED"
item_state = "RPED"
- icon_override = 'icons/mob/in-hand/tools.dmi'
w_class = 5
can_hold = list("/obj/item/weapon/stock_parts")
storage_slots = 50
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 2e59a30fb9c..10391b8a578 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -224,7 +224,6 @@
/obj/item/weapon/storage/backpack/duffel
name = "duffelbag"
desc = "A large grey duffelbag designed to hold more items than a regular bag."
- icon_override = 'icons/mob/in-hand/duffelbag.dmi'
icon_state = "duffel"
item_state = "duffel"
storage_slots = 9 // Duffelbags can hold more items.
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index c3d0040b07f..011d337cea0 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -12,7 +12,6 @@
name = "first-aid kit"
desc = "It's an emergency medical kit for those serious boo-boos."
icon_state = "firstaid"
- icon_override = 'icons/mob/in-hand/medkits.dmi'
throw_speed = 2
throw_range = 8
var/empty = 0
diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm
index 6ed37dac59f..048c5ae2f08 100644
--- a/code/game/objects/items/weapons/tanks/tank_types.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types.dm
@@ -205,7 +205,6 @@
desc = "A high-tech nitrogen tank designed specifically for Vox."
icon_state = "emergency_vox"
item_state = "emergency_vox"
- icon_override = 'icons/mob/in-hand/tools.dmi'
volume = 25
diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm
index 7dd5365e20a..7ba38405929 100644
--- a/code/game/objects/items/weapons/tanks/watertank.dm
+++ b/code/game/objects/items/weapons/tanks/watertank.dm
@@ -108,7 +108,6 @@
icon = 'icons/obj/watertank.dmi'
icon_state = "mister"
item_state = "mister"
- icon_override = 'icons/mob/in-hand/tools.dmi'
w_class = 4.0
amount_per_transfer_from_this = 50
possible_transfer_amounts = list(25,50,100)
@@ -210,7 +209,6 @@
icon = 'icons/obj/watertank.dmi'
icon_state = "atmos_nozzle"
item_state = "nozzleatmos"
- icon_override = 'icons/mob/in-hand/tools.dmi'
safety = 0
max_water = 200
power = 8
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index 2582a42c214..263677164b4 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -199,7 +199,6 @@ obj/item/weapon/twohanded/
/obj/item/weapon/twohanded/dualsaber
var/hacked = 0
var/blade_color
- icon_override = 'icons/mob/in-hand/swords.dmi'
icon_state = "dualsaber0"
name = "double-bladed energy sword"
desc = "Handle with care."
@@ -365,7 +364,6 @@ obj/item/weapon/twohanded/
///CHAINSAW///
/obj/item/weapon/twohanded/chainsaw
- icon_override = 'icons/mob/in-hand/swords.dmi'
icon_state = "chainsaw0"
name = "Chainsaw"
desc = "Perfect for felling trees or fellow spacemen."
@@ -423,8 +421,6 @@ obj/item/weapon/twohanded/
/obj/item/weapon/twohanded/singularityhammer
name = "singularity hammer"
desc = "The pinnacle of close combat technology, the hammer harnesses the power of a miniaturized singularity to deal crushing blows."
-
- icon_override = 'icons/mob/in-hand/swords.dmi'
icon_state = "mjollnir0"
flags = CONDUCT
slot_flags = SLOT_BACK
@@ -498,7 +494,6 @@ obj/item/weapon/twohanded/
/obj/item/weapon/twohanded/mjollnir
name = "Mjollnir"
desc = "A weapon worthy of a god, able to strike with the force of a lightning bolt. It crackles with barely contained energy."
- icon_override = 'icons/mob/in-hand/swords.dmi'
icon_state = "mjollnir0"
flags = CONDUCT
slot_flags = SLOT_BACK
@@ -546,9 +541,7 @@ obj/item/weapon/twohanded/
/obj/item/weapon/twohanded/knighthammer
name = "singuloth knight's hammer"
desc = "A hammer made of sturdy metal with a golden skull adorned with wings on either side of the head.
This weapon causes devastating damage to those it hits due to a power field sustained by a mini-singularity inside of the hammer."
-
- icon_override = 'icons/mob/in-hand/swords.dmi'
- icon_state = "adrhammer0"
+ icon_state = "knighthammer0"
flags = CONDUCT
slot_flags = SLOT_BACK
no_embed = 1
@@ -579,7 +572,7 @@ obj/item/weapon/twohanded/
return
/obj/item/weapon/twohanded/knighthammer/update_icon() //Currently only here to fuck with the on-mob icons.
- icon_state = "adrhammer[wielded]"
+ icon_state = "knighthammer[wielded]"
return
diff --git a/code/modules/admin/verbs/BrokenInhands.dm b/code/modules/admin/verbs/BrokenInhands.dm
index d3256579191..1d414c7ebf9 100644
--- a/code/modules/admin/verbs/BrokenInhands.dm
+++ b/code/modules/admin/verbs/BrokenInhands.dm
@@ -2,16 +2,14 @@
set name = "Broken Sprite List"
set category = "Debug"
- var/icon/IL = new('icons/mob/items_lefthand.dmi')
- var/list/Lstates = IL.IconStates()
- var/icon/IR = new('icons/mob/items_righthand.dmi')
- var/list/Rstates = IR.IconStates()
-
-
var/text
for(var/A in typesof(/obj/item))
var/obj/item/O = new A( locate(1,1,1) )
if(!O) continue
+ var/icon/IL = new(O.lefthand_file)
+ var/list/Lstates = IL.IconStates()
+ var/icon/IR = new(O.righthand_file)
+ var/list/Rstates = IR.IconStates()
var/icon/J = new(O.icon)
var/list/istates = J.IconStates()
if(!Lstates.Find(O.icon_state) && !Lstates.Find(O.item_state))
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index c24d307a01b..92412711754 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -10,6 +10,8 @@
while sprite_sheets should be used for "flexible" clothing items that do not need to be refitted (e.g. vox wearing jumpsuits).
*/
var/list/sprite_sheets_refit = null
+ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
//BS12: Species-restricted clothing check.
/obj/item/clothing/mob_can_equip(M as mob, slot)
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index 67eb53c2e0d..15c60eb0655 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -734,7 +734,6 @@
icon = 'icons/obj/syringe.dmi'
icon_state = "lazarus_hypo"
item_state = "hypo"
- icon_override = 'icons/mob/in-hand/tools.dmi'
throwforce = 0
w_class = 2.0
throw_speed = 3
diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm
index 2815d1c5da7..c427205eabe 100644
--- a/code/modules/mining/ore.dm
+++ b/code/modules/mining/ore.dm
@@ -110,7 +110,6 @@
icon = 'icons/obj/mining.dmi'
icon_state = "Gibtonite ore"
item_state = "Gibtonite ore"
- icon_override = 'icons/mob/in-hand/tools.dmi'
w_class = 4
throw_range = 0
anchored = 1 //Forces people to carry it by hand, no pulling!
diff --git a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
index 740c3e5ce25..f956dfb5b1a 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
@@ -143,7 +143,7 @@
var/t_state = r_hand.item_state
if(!t_state) t_state = r_hand.icon_state
r_hand.screen_loc = ui_rhand
- overlays_standing[X_R_HAND_LAYER] = image("icon" = 'icons/mob/items_righthand.dmi', "icon_state" = t_state)
+ overlays_standing[X_R_HAND_LAYER] = image("icon" = r_hand.righthand_file, "icon_state" = t_state)
else
overlays_standing[X_R_HAND_LAYER] = null
if(update_icons) update_icons()
@@ -153,7 +153,7 @@
var/t_state = l_hand.item_state
if(!t_state) t_state = l_hand.icon_state
l_hand.screen_loc = ui_lhand
- overlays_standing[X_L_HAND_LAYER] = image("icon" = 'icons/mob/items_lefthand.dmi', "icon_state" = t_state)
+ overlays_standing[X_L_HAND_LAYER] = image("icon" = l_hand.lefthand_file, "icon_state" = t_state)
else
overlays_standing[X_L_HAND_LAYER] = null
if(update_icons) update_icons()
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index f7493c272d8..8deae2f5c5f 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -875,7 +875,7 @@ var/global/list/damage_icon_parts = list()
t_state = "[t_state]_r"
overlays_standing[R_HAND_LAYER] = image("icon" = r_hand.sprite_sheets[species.name], "icon_state" = "[t_state]")
else
- overlays_standing[R_HAND_LAYER] = image("icon" = 'icons/mob/items_righthand.dmi', "icon_state" = "[t_state]")
+ overlays_standing[R_HAND_LAYER] = image("icon" = r_hand.righthand_file, "icon_state" = "[t_state]")
if (handcuffed) drop_r_hand()
else
@@ -896,7 +896,7 @@ var/global/list/damage_icon_parts = list()
t_state = "[t_state]_l"
overlays_standing[L_HAND_LAYER] = image("icon" = l_hand.sprite_sheets[species.name], "icon_state" = "[t_state]")
else
- overlays_standing[L_HAND_LAYER] = image("icon" = 'icons/mob/items_lefthand.dmi', "icon_state" = "[t_state]")
+ overlays_standing[L_HAND_LAYER] = image("icon" = l_hand.lefthand_file, "icon_state" = "[t_state]")
if (handcuffed) drop_l_hand()
else
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 79ead634085..cef8e246665 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -544,7 +544,6 @@
return
H.icon_state = "pai-[icon_state]"
H.item_state = "pai-[icon_state]"
- H.icon_override = 'icons/mob/in-hand/paiheld.dmi'//I have these in diffrent DMI so i am overriding
grabber.put_in_active_hand(H)//for some reason unless i call this it dosen't work
grabber.update_inv_l_hand()
grabber.update_inv_r_hand()
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 77f48b976d5..79d156f9cb7 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -402,7 +402,7 @@ datum/preferences
if(LAWYER)
clothes_s = new /icon(uniform_dmi, "internalaffairs_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "briefcase"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "briefcase"), ICON_UNDERLAY)
if(prob(1))
clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suitjacket_blue"), ICON_OVERLAY)
switch(backbag)
@@ -569,7 +569,7 @@ datum/preferences
clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "toolbox_blue"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "toolbox_blue"), ICON_OVERLAY)
switch(backbag)
if(2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
@@ -655,7 +655,7 @@ datum/preferences
clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_white"), ICON_OVERLAY)
if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "blueprints"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "blueprints"), ICON_OVERLAY)
switch(backbag)
if(2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm
index 2acb3109769..ff56a80858b 100644
--- a/code/modules/ninja/energy_katana.dm
+++ b/code/modules/ninja/energy_katana.dm
@@ -3,7 +3,6 @@
desc = "A katana infused with a strong energy"
icon_state = "energy_katana"
item_state = "energy_katana"
- icon_override = 'icons/mob/in-hand/swords.dmi'
force = 40
throwforce = 20
var/cooldown = 0 // Because spam aint cool, yo.
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index fe721a77d6d..968a5a64683 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -15,7 +15,6 @@
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "pen"
item_state = "pen"
- icon_override = 'icons/mob/in-hand/tools.dmi'
slot_flags = SLOT_BELT | SLOT_EARS
throwforce = 0
w_class = 1.0
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 61a646242a1..2238fdba653 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -8,6 +8,8 @@
icon = 'icons/obj/gun.dmi'
icon_state = "detective"
item_state = "gun"
+ lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
flags = CONDUCT
slot_flags = SLOT_BELT
materials = list(MAT_METAL=2000)
diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm
index 0c649df0ca9..f83c2bec192 100644
--- a/code/modules/projectiles/guns/alien.dm
+++ b/code/modules/projectiles/guns/alien.dm
@@ -70,7 +70,6 @@
desc = "It's some kind of enormous alien weapon, as long as a man is tall."
icon = 'icons/obj/gun.dmi' //Actual on-sprite is handled by icon_override.
- icon_override = 'icons/mob/vox.dmi'
icon_state = "noisecannon"
item_state = "noisecannon"
recoil = 1
diff --git a/code/modules/projectiles/guns/energy/advtaser.dm b/code/modules/projectiles/guns/energy/advtaser.dm
index 8d7e37812a3..f617db1122b 100644
--- a/code/modules/projectiles/guns/energy/advtaser.dm
+++ b/code/modules/projectiles/guns/energy/advtaser.dm
@@ -3,7 +3,6 @@
desc = "A hybrid taser designed to fire both short-range high-power electrodes and long-range disabler beams."
icon_state = "advtaser"
item_state = null //so the human update icon uses the icon_state instead.
- icon_override = 'icons/mob/in-hand/guns.dmi'
cell_type = "/obj/item/weapon/stock_parts/cell"
origin_tech = null
fire_sound = 'sound/weapons/Taser.ogg'
diff --git a/code/modules/projectiles/guns/energy/hos.dm b/code/modules/projectiles/guns/energy/hos.dm
index 2fbb0dfd730..c48a7ee3398 100644
--- a/code/modules/projectiles/guns/energy/hos.dm
+++ b/code/modules/projectiles/guns/energy/hos.dm
@@ -3,7 +3,6 @@
desc = "This is a modern recreation of the captain's antique laser gun. This gun has several unique fire modes, but lacks the ability to recharge over time."
icon_state = "hoslaser"
item_state = null //so the human update icon uses the icon_state instead.
- icon_override = 'icons/mob/in-hand/guns.dmi'
force = 10
fire_sound = 'sound/weapons/Taser.ogg'
origin_tech = "combat=3;magnets=2"
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 16141ac7da4..7f37895e7ab 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -25,7 +25,6 @@ obj/item/weapon/gun/energy/laser/retro
/obj/item/weapon/gun/energy/laser/captain
icon_state = "caplaser"
item_state = "caplaser"
- icon_override = 'icons/mob/in-hand/guns.dmi'
desc = "This is an antique laser gun. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. On the item is an image of Space Station 13. The station is exploding."
force = 10
origin_tech = null
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index d3e132d6210..07dc18181e9 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -3,7 +3,6 @@
desc = "A man portable anti-armor weapon designed to disable mechanical threats"
icon_state = "ionrifle"
item_state = null //so the human update icon uses the icon_state instead.
- icon_override = 'icons/mob/in-hand/guns.dmi'
fire_sound = 'sound/weapons/IonRifle.ogg'
origin_tech = "combat=2;magnets=4"
w_class = 5.0
@@ -36,7 +35,7 @@
name = "floral somatoray"
desc = "A tool that discharges controlled radiation which induces mutation in plant cells."
icon_state = "floramut100"
- item_state = "obj/item/gun.dmi"
+ item_state = "gun"
fire_sound = 'sound/effects/stealthoff.ogg'
projectile_type = "/obj/item/projectile/energy/floramut"
origin_tech = "materials=2;biotech=3;powerstorage=3"
@@ -128,6 +127,8 @@
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "pen"
item_state = "pen"
+ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/items_righthand.dmi'
w_class = 1
@@ -231,7 +232,6 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
desc = "According to Nanotrasen accounting, this is mining equipment. It's been modified for extreme power output to crush rocks, but often serves as a miner's first defense against hostile alien life; it's not very powerful unless used in a low pressure environment."
icon_state = "kineticgun"
item_state = "kineticgun"
- icon_override = 'icons/mob/in-hand/guns.dmi'
projectile_type = "/obj/item/projectile/kinetic"
fire_sound = 'sound/weapons/Kenetic_accel.ogg'
charge_cost = 5000
@@ -309,7 +309,6 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
attack_verb = list("attacked", "slashed", "cut", "sliced")
charge_cost = 250
fire_delay = 15
- icon_override = 'icons/mob/in-hand/guns.dmi'
can_charge = 0
/obj/item/weapon/gun/energy/plasmacutter/examine(mob/user)
@@ -389,7 +388,6 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
desc = "An extremely high-tech bluespace energy gun capable of teleporting targets to far off locations."
icon_state = "telegun"
item_state = "ionrifle"
- icon_override = 'icons/mob/in-hand/guns.dmi'
fire_sound = 'sound/weapons/wave.ogg'
origin_tech = "combat=6;materials=7;powerstorage=5;bluespace=5;syndicate=4"
cell_type = "/obj/item/weapon/stock_parts/cell/crap"
diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm
index 3bdcbdce860..57c3ca2628c 100644
--- a/code/modules/projectiles/guns/magic.dm
+++ b/code/modules/projectiles/guns/magic.dm
@@ -4,10 +4,12 @@
icon = 'icons/obj/gun.dmi'
icon_state = "staffofnothing"
item_state = "staff"
+ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' //not really a gun and some toys use these inhands
+ righthand_file = 'icons/mob/inhands/items_righthand.dmi'
fire_sound = 'sound/weapons/emitter.ogg'
flags = CONDUCT
w_class = 5
- var/projectile_type = "/obj/item/projectile/magic"
+ var/projectile_type = /obj/item/projectile/magic
var/max_charges = 6
var/charges = 0
var/recharge_rate = 4
diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm
index 5fdeb481d5a..16fc552397d 100644
--- a/code/modules/projectiles/guns/magic/staff.dm
+++ b/code/modules/projectiles/guns/magic/staff.dm
@@ -14,7 +14,6 @@ obj/item/weapon/gun/magic/staff/animate
projectile_type = "/obj/item/projectile/magic/animate"
icon_state = "staffofanimation"
item_state = "staffofanimation"
- icon_override = 'icons/mob/in-hand/staff.dmi'
obj/item/weapon/gun/magic/staff/healing
name = "staff of healing"
@@ -22,7 +21,6 @@ obj/item/weapon/gun/magic/staff/healing
projectile_type = "/obj/item/projectile/magic/resurrection"
icon_state = "staffofhealing"
item_state = "staffofhealing"
- icon_override = 'icons/mob/in-hand/staff.dmi'
obj/item/weapon/gun/magic/staff/chaos
name = "staff of chaos"
@@ -30,7 +28,6 @@ obj/item/weapon/gun/magic/staff/chaos
projectile_type = "/obj/item/projectile/magic"
icon_state = "staffofchaos"
item_state = "staffofchaos"
- icon_override = 'icons/mob/in-hand/staff.dmi'
max_charges = 10
recharge_rate = 2
@@ -49,7 +46,6 @@ obj/item/weapon/gun/magic/staff/door
projectile_type = "/obj/item/projectile/magic/door"
icon_state = "staffofdoor"
item_state = "staffofdoor"
- icon_override = 'icons/mob/in-hand/staff.dmi'
max_charges = 10
recharge_rate = 2
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index f4c1142039c..615dfcf2ba2 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -115,7 +115,6 @@
desc = "A compact, mag-fed semi-automatic shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines."
icon_state = "bulldog"
item_state = "bulldog"
- icon_override = 'icons/mob/in-hand/guns.dmi'
w_class = 3.0
origin_tech = "combat=5;materials=4;syndicate=6"
mag_type = "/obj/item/ammo_box/magazine/m12g"
@@ -150,7 +149,6 @@
desc = "A bullpup and compact 5.45x39 assault rifle with a unique toploading design, designated 'C-90gl'. Has an attached underbarrel grenade launcher which can be toggled on and off."
icon_state = "c90gl"
item_state = "c90gl"
- icon_override = 'icons/mob/in-hand/guns.dmi'
origin_tech = "combat=5;materials=2;syndicate=8"
mag_type = "/obj/item/ammo_box/magazine/m545"
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 744c7758029..72a5a613121 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -108,7 +108,6 @@
desc = "This piece of junk looks like something that could have been used 700 years ago."
icon_state = "moistnugget"
item_state = "moistnugget"
- icon_override = 'icons/mob/in-hand/guns.dmi'
slot_flags = 0 //no SLOT_BACK sprite, alas
mag_type = "/obj/item/ammo_box/magazine/internal/boltaction"
var/bolt_open = 0
diff --git a/code/modules/reagents/grenade_launcher.dm b/code/modules/reagents/grenade_launcher.dm
index 48c467fed02..0a1944827d6 100644
--- a/code/modules/reagents/grenade_launcher.dm
+++ b/code/modules/reagents/grenade_launcher.dm
@@ -72,7 +72,6 @@
/obj/item/weapon/gun/grenadelauncher/piecannon
name = "pie cannon"
icon = 'icons/obj/gun.dmi'
- icon_override = 'icons/mob/in-hand/guns.dmi'
icon_state = "piecannon1"
item_state = "piecannon1"
w_class = 4.0
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 2cc67490b39..272c28a4f76 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -8,7 +8,6 @@
icon = 'icons/obj/syringe.dmi'
item_state = "hypo"
icon_state = "hypo"
- icon_override = 'icons/mob/in-hand/tools.dmi'
amount_per_transfer_from_this = 5
volume = 30
possible_transfer_amounts = list(1,2,3,4,5,10,15,20,25,30)
diff --git a/icons/mob/in-hand/README.md b/icons/mob/in-hand/README.md
deleted file mode 100644
index b18cc841711..00000000000
--- a/icons/mob/in-hand/README.md
+++ /dev/null
@@ -1,43 +0,0 @@
-In-Hand DMI Compile System
-==========================
-
-A shitty hack by N3X15
-
-WHY THE FUCK?
--------------
-
-BYOND 499 limited the number of icon states that can be
-added to a DMI to 512 states. Why? Who fucking knows.
-Magically, DM can't edit them but the server doesn't
-care how big they are, so it's probably a shitty hack
-so they don't have to change the array's index type.
-
-Whatever the case, we ran into this wall. You cannot edit
-items_lefthand and items_righthand with BYOND anymore. We
-filed a bug report: http://www.byond.com/forum/?post=1507331
-
-They closed it with "Not a Bug".
-
-So, here we are. The only way to edit DMIs that big
-is with third-party tools like OpenBYOND.
-
-How to Compile
---------------
-
-Simply dump your DMIs into the appropriate folder and run
-compile.py from within this folder. It'll build the DMIs
-and jam everything into a single meta-DMI for you.
-
-Simple.
-
-Adding More Output Targets
---------------------------
-
-If you've run into the problem mentioned above with another
-DMI, have no fear: Just edit compile.py and add the new
-output target to the ToBuild dict as shown in the comments.
-
-License
--------
-
-MIT
\ No newline at end of file
diff --git a/icons/mob/in-hand/changeling.dmi b/icons/mob/in-hand/changeling.dmi
deleted file mode 100644
index ab9e0857312..00000000000
Binary files a/icons/mob/in-hand/changeling.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/clothes.dmi b/icons/mob/in-hand/clothes.dmi
deleted file mode 100644
index 0be1a13ed83..00000000000
Binary files a/icons/mob/in-hand/clothes.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/duffelbag.dmi b/icons/mob/in-hand/duffelbag.dmi
deleted file mode 100644
index 736febaeba6..00000000000
Binary files a/icons/mob/in-hand/duffelbag.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/guns.dmi b/icons/mob/in-hand/guns.dmi
deleted file mode 100644
index 7165bf43719..00000000000
Binary files a/icons/mob/in-hand/guns.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/in-hand_sync_report.txt b/icons/mob/in-hand/in-hand_sync_report.txt
deleted file mode 100644
index eaa6be1eccd..00000000000
--- a/icons/mob/in-hand/in-hand_sync_report.txt
+++ /dev/null
@@ -1,1123 +0,0 @@
-# DMITool Difference Report: Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\left Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\right
---- Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\left\ambassdor_left.dmi
-+++ Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\right\ambassdor_left.dmi
- + kidanspear
---- Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\left\cable_stuff.dmi
-+++ Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\right\cable_stuff.dmi
- + cuff_cyan
- + cuff_orange
- + cuff_pink
- + cuff_white
---- Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\left\flags_left.dmi
-+++ Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\right\flags_left.dmi
- + atmosflag
- + atmosflag_fire
- + cargoflag
- + cargoflag_fire
- + cargoflag_old
- + clownflag
- + clownflag_fire
- + cultflag
- + cultflag_fire
- + dionaflag
- + dionaflag_fire
- + fire
- + greyflag
- + greyflag_fire
- + greysflag
- + greysflag_fire
- + humanflag
- + humanflag_fire
- + ianflag
- + ianflag_fire
- + kidanflag
- + kidanflag_fire
- + machineflag
- + machineflag_fire
- + medflag
- + medflag_fire
- + mimeflag
- + mimeflag_fire
- + ninjaflag
- + ninjaflag_fire
- + ntflag
- + ntflag_fire
- + ponyflag
- + ponyflag_fire
- + rndflag
- + rndflag_fire
- + secflag
- + secflag_fire
- + secflag_old
- + skrellflag
- + skrellflag_fire
- + slimeflag
- + slimeflag_fire
- + syndiflag
- + syndiflag_fire
- + tajflag
- + tajflag_fire
- + unathiflag
- + unathiflag_fire
- + voxflag
- + voxflag_fire
- + wizflag
- + wizflag_fire
---- Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\left\guns.dmi
-+++ Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\right\guns.dmi
- + scythe0
---- Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\left\paradise_items_lefthand.dmi
-+++ Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\right\paradise_items_lefthand.dmi
- + DONGS
- + altair_locket
- + an_tank
- + analyzer
- + armor
- + armor_reflec
- + assembly
- + atmos_hardsuit
- + atmos_helm
- + atmos_suit
- + atoxinbottle
- + autoinjector
- + axe0
- + axe1
- + b_mask
- + b_shoes
- + b_shoesold
- + b_suit
- + ba_suit
- + backpack
- + balloon
- + balloon-empty
- + basketball
- + baton
- + baton_on
- + beachball
- + beaker
- + bedsheet
- + beer
- + bgloves
- + bible
- + bike_horn
- + bio_hood
- + bio_orange
- + bio_suit
- + bl_shoes
- + bl_shoesold
- + bl_suit
- + blackskirt
- + blade
- + blindfold
- + blueprints
- + bombvest
- + brain2
- + brick
- + briefcase
- + broken_beer
- + broom
- + browncane
- + brutepack
- + bucket
- + buckler
- + bucklerOLD
- + buildpipe
- + burger
- + butch
- + butcher_knife
- + c20r
- + c_tube
- + cakehat0
- + cakehat1
- + candy
- + cane_nt
- + cane_nt_active
- + canister
- + caphat
- + capspacehelmet
- + capspacesuit
- + captainpack
- + card-id
- + cardborg
- + cardborg_h
- + carton
- + caution
- + ce_hardsuit
- + ce_helm
- + cell
- + centcom
- + centhat
- + cespace_helmet
- + cespace_suit
- + chain
- + chainmail
- + chef
- + chefhat
- + chickensuit
- + chips
- + cigoff
- + cigon
- + cigpacket
- + classic_baton
- + claymore
- + cleaner
- + clipboard
- + clown
- + clown_hat
- + clown_shoes
- + clownflag
- + clownhelmet
- + clownpack
- + coffee
- + coil
- + coil-wire
- + coil_blue
- + coil_red
- + cola
- + contliquid
- + contsolid
- + contvapour
- + coolant-c
- + crossbow
- + crossbow-solid
- + crowbar
- + crowbar_red
- + cueball
- + cultblade
- + culthood
- + cultpack
- + cultrobes
- + cutlass0
- + cutlass1
- + cutters
- + cutters_yellow
- + daederic
- + deagleg
- + death_commando_mask
- + death_commando_suit
- + deathnettle
- + det
- + det_hat
- + det_suit
- + dg_suit
- + dnainjector
- + donut1
- + donut2
- + dpickaxe
- + dr_gibb
- + dropper
- + dualsaber0
- + dualsaber1
- + dualsaberblue1
- + dualsabergreen1
- + dualsaberpurple1
- + dualsaberred1
- + earmuffs
- + egg
- + egg1
- + egg2
- + egg3
- + egg4
- + egg5
- + eleanorstone
- + electronic
- + electropack
- + emergency
- + emergency_double
- + emergency_engi
- + emp
- + energy_drink
- + energykill
- + energykill0
- + energykill100
- + energykill25
- + energykill50
- + energykill75
- + energystun
- + energystun0
- + energystun100
- + energystun25
- + energystun50
- + energystun75
- + eng_hardsuit
- + eng_helm
- + engi_suit
- + engiepack
- + engspace_helmet
- + engspace_suit
- + eshield0
- + eshield1
- + faggot
- + fire_extinguisher
- + fire_suit
- + fireaxe0
- + fireaxe1
- + firefighter
- + firstaid
- + firstaid-advanced
- + firstaid-ointment
- + firstaid-toxin
- + flamethrower_0
- + flamethrower_1
- + flare
- + flashbang
- + flashlight
- + foamcrossbow
- + focus
- + fork
- + fr_jacket
- + g_suit
- + galoshes
- + gas_alt
- + gas_mask
- + gift
- + giftbag
- + glasses
- + gold_id
- + gpickaxe
- + greatcoat
- + greenbandana
- + gun
- + gy_suit
- + handcuff
- + harpoon
- + hatchet
- + headset
- + healthanalyzer
- + helm-command
- + helm-orange
- + helmet
- + hoe
- + holidaypriest
- + ice_tea_can
- + imperium_monk
- + implantcase
- + ithaqua
- + jackboots
- + jackhammer
- + janitor
- + jensencoat
- + jensensuit
- + jetpack
- + jetpack-black
- + jetpack-void
- + johnny
- + johnny_coat
- + judge
- + katana
- + kilt
- + kingyellow
- + knife
- + kobskull
- + konaahirano
- + koran
- + l6closedmag
- + l6closednomag
- + l6openmag
- + l6opennomag
- + labcoat
- + lamp
- + lampgreen
- + laser
- + latexballon
- + launcher
- + lawyer_black
- + lawyer_blue
- + lawyer_red
- + lb_suit
- + lemon-lime
- + lgloves
- + lipstick
- + lipstickopen
- + m_mask
- + magboots
- + medibottle
- + medical_hardsuit
- + medical_helm
- + medicalpack
- + melted
- + miniFE
- + mining_hardsuit
- + mining_helm
- + mister
- + mop
- + mousetrap
- + multitool
- + muzzle
- + nazi1
- + necronomicon
- + nettle
- + newspaper
- + nothing
- + ntflag
- + nucgun
- + nucgun0
- + nucgun100
- + nucgun25
- + nucgun50
- + nucgun75
- + nullrod
- + nun
- + nursesuit
- + o_shoes
- + o_shoes1
- + o_suit
- + ointment
- + overalls
- + owl
- + owl_mask
- + oxygen
- + oxygen-c
- + oxygen_f
- + oxygen_fr
- + p_suit
- + paintcan
- + paper
- + pen
- + pickaxe
- + pie
- + pill
- + plantbgone
- + plasma
- + plasma-c
- + plasticbag
- + plasticx
- + pneumatic
- + pneumatic-tank
- + ppickaxe
- + prod
- + psyche
- + pulse
- + pulse0
- + pulse100
- + pulse25
- + pulse50
- + pulse75
- + purple_can
- + pwig
- + quarrel
- + r_feet
- + r_hands
- + r_head
- + r_shoes
- + r_suit
- + rack_parts
- + rad_suit
- + radio
- + rainbow
- + razor
- + rcd
- + rcdammo
- + rejuvbottle
- + restock_unit
- + rev_headballoon
- + revballoon
- + rig_helm
- + rig_suit
- + riot
- + riotgun
- + ro_suit
- + rods
- + rolling_pin
- + roman_shield
- + rubberducky
- + s-ninja_hood
- + s-ninja_mask
- + s-ninja_suit
- + s_helmet
- + s_mask
- + s_suit
- + santa
- + santahat
- + saw3
- + scalpel
- + scientology
- + scrapbook
- + scratch
- + screwdriver
- + screwdriver_blue
- + screwdriver_brown
- + screwdriver_cyan
- + screwdriver_green
- + screwdriver_purple
- + screwdriver_yellow
- + scythe0
- + sec-case
- + sec_hardsuit
- + sec_helm
- + secsoft
- + securitypack
- + shard-glass
- + sheet-card
- + sheet-glass
- + sheet-metal
- + sheet-rglass
- + shotgun
- + shovel
- + signaler
- + silver_id
- + sl_suit
- + sodawater
- + sord
- + space-up
- + space_helmet_syndicate
- + space_mountain_wind
- + space_suit_syndicate
- + spaceclown_items
- + spacemime_items
- + spade
- + spearglass0
- + spearglass1
- + speargun
- + spickaxe
- + spoon
- + spraycan
- + staff
- + staffofchange
- + staffofhealing
- + stamp
- + starkist
- + stick
- + stool
- + straight_jacket
- + suit-command
- + suit-orange
- + sunglasses
- + swat_gl
- + swat_hel
- + swat_sh
- + swat_suit
- + sword0
- + swordblue
- + swordchain
- + swordgreen
- + swordpurple
- + swordred
- + syndballoon
- + syndicate-black
- + syndicate-black-blue
- + syndicate-black-green
- + syndicate-black-red
- + syndicate-green
- + syndicate-green-dark
- + syndicate-helm-black
- + syndicate-helm-black-blue
- + syndicate-helm-black-green
- + syndicate-helm-black-red
- + syndicate-helm-green
- + syndicate-helm-green-dark
- + syndie_hardsuit
- + syndie_helm
- + syringe_0
- + syringe_1
- + syringe_10
- + syringe_15
- + syringe_5
- + syringe_kit
- + syringegun
- + table_parts
- + taser
- + taser0
- + taser100
- + taser25
- + taser50
- + taser75
- + tdgreen
- + tdhelm
- + tdred
- + template
- + that
- + thirteen_loko
- + tile
- + tonic
- + toolbox_blue
- + toolbox_red
- + toolbox_syndi
- + toolbox_yellow
- + toxinbottle
- + toysword0
- + toysword1
- + trashbag
- + ty_necklace
- + unathiknife
- + upickaxe
- + vhammer
- + vhelmet
- + vialblue
- + vialgreen
- + videocam
- + violin
- + vox-helmet-engineer
- + vox-helmet-medical
- + vox-helmet-normal
- + vox-helmet-science
- + vox-helmet-security
- + vox-helmet-specops
- + vox-pressure-engineer
- + vox-pressure-medical
- + vox-pressure-normal
- + vox-pressure-science
- + vox-pressure-security
- + vox-pressure-specops
- + w_shoes
- + w_suit
- + waiter
- + warden
- + wcoat
- + welder
- + welder1
- + welding
- + welding-g
- + weldingoff
- + wiz_hardsuit
- + wiz_helm
- + wizhat
- + wizrobe
- + wizshoe
- + wrap_paper
- + wrench
- + xenos_helm
- + xenos_suit
- + y_suit
- + ygloves
- + zippo
- + zippoon
---- Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\left\rpd.dmi
-+++ Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\right\rpd.dmi
- + rpd
---- Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\left\swords_axes.dmi
-+++ Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\right\swords_axes.dmi
- + axe0
- + axe1
- - dualsaber0
- - dualsaber1
- - fireaxe0
- - fireaxe1
- - katana
- - scythe0
- - unathiknife
---- Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\left\vox_civvie.dmi
-+++ Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\right\vox_civvie.dmi
- + vox-pressure-security
---- Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\left\zz_old_items_lefthand.dmi
-+++ Z:\Git\Space Station 13\Baystation12\icons\mob\in-hand\right\zz_old_items_lefthand.dmi
- + DONGS
- + Gibtonite ore
- + altair_locket
- + an_tank
- + analyzer
- + armor
- + armor_reflec
- + assembly
- + atmos_gold_hardsuit
- + atmos_gold_helm
- + atmos_hardsuit
- + atmos_helm
- + atmos_suit
- + atoxinbottle
- + autoinjector
- + axe0
- + axe1
- + b_mask
- + b_shoes
- + b_shoesold
- + b_suit
- + ba_suit
- + backpack
- + balloon
- + balloon-empty
- + banana_peel
- + basketball
- + baton
- + beachball
- + beaker
- + bedsheet
- + beer
- + bgloves
- + bible
- + bike_horn
- + bio_hood
- + bio_orange
- + bio_suit
- + bl_shoes
- + bl_shoesold
- + bl_suit
- + blackskirt
- + blade
- + blindfold
- + blueprints
- + bombvest
- + brain2
- + brick
- + briefcase
- + broken_beer
- + broom
- + browncane
- + brutepack
- + bucket
- + buckler
- + bucklerOLD
- + buildpipe
- + burger
- + butch
- + butcher_knife
- + c20r
- + c_tube
- + cakehat0
- + cakehat1
- + candy
- + canister
- + caphat
- + capspacehelmet
- + capspacesuit
- + captainpack
- + card-id
- + cardborg
- + cardborg_h
- + carton
- + caution
- + ce_hardsuit
- + ce_helm
- + cell
- + centcom
- + centhat
- + cespace_helmet
- + cespace_suit
- + chain
- + chainmail
- + chef
- + chefhat
- + chickensuit
- + chips
- + cigoff
- + cigon
- + cigpacket
- + classic_baton
- + claymore
- + cleaner
- + clipboard
- + clown
- + clown_hat
- + clown_shoes
- + clownpack
- + coffee
- + coil
- + coil_blue
- + coil_cyan
- + coil_green
- + coil_orange
- + coil_pink
- + coil_red
- + coil_white
- + coil_yellow
- + cola
- + contliquid
- + contsolid
- + contvapour
- + coolant-c
- + crossbow
- + crossbow-solid
- + crowbar
- + crowbar_red
- + cueball
- + cuff_blue
- + cuff_cyan
- + cuff_green
- + cuff_orange
- + cuff_pink
- + cuff_red
- + cuff_white
- + cuff_yellow
- + cultblade
- + culthood
- + cultpack
- + cultrobes
- + cutlass0
- + cutlass1
- + cutters
- + cutters_yellow
- + daederic
- + deagleg
- + death_commando_mask
- + death_commando_suit
- + deathnettle
- + det
- + det_hat
- + det_suit
- + dg_suit
- + dnainjector
- + donut1
- + donut2
- + dpickaxe
- + dr_gibb
- + dropper
- + dualsaber0
- + dualsaber1
- + dualsaberblue1
- + dualsabergreen1
- + dualsaberpurple1
- + dualsaberrainbow1
- + dualsaberred1
- + earmuffs
- + egg
- + egg1
- + egg2
- + egg3
- + egg4
- + egg5
- + electronic
- + electropack
- + emergency
- + emergency_double
- + emergency_engi
- + emp
- + energy_drink
- + energykill
- + energykill0
- + energykill100
- + energykill25
- + energykill50
- + energykill75
- + energystun
- + energystun0
- + energystun100
- + energystun25
- + energystun50
- + energystun75
- + eng_hardsuit
- + eng_helm
- + engi_suit
- + engiepack
- + engspace_helmet
- + engspace_suit
- + eshield0
- + eshield1
- + faggot
- + fire_extinguisher
- + fire_suit
- + fireaxe0
- + fireaxe1
- + firefighter
- + firstaid
- + firstaid-advanced
- + firstaid-ointment
- + firstaid-toxin
- + flamethrower_0
- + flamethrower_1
- + flare
- + flashlight
- + foamcrossbow
- + focus
- + fr_jacket
- + g_suit
- + galoshes
- + gas_alt
- + gas_mask
- + gift
- + giftbag
- + glasses
- + gold_id
- + gpickaxe
- + greatcoat
- + greenbandana
- + gun
- + gy_suit
- + handcuff
- + harpoon
- + hatchet
- + headset
- + healthanalyzer
- + helm-command
- + helm-orange
- + helmet
- + hfrequency0
- + hfrequency1
- + hoe
- + holidaypriest
- + ice_tea_can
- + imperium_monk
- + implantcase
- + ithaqua
- + jackboots
- + jackhammer
- + janitor
- + jensencoat
- + jensensuit
- + jetpack
- + jetpack-black
- + jetpack-void
- + johnny
- + johnny_coat
- + judge
- + katana
- + kilt
- + kineticgun
- + kingyellow
- + knife
- + kobskull
- + koran
- + l6closedmag
- + l6closednomag
- + l6openmag
- + l6opennomag
- + labcoat
- + lamp
- + lampgreen
- + laser
- + latexballon
- + lawyer_black
- + lawyer_blue
- + lawyer_red
- + lb_suit
- + lemon-lime
- + lgloves
- + lipstick
- + lipstickopen
- + m_mask
- + magboots
- + medibottle
- + medical_hardsuit
- + medical_helm
- + medicalpack
- + melted
- + miniFE
- + mining_hardsuit
- + mining_helm
- + mop
- + mousetrap
- + multitool
- + muzzle
- + nazi1
- + necronomicon
- + nettle
- + newspaper
- + nothing
- + nucgun
- + nucgun0
- + nucgun100
- + nucgun25
- + nucgun50
- + nucgun75
- + nullrod
- + nun
- + nursesuit
- + o_shoes
- + o_shoes1
- + o_suit
- + ointment
- + overalls
- + owl
- + owl_mask
- + oxygen
- + oxygen-c
- + oxygen_f
- + oxygen_fr
- + p_suit
- + paintcan
- + paper
- + pen
- + pickaxe
- + pie
- + pill
- + pizzabox1
- + plantbgone
- + plasma
- + plasma-c
- + plasticbag
- + plasticx
- + pneumatic
- + pneumatic-tank
- + ppickaxe
- + prod
- + psyche
- + pulse
- + pulse0
- + pulse100
- + pulse25
- + pulse50
- + pulse75
- + purple_can
- + pwig
- + quarrel
- + r_feet
- + r_hands
- + r_head
- + r_shoes
- + r_suit
- + rack_parts
- + rad_suit
- + radio
- + rainbow
- + rcd
- + rcdammo
- + rejuvbottle
- + rev_headballoon
- + revballoon
- + rig_helm
- + rig_suit
- + riot
- + riotgun
- + ro_suit
- + rods
- + rolling_pin
- + roman_shield
- + rpd
- + rubberducky
- + s-ninja_mask
- + s-ninja_suit
- + s_helmet
- + s_mask
- + s_suit
- + santa
- + santahat
- + saw3
- + scalpel
- + scientology
- + scrapbook
- + scratch
- + screwdriver
- + screwdriver_blue
- + screwdriver_brown
- + screwdriver_cyan
- + screwdriver_green
- + screwdriver_purple
- + screwdriver_yellow
- + scythe0
- + sec-case
- + sec_hardsuit
- + sec_helm
- + secsoft
- + securitypack
- + shard-glass
- + sheet-card
- + sheet-glass
- + sheet-metal
- + sheet-rglass
- + shotgun
- + shovel
- + signaler
- + silver_id
- + sl_suit
- + sodawater
- + sord
- + space-up
- + space_helmet_syndicate
- + space_mountain_wind
- + space_suit_syndicate
- + spade
- + spearglass0
- + spearglass1
- + speargun
- + spickaxe
- + spoon
- + spraycan
- + staff
- + staffofchange
- + stamp
- + starkist
- + stick
- + stool
- + straight_jacket
- + suit-command
- + suit-orange
- + sunflower
- + sunglasses
- + swat_gl
- + swat_hel
- + swat_sh
- + swat_suit
- + sword0
- + swordblue
- + swordchain
- + swordgreen
- + swordpurple
- + swordrainbow
- + swordred
- + syndballoon
- + syndicate-black
- + syndicate-black-blue
- + syndicate-black-green
- + syndicate-black-red
- + syndicate-green
- + syndicate-green-dark
- + syndicate-helm-black
- + syndicate-helm-black-blue
- + syndicate-helm-black-green
- + syndicate-helm-black-red
- + syndicate-helm-green
- + syndicate-helm-green-dark
- + syndie_hardsuit
- + syndie_helm
- + syringe_0
- + syringe_1
- + syringe_10
- + syringe_15
- + syringe_5
- + syringe_kit
- + syringegun
- + table_parts
- + taser
- + taser0
- + taser100
- + taser25
- + taser50
- + taser75
- + tdgreen
- + tdhelm
- + tdred
- + template
- + that
- + thirteen_loko
- + tile
- + tonic
- + toolbox_blue
- + toolbox_red
- + toolbox_syndi
- + toolbox_yellow
- + toxinbottle
- + toysword0
- + toysword1
- + trashbag
- + ty_necklace
- + unathiknife
- + upickaxe
- + vhammer
- + vhelmet
- + vialblue
- + vialgreen
- + violin
- + vox-helmet-engineer
- + vox-helmet-medical
- + vox-helmet-normal
- + vox-helmet-science
- + vox-helmet-security
- + vox-helmet-specops
- + vox-pressure-engineer
- + vox-pressure-medical
- + vox-pressure-normal
- + vox-pressure-science
- + vox-pressure-security
- + vox-pressure-specops
- + w_shoes
- + w_suit
- + waiter
- + warden
- + wcoat
- + welder
- + welder1
- + welding
- + welding-g
- + weldingoff
- + wiz_hardsuit
- + wiz_helm
- + wizhat
- + wizrobe
- + wizshoe
- + wrap_paper
- + wrench
- + xenos_helm
- + xenos_suit
- + y_suit
- + ygloves
- + zippo
- + zippoon
\ No newline at end of file
diff --git a/icons/mob/in-hand/left/ambassdor_left.dmi b/icons/mob/in-hand/left/ambassdor_left.dmi
deleted file mode 100644
index c22038170dd..00000000000
Binary files a/icons/mob/in-hand/left/ambassdor_left.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/left/cable_stuff.dmi b/icons/mob/in-hand/left/cable_stuff.dmi
deleted file mode 100644
index 9740e45aef6..00000000000
Binary files a/icons/mob/in-hand/left/cable_stuff.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/left/clownwiz.dmi b/icons/mob/in-hand/left/clownwiz.dmi
deleted file mode 100644
index 7bfb9c487d0..00000000000
Binary files a/icons/mob/in-hand/left/clownwiz.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/left/flags_left.dmi b/icons/mob/in-hand/left/flags_left.dmi
deleted file mode 100644
index 5e52befdc7b..00000000000
Binary files a/icons/mob/in-hand/left/flags_left.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/left/guns.dmi b/icons/mob/in-hand/left/guns.dmi
deleted file mode 100644
index 59f5941fbd6..00000000000
Binary files a/icons/mob/in-hand/left/guns.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/left/paradise_items_lefthand.dmi b/icons/mob/in-hand/left/paradise_items_lefthand.dmi
deleted file mode 100644
index fd773f32b77..00000000000
Binary files a/icons/mob/in-hand/left/paradise_items_lefthand.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/left/plasmen.dmi b/icons/mob/in-hand/left/plasmen.dmi
deleted file mode 100644
index 865f9c8bb69..00000000000
Binary files a/icons/mob/in-hand/left/plasmen.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/left/rpd.dmi b/icons/mob/in-hand/left/rpd.dmi
deleted file mode 100644
index 52a669782f7..00000000000
Binary files a/icons/mob/in-hand/left/rpd.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/left/sheets.dmi b/icons/mob/in-hand/left/sheets.dmi
deleted file mode 100644
index 2438bcecfbb..00000000000
Binary files a/icons/mob/in-hand/left/sheets.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/left/swords_axes.dmi b/icons/mob/in-hand/left/swords_axes.dmi
deleted file mode 100644
index 87e689a4129..00000000000
Binary files a/icons/mob/in-hand/left/swords_axes.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/left/temperature_gun.dmi b/icons/mob/in-hand/left/temperature_gun.dmi
deleted file mode 100644
index e6c0165fd6a..00000000000
Binary files a/icons/mob/in-hand/left/temperature_gun.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/left/vox_civvie.dmi b/icons/mob/in-hand/left/vox_civvie.dmi
deleted file mode 100644
index 92bd09cb949..00000000000
Binary files a/icons/mob/in-hand/left/vox_civvie.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/left/zz_old_items_lefthand.dmi b/icons/mob/in-hand/left/zz_old_items_lefthand.dmi
deleted file mode 100644
index e6e6cf33f76..00000000000
Binary files a/icons/mob/in-hand/left/zz_old_items_lefthand.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/medkits.dmi b/icons/mob/in-hand/medkits.dmi
deleted file mode 100644
index 548bb79cf42..00000000000
Binary files a/icons/mob/in-hand/medkits.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/paiheld.dmi b/icons/mob/in-hand/paiheld.dmi
deleted file mode 100644
index fe50e96da35..00000000000
Binary files a/icons/mob/in-hand/paiheld.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/right/ambassador_right.dmi b/icons/mob/in-hand/right/ambassador_right.dmi
deleted file mode 100644
index c22038170dd..00000000000
Binary files a/icons/mob/in-hand/right/ambassador_right.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/right/cable_stuff.dmi b/icons/mob/in-hand/right/cable_stuff.dmi
deleted file mode 100644
index 61e7d8d99f1..00000000000
Binary files a/icons/mob/in-hand/right/cable_stuff.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/right/clownwiz.dmi b/icons/mob/in-hand/right/clownwiz.dmi
deleted file mode 100644
index f9dcdf15497..00000000000
Binary files a/icons/mob/in-hand/right/clownwiz.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/right/flags_right.dmi b/icons/mob/in-hand/right/flags_right.dmi
deleted file mode 100644
index 5b99e9aa0a5..00000000000
Binary files a/icons/mob/in-hand/right/flags_right.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/right/guns.dmi b/icons/mob/in-hand/right/guns.dmi
deleted file mode 100644
index 53867b4e48a..00000000000
Binary files a/icons/mob/in-hand/right/guns.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/right/paradise_items_righthand.dmi b/icons/mob/in-hand/right/paradise_items_righthand.dmi
deleted file mode 100644
index b02f6804054..00000000000
Binary files a/icons/mob/in-hand/right/paradise_items_righthand.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/right/plasmen.dmi b/icons/mob/in-hand/right/plasmen.dmi
deleted file mode 100644
index b24d95d5cf4..00000000000
Binary files a/icons/mob/in-hand/right/plasmen.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/right/sheets.dmi b/icons/mob/in-hand/right/sheets.dmi
deleted file mode 100644
index bf5955d7f8b..00000000000
Binary files a/icons/mob/in-hand/right/sheets.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/right/swords_axes.dmi b/icons/mob/in-hand/right/swords_axes.dmi
deleted file mode 100644
index dcdf81c1f3e..00000000000
Binary files a/icons/mob/in-hand/right/swords_axes.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/right/temperature_gun.dmi b/icons/mob/in-hand/right/temperature_gun.dmi
deleted file mode 100644
index 7566067ae09..00000000000
Binary files a/icons/mob/in-hand/right/temperature_gun.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/right/vox_civvie.dmi b/icons/mob/in-hand/right/vox_civvie.dmi
deleted file mode 100644
index efbe096f3be..00000000000
Binary files a/icons/mob/in-hand/right/vox_civvie.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/right/zz_old_items_righthand.dmi b/icons/mob/in-hand/right/zz_old_items_righthand.dmi
deleted file mode 100644
index 30b01b63d4a..00000000000
Binary files a/icons/mob/in-hand/right/zz_old_items_righthand.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/spells.dmi b/icons/mob/in-hand/spells.dmi
deleted file mode 100644
index dae92759cc6..00000000000
Binary files a/icons/mob/in-hand/spells.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/ss13_makeinhands.py b/icons/mob/in-hand/ss13_makeinhands.py
deleted file mode 100644
index 84d62088588..00000000000
--- a/icons/mob/in-hand/ss13_makeinhands.py
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env python
-'''
-Run within icons/mob/in-hand.
-
-Usage:
- $ cd icons/mob/in-hands
- $ python ss13_makeinhands.py
-
-ss13_makeinhands.py - Generates a large DMI from several smaller DMIs.
- Specifically used for making icons/mob/items_(left|right)hand.dmi
-
-Copyright 2013 Rob "N3X15" Nelson
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-'''
-import os, sys, logging
-
-ToBuild = {
-# ' file to build': 'directory to pull from/',
- '../items_lefthand.dmi': 'left/',
- '../items_righthand.dmi': 'right/'
-}
-
-# Tell Python where to find BYONDTools.
-# Assuming we're in icons/mob/in-hand
-sys.path.append('../../../tools/BYONDTools') # For byond
-sys.path.append('../../../tools/BYONDTools/scripts') # For dmi
-
-from byond.DMI import DMI
-from dmi import compare_all
-
-def buildDMI(directory, output):
- dmi = DMI(output)
- logging.info('Creating {0}...'.format(output))
- for root, _, files in os.walk(directory):
- for filename in files:
- if filename.endswith('.dmi') and not filename.endswith('.new.dmi'):
- filepath = os.path.join(root, filename)
- logging.info('Adding {0}...'.format(filename, output))
- subdmi = DMI(filepath)
- subdmi.loadAll()
- if subdmi.icon_height != 32 or subdmi.icon_width != 32:
- logging.warn('Skipping {0} - Invalid icon size.'.format(filepath))
- changes = 0
- for state_name in subdmi.states:
- if state_name in dmi.states:
- logging.warn('Skipping state {0}:{1} - State exists.'.format(filepath, subdmi.states[state_name].displayName()))
- continue
- dmi.states[state_name] = subdmi.states[state_name]
- changes += 1
- logging.info('Added {0} states.'.format(changes))
- # save
- logging.info('Saving {0} states to {1}...'.format(len(dmi.states), output))
- dmi.save(output)
-
-if __name__ == '__main__':
- logging.basicConfig(
- format='%(asctime)s [%(levelname)-8s]: %(message)s',
- datefmt='%m/%d/%Y %I:%M:%S %p',
- level=logging.INFO # ,
- # filename='logs/main.log',
- # filemode='w'
- )
- # Cheating, but useful for checking for unsync'd stuff
- compare_all('left/', 'right/', 'in-hand_sync_report.txt', None, newfile_theirs=False, newfile_mine=False, check_changed=False)
- for output, input_dir in ToBuild.items():
- buildDMI(input_dir, output)
diff --git a/icons/mob/in-hand/staff.dmi b/icons/mob/in-hand/staff.dmi
deleted file mode 100644
index a3e70edfb04..00000000000
Binary files a/icons/mob/in-hand/staff.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/swords.dmi b/icons/mob/in-hand/swords.dmi
deleted file mode 100644
index 041632b0d06..00000000000
Binary files a/icons/mob/in-hand/swords.dmi and /dev/null differ
diff --git a/icons/mob/in-hand/tools.dmi b/icons/mob/in-hand/tools.dmi
deleted file mode 100644
index 81f3aa57f46..00000000000
Binary files a/icons/mob/in-hand/tools.dmi and /dev/null differ
diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi
new file mode 100644
index 00000000000..6240b158977
Binary files /dev/null and b/icons/mob/inhands/clothing_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi
new file mode 100644
index 00000000000..e47cb6b7e29
Binary files /dev/null and b/icons/mob/inhands/clothing_righthand.dmi differ
diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi
new file mode 100644
index 00000000000..10f6f85043b
Binary files /dev/null and b/icons/mob/inhands/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/guns_righthand.dmi b/icons/mob/inhands/guns_righthand.dmi
new file mode 100644
index 00000000000..6cdf55064fb
Binary files /dev/null and b/icons/mob/inhands/guns_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
new file mode 100644
index 00000000000..2e0181bab59
Binary files /dev/null and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
new file mode 100644
index 00000000000..aa1bb8522af
Binary files /dev/null and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi
deleted file mode 100644
index 20568f14f62..00000000000
Binary files a/icons/mob/items_lefthand.dmi and /dev/null differ
diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi
deleted file mode 100644
index ce11d1d1b02..00000000000
Binary files a/icons/mob/items_righthand.dmi and /dev/null differ
diff --git a/icons/mob/vox.dmi b/icons/mob/vox.dmi
index 7fb96c61826..0cf31d449f2 100644
Binary files a/icons/mob/vox.dmi and b/icons/mob/vox.dmi differ