diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm
index 3c064dc4965..d2f43e6dcbc 100644
--- a/_maps/RandomZLevels/TheBeach.dmm
+++ b/_maps/RandomZLevels/TheBeach.dmm
@@ -368,7 +368,7 @@
"bA" = (
/obj/structure{
desc = "Bar and beach south, dorms east.";
- icon = 'icons/obj/stationobjs.dmi';
+ icon = 'icons/obj/fluff/general.dmi';
icon_state = "signpost";
name = "directions signpost"
},
diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm
index a99c0b174a5..1e92e28d7ed 100644
--- a/_maps/map_files/Birdshot/birdshot.dmm
+++ b/_maps/map_files/Birdshot/birdshot.dmm
@@ -31929,7 +31929,7 @@
dir = 9
},
/obj/structure/rack{
- icon = 'icons/obj/stationobjs.dmi';
+ icon = 'icons/obj/fluff/general.dmi';
icon_state = "minibar";
name = "skeletal minibar"
},
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 9a4bfcc2856..f1e24677530 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -50244,7 +50244,7 @@
/area/station/cargo/miningoffice)
"sfO" = (
/obj/structure/rack{
- icon = 'icons/obj/stationobjs.dmi';
+ icon = 'icons/obj/fluff/general.dmi';
icon_state = "minibar";
name = "skeletal minibar"
},
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index 0c3106bb683..e8eb73bbefd 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -31978,7 +31978,7 @@
/obj/structure/window/spawner/directional/north,
/obj/item/paper{
default_raw_text = "A crude mapping of the station layout based on leaked internal documents and orbital snapshots taken during construction. I'm not sure how up-to-date this is anymore..";
- icon = 'icons/obj/objects.dmi';
+ icon = 'icons/obj/scrolls.dmi';
icon_state = "blueprints";
inhand_icon_state = "blueprints";
name = "station layout"
diff --git a/_maps/shuttles/emergency_cruise.dmm b/_maps/shuttles/emergency_cruise.dmm
index dba347439d1..500f610a8cb 100644
--- a/_maps/shuttles/emergency_cruise.dmm
+++ b/_maps/shuttles/emergency_cruise.dmm
@@ -760,7 +760,7 @@
"Sp" = (
/obj/structure{
desc = "A jukebox for playing music. Seems like it ran out of charge.";
- icon = 'icons/obj/stationobjs.dmi';
+ icon = 'icons/obj/machines/basic_machines.dmi';
icon_state = "jukebox";
name = "jukebox"
},
diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm
index cfca34d0f95..3bdc5b77d02 100644
--- a/_maps/shuttles/emergency_monastery.dmm
+++ b/_maps/shuttles/emergency_monastery.dmm
@@ -2443,7 +2443,7 @@
/area/shuttle/escape)
"Ju" = (
/obj/structure/rack{
- icon = 'icons/obj/stationobjs.dmi';
+ icon = 'icons/obj/fluff/general.dmi';
icon_state = "minibar";
name = "skeletal minibar"
},
diff --git a/_maps/shuttles/pirate_dutchman.dmm b/_maps/shuttles/pirate_dutchman.dmm
index 7d1d8efe04c..9ea233ca568 100644
--- a/_maps/shuttles/pirate_dutchman.dmm
+++ b/_maps/shuttles/pirate_dutchman.dmm
@@ -581,7 +581,7 @@
},
/obj/machinery/light/floor,
/obj/structure/rack{
- icon = 'icons/obj/stationobjs.dmi';
+ icon = 'icons/obj/fluff/general.dmi';
icon_state = "minibar";
name = "skeletal minibar"
},
@@ -870,7 +870,7 @@
dir = 8
},
/obj/structure/rack{
- icon = 'icons/obj/stationobjs.dmi';
+ icon = 'icons/obj/fluff/general.dmi';
icon_state = "minibar";
name = "skeletal minibar"
},
diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm
index 624cf560f64..3de27ee7e10 100644
--- a/code/_onclick/telekinesis.dm
+++ b/code/_onclick/telekinesis.dm
@@ -93,7 +93,7 @@
/obj/item/tk_grab
name = "Telekinetic Grab"
desc = "Magic"
- icon = 'icons/obj/magic.dmi'//Needs sprites
+ icon = 'icons/effects/magic.dmi'//Needs sprites
icon_state = "2"
item_flags = NOBLUDGEON | ABSTRACT | DROPDEL
//inhand_icon_state = null
diff --git a/code/datums/actions/mobs/fire_breath.dm b/code/datums/actions/mobs/fire_breath.dm
index 57962035a24..1cc830e6de1 100644
--- a/code/datums/actions/mobs/fire_breath.dm
+++ b/code/datums/actions/mobs/fire_breath.dm
@@ -1,6 +1,6 @@
/datum/action/cooldown/mob_cooldown/fire_breath
name = "Fire Breath"
- button_icon = 'icons/obj/wizard.dmi'
+ button_icon = 'icons/effects/magic.dmi'
button_icon_state = "fireball"
desc = "Allows you to shoot fire towards a target."
cooldown_time = 3 SECONDS
diff --git a/code/datums/components/anti_magic.dm b/code/datums/components/anti_magic.dm
index c5c672e6ce4..fb3ab13209f 100644
--- a/code/datums/components/anti_magic.dm
+++ b/code/datums/components/anti_magic.dm
@@ -117,7 +117,7 @@
span_warning("[user] starts to glow as [visible_subject] emits a halo of light!"),
span_userdanger("A feeling of warmth washes over [self_subject] as rays of light surround your body and protect you!"),
)
- antimagic_effect = mutable_appearance('icons/effects/genetics.dmi', "servitude", -MUTATIONS_LAYER)
+ antimagic_effect = mutable_appearance('icons/mob/effects/genetics.dmi', "servitude", -MUTATIONS_LAYER)
antimagic_color = LIGHT_COLOR_HOLY_MAGIC
playsound(user, 'sound/magic/magic_block_holy.ogg', 50, TRUE)
else if(casted_magic_flags & antimagic_flags & MAGIC_RESISTANCE_MIND)
@@ -125,7 +125,7 @@
span_warning("[user] forehead shines as [visible_subject] repulses magic from their mind!"),
span_userdanger("A feeling of cold splashes on [self_subject] as your forehead reflects magic usering your mind!"),
)
- antimagic_effect = mutable_appearance('icons/effects/genetics.dmi', "telekinesishead", MOB_SHIELD_LAYER)
+ antimagic_effect = mutable_appearance('icons/mob/effects/genetics.dmi', "telekinesishead", MOB_SHIELD_LAYER)
antimagic_color = LIGHT_COLOR_DARK_BLUE
playsound(user, 'sound/magic/magic_block_mind.ogg', 50, TRUE)
diff --git a/code/datums/components/pet_commands/pet_commands_basic.dm b/code/datums/components/pet_commands/pet_commands_basic.dm
index a562c116843..fb6dde9bc8d 100644
--- a/code/datums/components/pet_commands/pet_commands_basic.dm
+++ b/code/datums/components/pet_commands/pet_commands_basic.dm
@@ -7,7 +7,7 @@
/datum/pet_command/idle
command_name = "Stay"
command_desc = "Command your pet to stay idle in this location."
- radial_icon = 'icons/obj/objects.dmi'
+ radial_icon = 'icons/obj/bed.dmi'
radial_icon_state = "dogbed"
speech_commands = list("sit", "stay", "stop")
command_feedback = "sits"
diff --git a/code/datums/components/sizzle.dm b/code/datums/components/sizzle.dm
index 5ddc0a687d7..2922e3ff6da 100644
--- a/code/datums/components/sizzle.dm
+++ b/code/datums/components/sizzle.dm
@@ -19,7 +19,7 @@
var/atom/food = parent
var/icon/grill_marks = icon(food.icon, food.icon_state)
grill_marks.Blend("#fff", ICON_ADD) //fills the icon_state with white (except where it's transparent)
- grill_marks.Blend(icon('icons/obj/kitchen.dmi', "grillmarks"), ICON_MULTIPLY) //adds grill marks and the remaining white areas become transparent
+ grill_marks.Blend(icon('icons/obj/machines/kitchenmachines.dmi', "grillmarks"), ICON_MULTIPLY) //adds grill marks and the remaining white areas become transparent
sizzling = new(grill_marks)
sizzling.alpha = sizzlealpha
food.add_overlay(sizzling)
diff --git a/code/datums/greyscale/config_types/greyscale_configs/greyscale_objects.dm b/code/datums/greyscale/config_types/greyscale_configs/greyscale_objects.dm
index 25fc73e48d0..86f9b55fb6d 100644
--- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_objects.dm
+++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_objects.dm
@@ -9,27 +9,27 @@
/datum/greyscale_config/bench_solo
name = "Bench Solo"
- icon_file = 'icons/obj/sofa.dmi'
+ icon_file = 'icons/obj/chairs_wide.dmi'
json_config = 'code/datums/greyscale/json_configs/bench_solo.json'
/datum/greyscale_config/bench_middle
name = "Bench Middle"
- icon_file = 'icons/obj/sofa.dmi'
+ icon_file = 'icons/obj/chairs_wide.dmi'
json_config = 'code/datums/greyscale/json_configs/bench_middle.json'
/datum/greyscale_config/bench_left
name = "Bench Left"
- icon_file = 'icons/obj/sofa.dmi'
+ icon_file = 'icons/obj/chairs_wide.dmi'
json_config = 'code/datums/greyscale/json_configs/bench_left.json'
/datum/greyscale_config/bench_right
name = "Bench Right"
- icon_file = 'icons/obj/sofa.dmi'
+ icon_file = 'icons/obj/chairs_wide.dmi'
json_config = 'code/datums/greyscale/json_configs/bench_right.json'
/datum/greyscale_config/bench_corner
name = "Bench Corner"
- icon_file = 'icons/obj/sofa.dmi'
+ icon_file = 'icons/obj/chairs_wide.dmi'
json_config = 'code/datums/greyscale/json_configs/bench_corner.json'
//
diff --git a/code/datums/materials/_material.dm b/code/datums/materials/_material.dm
index b062651b893..5b07d0fec9f 100644
--- a/code/datums/materials/_material.dm
+++ b/code/datums/materials/_material.dm
@@ -64,7 +64,7 @@ Simple datum which is instanced once per type and is used for every object of sa
id = type
if(texture_layer_icon_state)
- cached_texture_filter_icon = icon('icons/materials/composite.dmi', texture_layer_icon_state)
+ cached_texture_filter_icon = icon('icons/turf/composite.dmi', texture_layer_icon_state)
return TRUE
diff --git a/code/datums/mutations/adaptation.dm b/code/datums/mutations/adaptation.dm
index 7fd90326c00..1c183f9367d 100644
--- a/code/datums/mutations/adaptation.dm
+++ b/code/datums/mutations/adaptation.dm
@@ -10,7 +10,7 @@
/datum/mutation/human/temperature_adaptation/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
..()
if(!(type in visual_indicators))
- visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "fire", -MUTATIONS_LAYER))
+ visual_indicators[type] = list(mutable_appearance('icons/mob/effects/genetics.dmi', "fire", -MUTATIONS_LAYER))
/datum/mutation/human/temperature_adaptation/get_visual_indicator()
return visual_indicators[type][1]
@@ -37,7 +37,7 @@
/datum/mutation/human/pressure_adaptation/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
..()
if(!(type in visual_indicators))
- visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "pressure", -MUTATIONS_LAYER))
+ visual_indicators[type] = list(mutable_appearance('icons/mob/effects/genetics.dmi', "pressure", -MUTATIONS_LAYER))
/datum/mutation/human/pressure_adaptation/get_visual_indicator()
return visual_indicators[type][1]
diff --git a/code/datums/mutations/antenna.dm b/code/datums/mutations/antenna.dm
index 21fc6d402ec..bc5026ab148 100644
--- a/code/datums/mutations/antenna.dm
+++ b/code/datums/mutations/antenna.dm
@@ -35,7 +35,7 @@
/datum/mutation/human/antenna/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
..()
if(!(type in visual_indicators))
- visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "antenna", -FRONT_MUTATIONS_LAYER+1))//-MUTATIONS_LAYER+1
+ visual_indicators[type] = list(mutable_appearance('icons/mob/effects/genetics.dmi', "antenna", -FRONT_MUTATIONS_LAYER+1))//-MUTATIONS_LAYER+1
/datum/mutation/human/antenna/get_visual_indicator()
return visual_indicators[type][1]
@@ -126,7 +126,7 @@
/datum/mutation/human/mindreader/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
..()
if(!(type in visual_indicators))
- visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "antenna", -FRONT_MUTATIONS_LAYER+1))
+ visual_indicators[type] = list(mutable_appearance('icons/mob/effects/genetics.dmi', "antenna", -FRONT_MUTATIONS_LAYER+1))
/datum/mutation/human/mindreader/get_visual_indicator()
return visual_indicators[type][1]
diff --git a/code/datums/mutations/radioactive.dm b/code/datums/mutations/radioactive.dm
index 4f1edf721ed..8f710bfa497 100644
--- a/code/datums/mutations/radioactive.dm
+++ b/code/datums/mutations/radioactive.dm
@@ -12,7 +12,7 @@
/datum/mutation/human/radioactive/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
. = ..()
if(!(type in visual_indicators))
- visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "radiation", -MUTATIONS_LAYER))
+ visual_indicators[type] = list(mutable_appearance('icons/mob/effects/genetics.dmi', "radiation", -MUTATIONS_LAYER))
/datum/mutation/human/radioactive/get_visual_indicator()
return visual_indicators[type][1]
diff --git a/code/datums/mutations/sight.dm b/code/datums/mutations/sight.dm
index cfe2b71f6d5..7ae21f84b79 100644
--- a/code/datums/mutations/sight.dm
+++ b/code/datums/mutations/sight.dm
@@ -140,7 +140,7 @@
/datum/mutation/human/laser_eyes/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
..()
if(!(type in visual_indicators))
- visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "lasereyes", -FRONT_MUTATIONS_LAYER))
+ visual_indicators[type] = list(mutable_appearance('icons/mob/effects/genetics.dmi', "lasereyes", -FRONT_MUTATIONS_LAYER))
/datum/mutation/human/laser_eyes/on_acquiring(mob/living/carbon/human/H)
. = ..()
@@ -176,7 +176,7 @@
///Projectile type used by laser eyes
/obj/projectile/beam/laser_eyes
name = "beam"
- icon = 'icons/effects/genetics.dmi'
+ icon = 'icons/mob/effects/genetics.dmi'
icon_state = "eyelasers"
/datum/mutation/human/illiterate
diff --git a/code/datums/mutations/telekinesis.dm b/code/datums/mutations/telekinesis.dm
index b06ac8139ed..53d8beb56ff 100644
--- a/code/datums/mutations/telekinesis.dm
+++ b/code/datums/mutations/telekinesis.dm
@@ -13,7 +13,7 @@
/datum/mutation/human/telekinesis/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
..()
if(!(type in visual_indicators))
- visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "telekinesishead", -MUTATIONS_LAYER))
+ visual_indicators[type] = list(mutable_appearance('icons/mob/effects/genetics.dmi', "telekinesishead", -MUTATIONS_LAYER))
/datum/mutation/human/telekinesis/on_acquiring(mob/living/carbon/human/H)
. = ..()
diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index 3f4ba46e4c8..b278fab885e 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -86,7 +86,7 @@
*/
/obj/machinery
name = "machinery"
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
desc = "Some kind of machine."
verb_say = "beeps"
verb_yell = "blares"
diff --git a/code/game/machinery/botlaunchpad.dm b/code/game/machinery/botlaunchpad.dm
index 6ff39e3960b..f6fd5843244 100644
--- a/code/game/machinery/botlaunchpad.dm
+++ b/code/game/machinery/botlaunchpad.dm
@@ -1,7 +1,7 @@
/obj/machinery/botpad
name = "Bot pad"
desc = "A lighter version of the orbital mech pad modified to launch bots. Requires linking to a remote to function."
- icon = 'icons/obj/telescience.dmi'
+ icon = 'icons/obj/machines/telepad.dmi'
icon_state = "botpad"
circuit = /obj/item/circuitboard/machine/botpad
// ID of the console, used for linking up
diff --git a/code/game/machinery/civilian_bounties.dm b/code/game/machinery/civilian_bounties.dm
index 1953a7f0c32..01565b0d98e 100644
--- a/code/game/machinery/civilian_bounties.dm
+++ b/code/game/machinery/civilian_bounties.dm
@@ -364,7 +364,7 @@
/obj/item/civ_bounty_beacon
name = "civilian bounty beacon"
desc = "N.T. approved civilian bounty beacon, toss it down and you will have a bounty pad and computer delivered to you."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "floor_beacon"
var/uses = 2
diff --git a/code/game/machinery/computer/atmos_computers/_air_sensor.dm b/code/game/machinery/computer/atmos_computers/_air_sensor.dm
index 1436e1a9267..a34ffedac0b 100644
--- a/code/game/machinery/computer/atmos_computers/_air_sensor.dm
+++ b/code/game/machinery/computer/atmos_computers/_air_sensor.dm
@@ -2,7 +2,7 @@
/// These always hook to monitors, be mindful of them
/obj/machinery/air_sensor
name = "gas sensor"
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/wallmounts.dmi'
icon_state = "gsensor1"
resistance_flags = FIRE_PROOF
power_channel = AREA_USAGE_ENVIRON
@@ -123,7 +123,7 @@
/obj/item/air_sensor
name = "Air Sensor"
desc = "A device designed to detect gases and their concentration in an area."
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/wallmounts.dmi'
icon_state = "gsensor0"
custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT)
/// The injector linked with this sensor
diff --git a/code/game/machinery/computer/telescreen.dm b/code/game/machinery/computer/telescreen.dm
index 9824448de53..1642195ffb6 100644
--- a/code/game/machinery/computer/telescreen.dm
+++ b/code/game/machinery/computer/telescreen.dm
@@ -1,7 +1,7 @@
/obj/machinery/computer/security/telescreen
name = "\improper Telescreen"
desc = "Used for watching an empty arena."
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/wallmounts.dmi'
icon_state = "telescreen"
icon_keyboard = null
icon_screen = null
@@ -16,7 +16,7 @@
/obj/item/wallframe/telescreen
name = "telescreen frame"
desc = "A wall-mountable telescreen frame. Apply to wall to use."
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/wallmounts.dmi'
icon_state = "telescreen"
result_path = /obj/machinery/computer/security/telescreen
pixel_shift = 32
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index 920fa928160..b62060c6a6e 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -1,7 +1,7 @@
/obj/structure/frame
name = "frame"
desc = "A generic looking construction frame. One day this will be something greater."
- icon = 'icons/obj/stock_parts.dmi'
+ icon = 'icons/obj/assemblies/stock_parts.dmi'
icon_state = "box_0"
density = TRUE
max_integrity = 250
diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm
index 1c9a8cee4cf..055c4613033 100644
--- a/code/game/machinery/dance_machine.dm
+++ b/code/game/machinery/dance_machine.dm
@@ -1,7 +1,7 @@
/obj/machinery/jukebox
name = "jukebox"
desc = "A classic music player."
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "jukebox"
verb_say = "states"
density = TRUE
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index e19e0e24d04..e4d01a6aa36 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -133,7 +133,7 @@
/obj/structure/barricade/security
name = "security barrier"
desc = "A deployable barrier. Provides good cover in fire fights."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "barrier0"
density = FALSE
anchored = FALSE
diff --git a/code/game/machinery/dish_drive.dm b/code/game/machinery/dish_drive.dm
index 3f64171fd2c..77918c72b11 100644
--- a/code/game/machinery/dish_drive.dm
+++ b/code/game/machinery/dish_drive.dm
@@ -3,7 +3,7 @@
desc = "A culinary marvel that uses matter-to-energy conversion to store dishes and shards. Convenient! \
Additional features include a vacuum function to suck in nearby dishes, and an automatic transfer beam that empties its contents into nearby disposal bins every now and then. \
Or you can just drop your plates on the floor, like civilized folk."
- icon = 'icons/obj/kitchen.dmi'
+ icon = 'icons/obj/machines/kitchenmachines.dmi'
icon_state = "synthesizer"
active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 0.04
density = FALSE
diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm
index 20e8fd832ae..6d7087ce3ca 100644
--- a/code/game/machinery/droneDispenser.dm
+++ b/code/game/machinery/droneDispenser.dm
@@ -108,7 +108,7 @@
/obj/machinery/drone_dispenser/hivebot
name = "hivebot fabricator"
desc = "A large, bulky machine that whirs with activity, steam hissing from vents in its sides."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "hivebot_fab"
icon_off = "hivebot_fab"
icon_on = "hivebot_fab"
diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm
index 2bb5a594780..30dbb8bf726 100644
--- a/code/game/machinery/flasher.dm
+++ b/code/game/machinery/flasher.dm
@@ -3,7 +3,7 @@
/obj/machinery/flasher
name = "mounted flash"
desc = "A wall-mounted flashbulb device."
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/wallmounts.dmi'
icon_state = "mflash1"
base_icon_state = "mflash"
max_integrity = 250
@@ -159,6 +159,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/flasher, 26)
/obj/machinery/flasher/portable //Portable version of the flasher. Only flashes when anchored
name = "portable flasher"
desc = "A portable flashing device. Wrench to activate and deactivate. Cannot detect slow movements."
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "pflash1-p"
base_icon_state = "pflash"
strength = 8 SECONDS
@@ -208,7 +209,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/flasher, 26)
/obj/item/wallframe/flasher
name = "mounted flash frame"
desc = "Used for building wall-mounted flashers."
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/wallmounts.dmi'
icon_state = "mflash_frame"
result_path = /obj/machinery/flasher
var/id = null
diff --git a/code/game/machinery/gigabeacon.dm b/code/game/machinery/gigabeacon.dm
index 76df121cc99..c7e151dadef 100644
--- a/code/game/machinery/gigabeacon.dm
+++ b/code/game/machinery/gigabeacon.dm
@@ -1,6 +1,6 @@
/obj/machinery/bluespace_beacon
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "floor_beaconf"
name = "bluespace gigabeacon"
desc = "A device that draws power from bluespace and creates a permanent tracking beacon."
diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm
index 6f2fb64aaa9..97bf4126d30 100644
--- a/code/game/machinery/igniter.dm
+++ b/code/game/machinery/igniter.dm
@@ -1,7 +1,7 @@
/obj/machinery/igniter
name = "igniter"
desc = "It's useful for igniting plasma."
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "igniter0"
base_icon_state = "igniter"
plane = FLOOR_PLANE
@@ -134,7 +134,7 @@
/obj/item/wallframe/sparker
name = "Sparker WallFrame"
desc = "An unmounted sparker. Attach it to a wall to use."
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/wallmounts.dmi'
icon_state = "migniter"
result_path = /obj/machinery/sparker
pixel_shift = 26
@@ -142,7 +142,7 @@
/obj/machinery/sparker
name = "mounted igniter"
desc = "A wall-mounted ignition device."
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/wallmounts.dmi'
icon_state = "migniter"
base_icon_state = "migniter"
resistance_flags = FIRE_PROOF
diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm
index c1d87cc2605..97f0d3d487a 100644
--- a/code/game/machinery/launch_pad.dm
+++ b/code/game/machinery/launch_pad.dm
@@ -3,7 +3,7 @@
/obj/machinery/launchpad
name = "bluespace launchpad"
desc = "A bluespace pad able to thrust matter through bluespace, teleporting it to or from nearby locations."
- icon = 'icons/obj/telescience.dmi'
+ icon = 'icons/obj/machines/telepad.dmi'
icon_state = "lpad-idle"
active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 2.5
hud_possible = list(DIAG_LAUNCHPAD_HUD)
diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm
index 9c65fceb11c..28afff8f50b 100644
--- a/code/game/machinery/mass_driver.dm
+++ b/code/game/machinery/mass_driver.dm
@@ -1,7 +1,7 @@
/obj/machinery/mass_driver
name = "mass driver"
desc = "The finest in spring-loaded piston toy technology, now on a space station near you."
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "mass_driver"
var/power = 1
var/code = 1
diff --git a/code/game/machinery/mechlaunchpad.dm b/code/game/machinery/mechlaunchpad.dm
index 3061372dd87..306ee2be9ed 100644
--- a/code/game/machinery/mechlaunchpad.dm
+++ b/code/game/machinery/mechlaunchpad.dm
@@ -1,7 +1,7 @@
/obj/machinery/mechpad
name = "orbital mech pad"
desc = "A slab of heavy plating designed to withstand orbital-drop impacts. Through some sort of advanced bluespace tech, this one seems able to send and receive Mechs. Requires linking to a console to function."
- icon = 'icons/obj/telescience.dmi'
+ icon = 'icons/obj/machines/telepad.dmi'
icon_state = "mechpad"
circuit = /obj/item/circuitboard/machine/mechpad
///ID of the console, used for linking up
diff --git a/code/game/machinery/modular_shield.dm b/code/game/machinery/modular_shield.dm
index 44390766ef2..3f08760166a 100644
--- a/code/game/machinery/modular_shield.dm
+++ b/code/game/machinery/modular_shield.dm
@@ -380,7 +380,7 @@
name = "Modular Shield Debugger" //Filler name and sprite for testing
desc = "This is filler for testing you shouldn`t see this."
- icon = 'icons/mecha/mech_bay.dmi'
+ icon = 'icons/obj/machines/mech_bay.dmi'
icon_state = "recharge_port"
density = TRUE
diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm
index bc7ff6efa6e..e259cc09185 100644
--- a/code/game/machinery/navbeacon.dm
+++ b/code/game/machinery/navbeacon.dm
@@ -3,7 +3,7 @@
/obj/machinery/navbeacon
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "navbeacon0"
name = "navigation beacon"
desc = "A radio beacon used for bot navigation."
diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm
index 6d4a2c58b5f..e831bbef198 100644
--- a/code/game/machinery/pipe/pipe_dispenser.dm
+++ b/code/game/machinery/pipe/pipe_dispenser.dm
@@ -4,7 +4,7 @@
/obj/machinery/pipedispenser
name = "pipe dispenser"
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "pipe_d"
desc = "Dispenses countless types of pipes. Very useful if you need pipes."
density = TRUE
@@ -177,7 +177,7 @@
/obj/machinery/pipedispenser/disposal
name = "disposal pipe dispenser"
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "pipe_d"
desc = "Dispenses pipes that will ultimately be used to move trash around."
density = TRUE
@@ -205,7 +205,7 @@
//inherit disposal for the dragging proc
/obj/machinery/pipedispenser/disposal/transit_tube
name = "transit tube dispenser"
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "pipe_d"
density = TRUE
desc = "Dispenses pipes that will move beings around."
diff --git a/code/game/machinery/prisongate.dm b/code/game/machinery/prisongate.dm
index 0b7529cbb79..42df492fa81 100644
--- a/code/game/machinery/prisongate.dm
+++ b/code/game/machinery/prisongate.dm
@@ -3,7 +3,7 @@
/obj/machinery/prisongate
name = "prison gate scanner"
desc = "A hardlight gate with an ID scanner attached to the side. Good at deterring even the most persistent temporarily embarrassed employee."
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "prisongate_on"
/// roughly the same health/armor as an airlock
max_integrity = 450
diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm
index 4fdf26e2817..cc14288cb73 100644
--- a/code/game/machinery/quantum_pad.dm
+++ b/code/game/machinery/quantum_pad.dm
@@ -1,7 +1,7 @@
/obj/machinery/quantumpad
name = "quantum pad"
desc = "A bluespace quantum-linked telepad used for teleporting objects to other quantum pads."
- icon = 'icons/obj/telescience.dmi'
+ icon = 'icons/obj/machines/telepad.dmi'
icon_state = "qpad-idle"
active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 10
obj_flags = CAN_BE_HIT | UNIQUE_RENAME
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index cb2e58b4f66..e384e1a08bf 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -1,6 +1,6 @@
/obj/machinery/recharger
name = "recharger"
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "recharger"
base_icon_state = "recharger"
desc = "A charging dock for energy based weaponry, PDAs, and other devices."
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 0eaf8e4c163..604a1b7150e 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -1,7 +1,7 @@
/obj/machinery/recharge_station
name = "recharging station"
desc = "This device recharges energy dependent lifeforms, like cyborgs, ethereals and MODsuit users."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "borgcharger0"
density = FALSE
req_access = list(ACCESS_ROBOTICS)
diff --git a/code/game/machinery/roulette_machine.dm b/code/game/machinery/roulette_machine.dm
index e6b93f316ce..fa50656fb87 100644
--- a/code/game/machinery/roulette_machine.dm
+++ b/code/game/machinery/roulette_machine.dm
@@ -439,7 +439,7 @@
/obj/item/roulette_wheel_beacon
name = "roulette wheel beacon"
desc = "N.T. approved roulette wheel beacon, toss it down and you will have a complementary roulette wheel delivered to you."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "floor_beacon"
var/used
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index bdee9ce4bf3..527641ef36f 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -137,7 +137,7 @@
/obj/machinery/shieldgen
name = "anti-breach shielding projector"
desc = "Used to seal minor hull breaches."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "shieldoff"
density = TRUE
opacity = FALSE
@@ -286,7 +286,7 @@
/obj/machinery/power/shieldwallgen
name = "shield wall generator"
desc = "A shield generator."
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "shield_wall_gen"
anchored = FALSE
density = TRUE
diff --git a/code/game/machinery/teambuilder.dm b/code/game/machinery/teambuilder.dm
index 4bc0969f583..8e6cccf14eb 100644
--- a/code/game/machinery/teambuilder.dm
+++ b/code/game/machinery/teambuilder.dm
@@ -4,7 +4,7 @@
/obj/machinery/teambuilder
name = "Teambuilding Machine"
desc = "A machine that, when passed, colors you based on the color of your team. Lead free!"
- icon = 'icons/obj/telescience.dmi'
+ icon = 'icons/obj/machines/telepad.dmi'
icon_state = "lpad-idle"
density = FALSE
can_buckle = FALSE
diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm
index 69085830ee7..17ec25620a9 100644
--- a/code/game/machinery/telecomms/machines/message_server.dm
+++ b/code/game/machinery/telecomms/machines/message_server.dm
@@ -7,7 +7,7 @@
// A decorational representation of SSblackbox, usually placed alongside the message server. Also contains a traitor theft item.
/obj/machinery/blackbox_recorder
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "blackbox"
name = "Blackbox Recorder"
density = TRUE
@@ -65,7 +65,7 @@
/obj/item/blackbox
name = "\proper the blackbox"
desc = "A strange relic, capable of recording data on extradimensional vertices. It lives inside the blackbox recorder for safe keeping."
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "blackcube"
inhand_icon_state = "blackcube"
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
diff --git a/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm b/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm
index d8497dad746..25a89051c5f 100644
--- a/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm
+++ b/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm
@@ -273,7 +273,7 @@
replace_objs = list(/obj/machinery/door/airlock = list(/obj/machinery/door/airlock/external/glass/ruin = 1))
/datum/dimension_theme/glass
- icon = 'icons/obj/shards.dmi'
+ icon = 'icons/obj/debris.dmi'
icon_state = "small"
material = /datum/material/glass
replace_floors = list(/turf/open/floor/glass = 1)
diff --git a/code/game/objects/effects/anomalies/anomalies_ectoplasm.dm b/code/game/objects/effects/anomalies/anomalies_ectoplasm.dm
index 9aa2c5332db..1d4ca9bef67 100644
--- a/code/game/objects/effects/anomalies/anomalies_ectoplasm.dm
+++ b/code/game/objects/effects/anomalies/anomalies_ectoplasm.dm
@@ -129,7 +129,7 @@
/obj/structure/ghost_portal
name = "Spooky Portal"
desc = "A portal between our dimension and who-knows-where? It's emitting an absolutely ungodly wailing sound."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/anomaly.dmi'
icon_state = "anom"
anchored = TRUE
var/static/list/spooky_noises = list(
diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm
index c6e8093bb36..d97b1ad9515 100644
--- a/code/game/objects/effects/decals/cleanable/misc.dm
+++ b/code/game/objects/effects/decals/cleanable/misc.dm
@@ -1,14 +1,14 @@
/obj/effect/decal/cleanable/generic
name = "clutter"
desc = "Someone should clean that up."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/debris.dmi'
icon_state = "shards"
beauty = -50
/obj/effect/decal/cleanable/ash
name = "ashes"
desc = "Ashes to ashes, dust to dust, and into space."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/debris.dmi'
icon_state = "ash"
mergeable_decal = FALSE
beauty = -50
@@ -33,7 +33,7 @@
/obj/effect/decal/cleanable/glass
name = "tiny shards"
desc = "Back to sand."
- icon = 'icons/obj/shards.dmi'
+ icon = 'icons/obj/debris.dmi'
icon_state = "tiny"
beauty = -100
@@ -203,7 +203,7 @@
name = "chemical pile"
desc = "A pile of chemicals. You can't quite tell what's inside it."
gender = NEUTER
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/debris.dmi'
icon_state = "ash"
/obj/effect/decal/cleanable/shreds
@@ -271,14 +271,14 @@
/obj/effect/decal/cleanable/plastic
name = "plastic shreds"
desc = "Bits of torn, broken, worthless plastic."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/debris.dmi'
icon_state = "shards"
color = "#c6f4ff"
/obj/effect/decal/cleanable/wrapping
name = "wrapping shreds"
desc = "Torn pieces of cardboard and paper, left over from a package."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/debris.dmi'
icon_state = "paper_shreds"
/obj/effect/decal/cleanable/wrapping/pinata
@@ -292,7 +292,7 @@
/obj/effect/decal/cleanable/garbage
name = "decomposing garbage"
desc = "A split open garbage bag, its stinking content seems to be partially liquified. Yuck!"
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/debris.dmi'
icon_state = "garbage"
plane = GAME_PLANE
layer = FLOOR_CLEAN_LAYER //To display the decal over wires.
@@ -306,7 +306,7 @@
/obj/effect/decal/cleanable/ants
name = "space ants"
desc = "A small colony of space ants. They're normally used to the vacuum of space, so they can't climb too well."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/debris.dmi'
icon_state = "ants"
beauty = -150
plane = GAME_PLANE
diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm
index 9d3f62d1d5c..4f98d447987 100644
--- a/code/game/objects/effects/portals.dm
+++ b/code/game/objects/effects/portals.dm
@@ -13,7 +13,7 @@
/obj/effect/portal
name = "portal"
desc = "Looks unstable. Best to test it with the clown."
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/anomaly.dmi'
icon_state = "portal"
anchored = TRUE
density = TRUE // dense for receiving bumbs
@@ -33,7 +33,7 @@
/obj/effect/portal/anom
name = "wormhole"
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/anomaly.dmi'
icon_state = "anom"
layer = RIPPLE_LAYER
plane = ABOVE_GAME_PLANE
diff --git a/code/game/objects/effects/spawners/random/structure.dm b/code/game/objects/effects/spawners/random/structure.dm
index 0fa60090752..bf8e77a9fcd 100644
--- a/code/game/objects/effects/spawners/random/structure.dm
+++ b/code/game/objects/effects/spawners/random/structure.dm
@@ -188,7 +188,7 @@
/obj/effect/spawner/random/structure/billboard
name = "billboard spawner"
- icon = 'icons/obj/billboard.dmi'
+ icon = 'icons/obj/fluff/billboard.dmi'
icon_state = "billboard_random"
loot = list(
/obj/structure/billboard/azik = 50,
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 0cd1aabcafb..d594f3c538f 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -1,7 +1,7 @@
/// Anything you can pick up and hold.
/obj/item
name = "item"
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/anomaly.dmi'
blocks_emissive = EMISSIVE_BLOCK_GENERIC
burning_particles = /particles/smoke/burning/small
pass_flags_self = PASSITEM
diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm
index 78254d87aea..a11eae5f4d5 100644
--- a/code/game/objects/items/airlock_painter.dm
+++ b/code/game/objects/items/airlock_painter.dm
@@ -2,7 +2,7 @@
name = "airlock painter"
desc = "An advanced autopainter preprogrammed with several paintjobs for airlocks. Use it on an airlock during or after construction to change the paintjob."
desc_controls = "Alt-Click to remove the ink cartridge."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/device.dmi'
icon_state = "paint_sprayer"
inhand_icon_state = "paint_sprayer"
worn_icon_state = "painter"
@@ -160,7 +160,7 @@
name = "decal painter"
desc = "An airlock painter, reprogramed to use a different style of paint in order to apply decals for floor tiles as well, in addition to repainting doors. Decals break when the floor tiles are removed."
desc_controls = "Alt-Click to remove the ink cartridge."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/device.dmi'
icon_state = "decal_sprayer"
inhand_icon_state = "decal_sprayer"
custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 0.5)
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index b62b84e1d81..acfb2d18167 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -1,6 +1,6 @@
/obj/item/areaeditor
name = "area modification item"
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/scrolls.dmi'
icon_state = "blueprints"
inhand_icon_state = "blueprints"
attack_verb_continuous = list("attacks", "baps", "hits")
@@ -43,7 +43,7 @@
/obj/item/areaeditor/blueprints
name = "station blueprints"
desc = "Blueprints of the station. There is a \"Classified\" stamp and several coffee stains on it."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/scrolls.dmi'
icon_state = "blueprints"
fluffnotice = "Property of Nanotrasen. For heads of staff only. Store in high-secure storage."
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
@@ -206,7 +206,7 @@
/obj/item/areaeditor/blueprints/cyborg
name = "station schematics"
desc = "A digital copy of the station blueprints stored in your memory."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/scrolls.dmi'
icon_state = "blueprints"
fluffnotice = "Intellectual Property of Nanotrasen. For use in engineering cyborgs only. Wipe from memory upon departure from the station."
diff --git a/code/game/objects/items/boxcutter.dm b/code/game/objects/items/boxcutter.dm
index 2d7f0190183..4213cfec1b3 100644
--- a/code/game/objects/items/boxcutter.dm
+++ b/code/game/objects/items/boxcutter.dm
@@ -1,7 +1,7 @@
/obj/item/boxcutter
name = "boxcutter"
desc = "A tool for cutting boxes, or throats."
- icon = 'icons/obj/boxcutter.dmi'
+ icon = 'icons/obj/tools.dmi'
icon_state = "boxcutter"
inhand_icon_state = "boxcutter"
base_icon_state = "boxcutter"
diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm
index d5a2409033d..a8549992243 100644
--- a/code/game/objects/items/charter.dm
+++ b/code/game/objects/items/charter.dm
@@ -2,8 +2,8 @@
/obj/item/station_charter
name = "station charter"
- icon = 'icons/obj/wizard.dmi'
- icon_state = "scroll2"
+ icon = 'icons/obj/scrolls.dmi'
+ icon_state = "charter"
desc = "An official document entrusting the governance of the station \
and surrounding space to the Captain."
var/used = FALSE
diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm
index 234265e18aa..c398af38e71 100644
--- a/code/game/objects/items/crab17.dm
+++ b/code/game/objects/items/crab17.dm
@@ -1,7 +1,7 @@
/obj/item/suspiciousphone
name = "suspicious phone"
desc = "This device raises pink levels to unknown highs."
- icon = 'icons/obj/device_syndie.dmi'
+ icon = 'icons/obj/syndicate_tools.dmi'
icon_state = "suspiciousphone"
w_class = WEIGHT_CLASS_SMALL
attack_verb_continuous = list("dumps")
@@ -40,7 +40,7 @@
/obj/structure/checkoutmachine
name = "\improper Nanotrasen Space-Coin Market"
desc = "This is good for spacecoin because"
- icon = 'icons/obj/money_machine.dmi'
+ icon = 'icons/obj/machines/money_machine.dmi'
icon_state = "bogdanoff"
layer = ABOVE_ALL_MOB_LAYER
plane = ABOVE_GAME_PLANE
@@ -217,7 +217,7 @@
/obj/effect/dumpeet_fall //Falling pod
name = ""
- icon = 'icons/obj/money_machine_64.dmi'
+ icon = 'icons/obj/machines/money_machine_64.dmi'
pixel_z = 300
desc = "Get out of the way!"
layer = FLY_LAYER//that wasn't flying, that was falling with style!
diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm
index 96976eeb82b..cf3ec16c98d 100644
--- a/code/game/objects/items/devices/gps.dm
+++ b/code/game/objects/items/devices/gps.dm
@@ -2,7 +2,7 @@
/obj/item/gps
name = "global positioning system"
desc = "Helping lost spacemen find their way through the planets since 2016."
- icon = 'icons/obj/telescience.dmi'
+ icon = 'icons/obj/device.dmi'
icon_state = "gps-c"
inhand_icon_state = "electronic"
worn_icon_state = "electronic"
diff --git a/code/game/objects/items/devices/table_clock.dm b/code/game/objects/items/devices/table_clock.dm
index 678ba436084..a370f6c64be 100644
--- a/code/game/objects/items/devices/table_clock.dm
+++ b/code/game/objects/items/devices/table_clock.dm
@@ -4,6 +4,7 @@
/obj/item/table_clock
name = "table clock"
desc = "An annoying clock that keeps you sane through tireless nights."
+ icon = 'icons/obj/structures.dmi'
icon_state = "table_clock"
inhand_icon_state = "table_clock"
base_icon_state = "table_clock"
diff --git a/code/game/objects/items/dyekit.dm b/code/game/objects/items/dyespray.dm
similarity index 98%
rename from code/game/objects/items/dyekit.dm
rename to code/game/objects/items/dyespray.dm
index 600b7f54fce..fd198ec1c40 100644
--- a/code/game/objects/items/dyekit.dm
+++ b/code/game/objects/items/dyespray.dm
@@ -2,7 +2,7 @@
name = "hair dye spray"
desc = "A spray to dye your hair any gradients you'd like."
w_class = WEIGHT_CLASS_TINY
- icon = 'icons/obj/dyespray.dmi'
+ icon = 'icons/obj/cosmetic.dmi'
icon_state = "dyespray"
/obj/item/dyespray/attack_self(mob/user)
diff --git a/code/game/objects/items/granters/martial_arts/plasma_fist.dm b/code/game/objects/items/granters/martial_arts/plasma_fist.dm
index d33fdf6eaae..dab85637da5 100644
--- a/code/game/objects/items/granters/martial_arts/plasma_fist.dm
+++ b/code/game/objects/items/granters/martial_arts/plasma_fist.dm
@@ -5,8 +5,8 @@
desc = "An aged and frayed scrap of paper written in shifting runes. There are hand-drawn illustrations of pugilism."
greet = "You have learned the ancient martial art of Plasma Fist. Your combos are extremely hard to pull off, but include some of the most deadly moves ever seen including \
the plasma fist, which when pulled off will make someone violently explode."
- icon = 'icons/obj/wizard.dmi'
- icon_state ="scroll2"
+ icon = 'icons/obj/scrolls.dmi'
+ icon_state ="plasmafist"
remarks = list(
"Balance...",
"Power...",
diff --git a/code/game/objects/items/granters/martial_arts/sleeping_carp.dm b/code/game/objects/items/granters/martial_arts/sleeping_carp.dm
index c50a062eae5..ab3e343b28d 100644
--- a/code/game/objects/items/granters/martial_arts/sleeping_carp.dm
+++ b/code/game/objects/items/granters/martial_arts/sleeping_carp.dm
@@ -6,8 +6,8 @@
greet = "You have learned the ancient martial art of the Sleeping Carp! Your hand-to-hand combat has become much more effective, and you are now able to deflect any projectiles \
directed toward you while in Throw Mode. Your body has also hardened itself, granting extra protection against lasting wounds that would otherwise mount during extended combat. \
However, you are also unable to use any ranged weaponry. You can learn more about your newfound art by using the Recall Teachings verb in the Sleeping Carp tab."
- icon = 'icons/obj/wizard.dmi'
- icon_state = "scroll2"
+ icon = 'icons/obj/scrolls.dmi'
+ icon_state = "sleepingcarp"
worn_icon_state = "scroll"
remarks = list(
"Wait, a high protein diet is really all it takes to become stabproof...?",
diff --git a/code/game/objects/items/implants/implant.dm b/code/game/objects/items/implants/implant.dm
index 2412a8c6361..0a0c19aee96 100644
--- a/code/game/objects/items/implants/implant.dm
+++ b/code/game/objects/items/implants/implant.dm
@@ -3,7 +3,7 @@
*/
/obj/item/implant
name = "implant"
- icon = 'icons/obj/implants.dmi'
+ icon = 'icons/hud/implants.dmi'
icon_state = "generic" //Shows up as the action button icon
item_flags = ABSTRACT | DROPDEL
resistance_flags = INDESTRUCTIBLE
diff --git a/code/game/objects/items/implants/implant_krav_maga.dm b/code/game/objects/items/implants/implant_krav_maga.dm
index e8ea5695fd3..fa3ccd1ccb2 100644
--- a/code/game/objects/items/implants/implant_krav_maga.dm
+++ b/code/game/objects/items/implants/implant_krav_maga.dm
@@ -1,7 +1,7 @@
/obj/item/implant/krav_maga
name = "krav maga implant"
desc = "Teaches you the arts of Krav Maga in 5 short instructional videos beamed directly into your eyeballs."
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/obj/scrolls.dmi'
icon_state ="scroll2"
var/datum/martial_art/krav_maga/style = new
diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm
index b6f80363b61..8c62677fd9a 100644
--- a/code/game/objects/items/kitchen.dm
+++ b/code/game/objects/items/kitchen.dm
@@ -104,7 +104,8 @@
/obj/item/knife/kitchen/silicon
name = "Kitchen Toolset"
- icon_state = "sili_knife"
+ icon = 'icons/obj/items_cyborg.dmi'
+ icon_state = "sili_knife"
desc = "A breakthrough in synthetic engineering, this tool is a knife programmed to dull when not used for cooking purposes, and can exchange the blade for a rolling pin"
force = 0
throwforce = 0
@@ -143,6 +144,7 @@
/obj/item/kitchen/rollingpin
name = "rolling pin"
desc = "Used to knock out the Bartender."
+ icon = 'icons/obj/kitchen.dmi'
icon_state = "rolling_pin"
worn_icon_state = "rolling_pin"
inhand_icon_state = "rolling_pin"
diff --git a/code/game/objects/items/knives.dm b/code/game/objects/items/knives.dm
index 74f858832d3..d2c3e2a5c98 100644
--- a/code/game/objects/items/knives.dm
+++ b/code/game/objects/items/knives.dm
@@ -53,7 +53,7 @@
/obj/item/knife/ritual
name = "ritual knife"
desc = "The unearthly energies that once powered this blade are now dormant."
- icon = 'icons/obj/eldritch.dmi'
+ icon = 'icons/obj/weapons/khopesh.dmi'
icon_state = "bone_blade"
inhand_icon_state = "bone_blade"
worn_icon_state = "bone_blade"
@@ -107,6 +107,7 @@
/obj/item/knife/hunting
name = "hunting knife"
+ icon = 'icons/obj/weapons/stabby.dmi'
desc = "Despite its name, it's mainly used for cutting meat from dead prey rather than actual hunting."
inhand_icon_state = "huntingknife"
icon_state = "huntingknife"
@@ -121,6 +122,7 @@
/obj/item/knife/combat
name = "combat knife"
+ icon = 'icons/obj/weapons/stabby.dmi'
icon_state = "buckknife"
desc = "A military combat utility survival knife."
embedding = list("pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE)
@@ -132,6 +134,7 @@
/obj/item/knife/combat/survival
name = "survival knife"
+ icon = 'icons/obj/weapons/stabby.dmi'
icon_state = "survivalknife"
embedding = list("pain_mult" = 4, "embed_chance" = 35, "fall_chance" = 10)
desc = "A hunting grade survival knife."
@@ -142,6 +145,7 @@
/obj/item/knife/combat/bone
name = "bone dagger"
inhand_icon_state = "bone_dagger"
+ icon = 'icons/obj/weapons/stabby.dmi'
icon_state = "bone_dagger"
worn_icon_state = "bone_dagger"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -164,7 +168,7 @@
/obj/item/knife/shiv
name = "glass shiv"
- icon = 'icons/obj/shards.dmi'
+ icon = 'icons/obj/weapons/stabby.dmi'
icon_state = "shiv"
inhand_icon_state = "shiv"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -247,7 +251,6 @@
name = "carrot shiv"
icon_state = "carrotshiv"
inhand_icon_state = "carrotshiv"
- icon = 'icons/obj/kitchen.dmi'
desc = "Unlike other carrots, you should probably keep this far away from your eyes."
custom_materials = null
diff --git a/code/game/objects/items/mail.dm b/code/game/objects/items/mail.dm
index 1303cab672e..e9a58933de8 100644
--- a/code/game/objects/items/mail.dm
+++ b/code/game/objects/items/mail.dm
@@ -416,7 +416,7 @@
name = "GLA-2 mail counterfeit device"
desc = "Device that actually able to counterfeit NT's mail. This device also able to place a trap inside of mail for malicious actions. Trap will \"activate\" any item inside of mail. Also it might be used for contraband purposes. Integrated micro-computer will give you great configuration optionality for your needs."
w_class = WEIGHT_CLASS_NORMAL
- icon = 'icons/obj/device_syndie.dmi'
+ icon = 'icons/obj/syndicate_tools.dmi'
icon_state = "mail_counterfeit_device"
/obj/item/storage/mail_counterfeit_device/Initialize(mapload)
diff --git a/code/game/objects/items/pillow.dm b/code/game/objects/items/pillow.dm
index 65f34446e97..79eb79b7829 100644
--- a/code/game/objects/items/pillow.dm
+++ b/code/game/objects/items/pillow.dm
@@ -2,7 +2,7 @@
/obj/item/pillow
name = "pillow"
desc = "A soft and fluffy pillow. You can smack someone with this!"
- icon = 'icons/obj/pillow.dmi'
+ icon = 'icons/obj/bed.dmi'
icon_state = "pillow_1_t"
inhand_icon_state = "pillow_t"
lefthand_file = 'icons/mob/inhands/items/pillow_lefthand.dmi'
@@ -154,7 +154,7 @@
body_parts_covered = CHEST|GROIN|ARMS|LEGS|FEET
cold_protection = CHEST|GROIN|ARMS|LEGS //a pillow suit must be hella warm
allowed = list(/obj/item/pillow) //moar pillow carnage
- icon = 'icons/obj/pillow.dmi'
+ icon = 'icons/obj/bed.dmi'
worn_icon = 'icons/mob/clothing/suits/pillow.dmi'
icon_state = "pillow_suit"
armor_type = /datum/armor/suit_pillow_suit
@@ -177,7 +177,7 @@
name = "pillow hood"
desc = "The final piece of the pillow juggernaut"
body_parts_covered = HEAD
- icon = 'icons/obj/pillow.dmi'
+ icon = 'icons/obj/bed.dmi'
worn_icon = 'icons/mob/clothing/suits/pillow.dmi'
icon_state = "pillowcase_hat"
body_parts_covered = HEAD
@@ -191,7 +191,7 @@
/obj/item/clothing/neck/pillow_tag
name = "pillow tag"
desc = "A price tag for the pillow. It appears to have space to fill names in."
- icon = 'icons/obj/pillow.dmi'
+ icon = 'icons/obj/bed.dmi'
icon_state = "pillow_tag"
worn_icon = 'icons/mob/clothing/neck.dmi'
worn_icon_state = "pillow_tag"
diff --git a/code/game/objects/items/powerfist.dm b/code/game/objects/items/powerfist.dm
index 4314db829fd..99bfa02c86b 100644
--- a/code/game/objects/items/powerfist.dm
+++ b/code/game/objects/items/powerfist.dm
@@ -9,7 +9,7 @@
/obj/item/melee/powerfist
name = "power-fist"
desc = "A metal gauntlet with a piston-powered ram ontop for that extra 'ompfh' in your punch."
- icon = 'icons/obj/device_syndie.dmi'
+ icon = 'icons/obj/syndicate_tools.dmi'
icon_state = "powerfist"
inhand_icon_state = "powerfist"
lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
diff --git a/code/game/objects/items/scrolls.dm b/code/game/objects/items/scrolls.dm
index c56a8718803..65d9000728d 100644
--- a/code/game/objects/items/scrolls.dm
+++ b/code/game/objects/items/scrolls.dm
@@ -1,7 +1,7 @@
/obj/item/teleportation_scroll
name = "scroll of teleportation"
desc = "A scroll for moving around."
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/obj/scrolls.dmi'
icon_state = "scroll"
worn_icon_state = "scroll"
w_class = WEIGHT_CLASS_SMALL
diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm
index 16ecfc0a555..66df7997f66 100644
--- a/code/game/objects/items/shooting_range.dm
+++ b/code/game/objects/items/shooting_range.dm
@@ -1,7 +1,7 @@
/obj/item/target
name = "shooting target"
desc = "A shooting target."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "target_h"
density = FALSE
var/hp = 1800
diff --git a/code/game/objects/items/shrapnel.dm b/code/game/objects/items/shrapnel.dm
index f0839543cb1..59fbf61f62a 100644
--- a/code/game/objects/items/shrapnel.dm
+++ b/code/game/objects/items/shrapnel.dm
@@ -2,7 +2,7 @@
name = "shrapnel shard"
custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 0.5)
weak_against_armour = TRUE
- icon = 'icons/obj/shards.dmi'
+ icon = 'icons/obj/debris.dmi'
icon_state = "large"
w_class = WEIGHT_CLASS_TINY
item_flags = DROPDEL
diff --git a/code/game/objects/items/signs.dm b/code/game/objects/items/signs.dm
index bc5652914ad..3bf5c36048b 100644
--- a/code/game/objects/items/signs.dm
+++ b/code/game/objects/items/signs.dm
@@ -1,5 +1,5 @@
/obj/item/picket_sign
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/signs.dmi'
icon_state = "picket"
inhand_icon_state = "picket"
name = "blank picket sign"
diff --git a/code/game/objects/items/skub.dm b/code/game/objects/items/skub.dm
index 0c70909786a..7e9cd381e33 100644
--- a/code/game/objects/items/skub.dm
+++ b/code/game/objects/items/skub.dm
@@ -1,7 +1,7 @@
/obj/item/skub
desc = "It's skub."
name = "skub"
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/maintenance_loot.dmi'
icon_state = "skub"
w_class = WEIGHT_CLASS_BULKY
attack_verb_continuous = list("skubs")
diff --git a/code/game/objects/items/stacks/bscrystal.dm b/code/game/objects/items/stacks/bscrystal.dm
index de827380948..3e325dcb7e6 100644
--- a/code/game/objects/items/stacks/bscrystal.dm
+++ b/code/game/objects/items/stacks/bscrystal.dm
@@ -2,7 +2,7 @@
/obj/item/stack/ore/bluespace_crystal
name = "bluespace crystal"
desc = "A glowing bluespace crystal, not much is known about how they work. It looks very delicate."
- icon = 'icons/obj/telescience.dmi'
+ icon = 'icons/obj/stack_objects.dmi'
icon_state = "bluespace_crystal"
singular_name = "bluespace crystal"
dye_color = DYE_COSMIC
@@ -64,7 +64,7 @@
//Polycrystals, aka stacks
/obj/item/stack/sheet/bluespace_crystal
name = "bluespace polycrystal"
- icon = 'icons/obj/telescience.dmi'
+ icon = 'icons/obj/stack_objects.dmi'
icon_state = "polycrystal"
inhand_icon_state = null
singular_name = "bluespace polycrystal"
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index b7b405f16be..e198ff6121d 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -275,7 +275,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
/obj/item/shard
name = "shard"
desc = "A nasty looking shard of glass."
- icon = 'icons/obj/shards.dmi'
+ icon = 'icons/obj/debris.dmi'
icon_state = "large"
w_class = WEIGHT_CLASS_TINY
force = 5
diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm
index 248d9c97155..09cc3d5bed2 100644
--- a/code/game/objects/items/stacks/telecrystal.dm
+++ b/code/game/objects/items/stacks/telecrystal.dm
@@ -2,7 +2,7 @@
name = "telecrystal"
desc = "It seems to be pulsing with suspiciously enticing energies."
singular_name = "telecrystal"
- icon = 'icons/obj/telescience.dmi'
+ icon = 'icons/obj/stack_objects.dmi'
icon_state = "telecrystal"
dye_color = DYE_SYNDICATE
w_class = WEIGHT_CLASS_TINY
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index 7910b0a6b96..78f85ae041e 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -545,7 +545,7 @@
/obj/item/storage/bag/harpoon_quiver
name = "harpoon quiver"
desc = "A quiver for holding harpoons."
- icon = 'icons/obj/weapons/guns/bows/quivers.dmi'
+ icon = 'icons/obj/weapons/bows/quivers.dmi'
icon_state = "quiver"
inhand_icon_state = null
worn_icon_state = "harpoon_quiver"
diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm
index a6bc209966a..39789388941 100644
--- a/code/game/objects/items/theft_tools.dm
+++ b/code/game/objects/items/theft_tools.dm
@@ -7,7 +7,7 @@
/obj/item/nuke_core
name = "plutonium core"
desc = "Extremely radioactive. Wear goggles."
- icon = 'icons/obj/nuke_tools.dmi'
+ icon = 'icons/obj/syndicate_tools.dmi'
icon_state = "plutonium_core"
inhand_icon_state = "plutoniumcore"
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
@@ -43,7 +43,7 @@
/obj/item/nuke_core_container
name = "nuke core container"
desc = "Solid container for radioactive objects."
- icon = 'icons/obj/nuke_tools.dmi'
+ icon = 'icons/obj/syndicate_tools.dmi'
icon_state = "core_container_empty"
inhand_icon_state = "tile"
lefthand_file = 'icons/mob/inhands/items/tiles_lefthand.dmi'
@@ -86,7 +86,7 @@
/obj/item/screwdriver/nuke
name = "screwdriver"
desc = "A screwdriver with an ultra thin tip that's carefully designed to boost screwing speed."
- icon = 'icons/obj/nuke_tools.dmi'
+ icon = 'icons/obj/syndicate_tools.dmi'
icon_state = "screwdriver_nuke"
inhand_icon_state = "screwdriver_nuke"
toolspeed = 0.5
@@ -129,7 +129,7 @@
/obj/item/computer_disk/hdd_theft
name = "r&d server hard disk drive"
desc = "For some reason, people really seem to want to steal this. The source code on this drive is probably used for something awful!"
- icon = 'icons/obj/nuke_tools.dmi'
+ icon = 'icons/obj/syndicate_tools.dmi'
icon_state = "something_awful"
max_capacity = 512
w_class = WEIGHT_CLASS_NORMAL
@@ -260,7 +260,7 @@
/obj/item/scalpel/supermatter
name = "supermatter scalpel"
desc = "A scalpel with a fragile tip of condensed hyper-noblium gas, searingly cold to the touch, that can safely shave a sliver off a supermatter crystal."
- icon = 'icons/obj/nuke_tools.dmi'
+ icon = 'icons/obj/syndicate_tools.dmi'
icon_state = "supermatter_scalpel"
toolspeed = 0.5
damtype = BURN
@@ -274,7 +274,7 @@
/obj/item/hemostat/supermatter
name = "supermatter extraction tongs"
desc = "A pair of tongs made from condensed hyper-noblium gas, searingly cold to the touch, that can safely grip a supermatter sliver."
- icon = 'icons/obj/nuke_tools.dmi'
+ icon = 'icons/obj/syndicate_tools.dmi'
icon_state = "supermatter_tongs"
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm
index eb994352d0c..1cc2c120d62 100644
--- a/code/game/objects/items/tools/wrench.dm
+++ b/code/game/objects/items/tools/wrench.dm
@@ -69,7 +69,7 @@
user.Stun(100, ignore_canstun = TRUE)// Stun stops them from wandering off
user.set_light_color(COLOR_VERY_SOFT_YELLOW)
user.set_light(2)
- user.add_overlay(mutable_appearance('icons/effects/genetics.dmi', "servitude", -MUTATIONS_LAYER))
+ user.add_overlay(mutable_appearance('icons/mob/effects/genetics.dmi', "servitude", -MUTATIONS_LAYER))
playsound(loc, 'sound/effects/pray.ogg', 50, TRUE, -1)
// Let the sound effect finish playing
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index b8af901cd31..b84091ba2da 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -953,7 +953,7 @@
/obj/item/toy/toy_dagger
name = "toy dagger"
desc = "A cheap plastic replica of a dagger. Produced by THE ARM Toys, Inc."
- icon = 'icons/obj/cult/items_and_weapons.dmi'
+ icon = 'icons/obj/weapons/khopesh.dmi'
icon_state = "render"
inhand_icon_state = "cultdagger"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 5fad2e4e28a..8745579d946 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -579,7 +579,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
name = "ectoplasm"
desc = "Spooky."
gender = PLURAL
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/effects/magic.dmi'
icon_state = "ectoplasm"
/obj/item/ectoplasm/suicide_act(mob/living/user)
@@ -587,7 +587,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
return OXYLOSS
/obj/item/ectoplasm/angelic
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/effects/magic.dmi'
icon_state = "angelplasm"
/obj/item/ectoplasm/mystic
diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
index fd758f75c04..e1138d4696f 100644
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -38,7 +38,7 @@
/obj/structure/alien/gelpod
name = "gelatinous mound"
desc = "A mound of jelly-like substance encasing something inside."
- icon = 'icons/obj/fluff.dmi'
+ icon = 'icons/obj/fluff/general.dmi'
icon_state = "gelmound"
/obj/structure/alien/gelpod/deconstruct(disassembled = TRUE)
diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm
index 342ba933ec5..a5b0a0c2edd 100644
--- a/code/game/objects/structures/beds_chairs/bed.dm
+++ b/code/game/objects/structures/beds_chairs/bed.dm
@@ -11,7 +11,7 @@
name = "bed"
desc = "This is used to lie in, sleep in or strap on."
icon_state = "bed"
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/bed.dmi'
anchored = TRUE
can_buckle = TRUE
buckle_lying = 90
diff --git a/code/game/objects/structures/beds_chairs/pew.dm b/code/game/objects/structures/beds_chairs/pew.dm
index 535aadb698e..21bf0fbf09c 100644
--- a/code/game/objects/structures/beds_chairs/pew.dm
+++ b/code/game/objects/structures/beds_chairs/pew.dm
@@ -1,7 +1,7 @@
/obj/structure/chair/pew
name = "wooden pew"
desc = "Kneel here and pray."
- icon = 'icons/obj/sofa.dmi'
+ icon = 'icons/obj/chairs_wide.dmi'
icon_state = "pewmiddle"
resistance_flags = FLAMMABLE
max_integrity = 70
@@ -38,7 +38,7 @@
/obj/structure/chair/pew/left/proc/GetLeftPewArmrest()
- return mutable_appearance('icons/obj/sofa.dmi', "pewend_left_armrest")
+ return mutable_appearance('icons/obj/chairs_wide.dmi', "pewend_left_armrest")
/obj/structure/chair/pew/left/Destroy()
QDEL_NULL(leftpewarmrest)
@@ -80,7 +80,7 @@
update_rightpewarmrest()
/obj/structure/chair/pew/right/proc/GetRightPewArmrest()
- return mutable_appearance('icons/obj/sofa.dmi', "pewend_right_armrest")
+ return mutable_appearance('icons/obj/chairs_wide.dmi', "pewend_right_armrest")
/obj/structure/chair/pew/right/Destroy()
QDEL_NULL(rightpewarmrest)
diff --git a/code/game/objects/structures/beds_chairs/sofa.dm b/code/game/objects/structures/beds_chairs/sofa.dm
index e773cbc04b4..076f95f4dc9 100644
--- a/code/game/objects/structures/beds_chairs/sofa.dm
+++ b/code/game/objects/structures/beds_chairs/sofa.dm
@@ -16,7 +16,7 @@ path/corner/color_name {\
/obj/structure/chair/sofa
name = "old ratty sofa"
icon_state = "error"
- icon = 'icons/obj/sofa.dmi'
+ icon = 'icons/obj/chairs_wide.dmi'
buildstackamount = 1
item_chair = null
var/mutable_appearance/armrest
diff --git a/code/game/objects/structures/billboard.dm b/code/game/objects/structures/billboard.dm
index 2f580a67e08..c6786dd84e4 100644
--- a/code/game/objects/structures/billboard.dm
+++ b/code/game/objects/structures/billboard.dm
@@ -1,7 +1,7 @@
/obj/structure/billboard
name = "blank billboard"
desc = "A blank billboard, with space for all kinds of advertising."
- icon = 'icons/obj/billboard.dmi'
+ icon = 'icons/obj/fluff/billboard.dmi'
icon_state = "billboard_blank"
plane = ABOVE_GAME_PLANE
max_integrity = 1000
diff --git a/code/game/objects/structures/broken_flooring.dm b/code/game/objects/structures/broken_flooring.dm
index ea52be6d7fd..c81ca778424 100644
--- a/code/game/objects/structures/broken_flooring.dm
+++ b/code/game/objects/structures/broken_flooring.dm
@@ -1,7 +1,7 @@
/obj/structure/broken_flooring
name = "broken tiling"
desc = "A segment of broken flooring."
- icon = 'icons/obj/brokentiling.dmi'
+ icon = 'icons/obj/fluff/brokentiling.dmi'
icon_state = "corner"
anchored = TRUE
density = FALSE
diff --git a/code/game/objects/structures/containers.dm b/code/game/objects/structures/containers.dm
index e5cc217cc68..f8272c19de9 100644
--- a/code/game/objects/structures/containers.dm
+++ b/code/game/objects/structures/containers.dm
@@ -1,7 +1,7 @@
/obj/structure/shipping_container
name = "shipping container"
desc = "A standard-measure shipping container for bulk transport of goods. This one is blank, offering no clue as to its contents."
- icon = 'icons/obj/containers.dmi'
+ icon = 'icons/obj/fluff/containers.dmi'
icon_state = "container_blank"
max_integrity = 1000
bound_width = 96
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 779e3a3b1ae..606b2b52e65 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -1,6 +1,6 @@
/obj/structure/displaycase
name = "display case"
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "glassbox"
desc = "A display case for prized possessions."
density = TRUE
@@ -226,7 +226,7 @@
/obj/structure/displaycase_chassis
name = "display case chassis"
desc = "The wooden base of a display case."
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "glassbox_chassis"
resistance_flags = FLAMMABLE
anchored = TRUE
@@ -440,6 +440,7 @@
/obj/structure/displaycase/forsale
name = "vend-a-tray"
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "laserbox"
custom_glass_overlay = TRUE
desc = "A display case with an ID-card swiper. Use your ID to purchase the contents."
diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm
index e71bff1e0be..08517470462 100644
--- a/code/game/objects/structures/dresser.dm
+++ b/code/game/objects/structures/dresser.dm
@@ -1,7 +1,7 @@
/obj/structure/dresser
name = "dresser"
desc = "A nicely-crafted wooden dresser. It's filled with lots of undies."
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/fluff/general.dmi'
icon_state = "dresser"
resistance_flags = FLAMMABLE
density = TRUE
diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm
index dd521f8e78d..cdd3f6a08c8 100644
--- a/code/game/objects/structures/fluff.dm
+++ b/code/game/objects/structures/fluff.dm
@@ -6,7 +6,7 @@
/obj/structure/fluff
name = "fluff structure"
desc = "Fluffier than a sheep. This shouldn't exist."
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/fluff/general.dmi'
icon_state = "minibar"
anchored = TRUE
density = FALSE
@@ -86,7 +86,7 @@
/obj/structure/fluff/bus
name = "bus"
desc = "GO TO SCHOOL. READ A BOOK."
- icon = 'icons/obj/bus.dmi'
+ icon = 'icons/obj/fluff/bus.dmi'
icon_state = null
density = TRUE
anchored = TRUE
@@ -125,7 +125,7 @@
/obj/structure/fluff/paper
name = "dense lining of papers"
desc = "A lining of paper scattered across the bottom of a wall."
- icon = 'icons/obj/fluff.dmi'
+ icon = 'icons/obj/fluff/general.dmi'
icon_state = "paper"
deconstructible = FALSE
@@ -181,7 +181,7 @@
/obj/structure/fluff/fokoff_sign
name = "crude sign"
desc = "A crudely-made sign with the words 'fok of' written in some sort of red paint."
- icon = 'icons/obj/fluff.dmi'
+ icon = 'icons/obj/fluff/general.dmi'
icon_state = "fokof"
/obj/structure/fluff/big_chain
@@ -207,7 +207,7 @@
/obj/structure/fluff/beach_umbrella
name = "beach umbrella"
desc = "A fancy umbrella designed to keep the sun off beach-goers."
- icon = 'icons/obj/fluff.dmi'
+ icon = 'icons/obj/fluff/general.dmi'
icon_state = "brella"
density = FALSE
anchored = TRUE
@@ -230,7 +230,7 @@
/obj/structure/fluff/clockwork
name = "Clockwork Fluff"
- icon = 'icons/obj/fluff.dmi'
+ icon = 'icons/obj/fluff/general.dmi'
icon_state = "error"
deconstructible = FALSE
diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm
index 0f2bef5f782..a9d0f6f9def 100644
--- a/code/game/objects/structures/guillotine.dm
+++ b/code/game/objects/structures/guillotine.dm
@@ -33,7 +33,7 @@
desc = "A large structure used to remove the heads of traitors and treasonists."
icon = 'icons/obj/guillotine.dmi'
icon_state = "guillotine_raised"
- icon_preview = 'icons/obj/previews.dmi'
+ icon_preview = 'icons/obj/fluff/previews.dmi'
icon_state_preview = "guilliotine"
can_buckle = TRUE
anchored = TRUE
diff --git a/code/game/objects/structures/gym/punching_bag.dm b/code/game/objects/structures/gym/punching_bag.dm
index bca46ce7f4f..1a09cfd78ff 100644
--- a/code/game/objects/structures/gym/punching_bag.dm
+++ b/code/game/objects/structures/gym/punching_bag.dm
@@ -1,7 +1,7 @@
/obj/structure/punching_bag
name = "punching bag"
desc = "A punching bag. Can you get to speed level 4???"
- icon = 'icons/obj/gym_equipment.dmi'
+ icon = 'icons/obj/fluff/gym_equipment.dmi'
icon_state = "punchingbag"
anchored = TRUE
layer = ABOVE_MOB_LAYER
diff --git a/code/game/objects/structures/gym/weight_machine.dm b/code/game/objects/structures/gym/weight_machine.dm
index c66a1aec1af..ef156f1b645 100644
--- a/code/game/objects/structures/gym/weight_machine.dm
+++ b/code/game/objects/structures/gym/weight_machine.dm
@@ -1,7 +1,7 @@
/obj/structure/weightmachine
name = "chest press machine"
desc = "Just looking at this thing makes you feel tired."
- icon = 'icons/obj/gym_equipment.dmi'
+ icon = 'icons/obj/fluff/gym_equipment.dmi'
icon_state = "stacklifter"
base_icon_state = "stacklifter"
can_buckle = TRUE
diff --git a/code/game/objects/structures/gym/weight_machine_action.dm b/code/game/objects/structures/gym/weight_machine_action.dm
index 16bb4f5d476..6023a1b1947 100644
--- a/code/game/objects/structures/gym/weight_machine_action.dm
+++ b/code/game/objects/structures/gym/weight_machine_action.dm
@@ -5,7 +5,7 @@
/datum/action/push_weights
name = "Work out"
desc = "Start working out"
- button_icon = 'icons/obj/gym_equipment.dmi'
+ button_icon = 'icons/obj/fluff/gym_equipment.dmi'
button_icon_state = "stacklifter"
///Reference to the weightpress we are created inside of.
var/obj/structure/weightmachine/weightpress
diff --git a/code/game/objects/structures/memorial.dm b/code/game/objects/structures/memorial.dm
index bd28aaacd20..dcb350bcc4c 100644
--- a/code/game/objects/structures/memorial.dm
+++ b/code/game/objects/structures/memorial.dm
@@ -14,7 +14,7 @@ This memorial has been designed for him and any future coders to perish.
/obj/structure/fluff/arc
name = "Tomb of the Unknown Employee"
desc = "Here rests an unknown employee\nUnknown by name or rank\nWhose acts will not be forgotten"
- icon = 'icons/obj/tomb.dmi'
+ icon = 'icons/obj/fluff/tomb.dmi'
icon_state = "memorial"
density = TRUE
anchored = TRUE
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index e85ecb90e94..7b79cd6e92e 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -31,7 +31,7 @@
GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants and other ghosties.
/obj/structure/bodycontainer
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "morgue1"
density = TRUE
anchored = TRUE
@@ -267,6 +267,7 @@ GLOBAL_LIST_EMPTY(crematoriums)
/obj/structure/bodycontainer/crematorium
name = "crematorium"
desc = "A human incinerator. Works well on barbecue nights."
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "crema1"
base_icon_state = "crema"
dir = SOUTH
@@ -367,7 +368,7 @@ GLOBAL_LIST_EMPTY(crematoriums)
* For overriding only
*/
/obj/structure/tray
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
density = TRUE
anchored = TRUE
pass_flags_self = PASSTABLE | LETPASSTHROW
@@ -449,6 +450,7 @@ GLOBAL_LIST_EMPTY(crematoriums)
/obj/structure/tray/m_tray
name = "morgue tray"
desc = "Apply corpse before closing."
+ icon = 'icons/obj/structures.dmi'
icon_state = "morguet"
pass_flags_self = PASSTABLE | LETPASSTHROW
diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm
index 2a3cf480c53..82d4ec0019d 100644
--- a/code/game/objects/structures/noticeboard.dm
+++ b/code/game/objects/structures/noticeboard.dm
@@ -3,7 +3,7 @@
/obj/structure/noticeboard
name = "notice board"
desc = "A board for pinning important notices upon."
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/wallmounts.dmi'
icon_state = "nboard00"
density = FALSE
anchored = TRUE
@@ -117,7 +117,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/noticeboard, 32)
/obj/item/wallframe/noticeboard
name = "notice board"
desc = "Right now it's more of a clipboard. Attach to a wall to use."
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/wallmounts.dmi'
icon_state = "nboard00"
custom_materials = list(
/datum/material/wood = SHEET_MATERIAL_AMOUNT,
diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm
index 10e3548fca9..7136f28a44c 100644
--- a/code/game/objects/structures/plasticflaps.dm
+++ b/code/game/objects/structures/plasticflaps.dm
@@ -2,7 +2,7 @@
name = "airtight plastic flaps"
desc = "Heavy duty, airtight, plastic flaps. Definitely can't get past those. No way."
gender = PLURAL
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "plasticflaps"
armor_type = /datum/armor/structure_plasticflaps
density = FALSE
diff --git a/code/game/objects/structures/showcase.dm b/code/game/objects/structures/showcase.dm
index 4e8b9d2aa8b..6eabe2d1b3a 100644
--- a/code/game/objects/structures/showcase.dm
+++ b/code/game/objects/structures/showcase.dm
@@ -4,7 +4,7 @@
/*Completely generic structures for use by mappers to create fake objects, i.e. display rooms*/
/obj/structure/showcase
name = "showcase"
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "showcase_1"
desc = "A stand with the empty body of a cyborg bolted to it."
density = TRUE
@@ -64,13 +64,13 @@
/obj/structure/showcase/mecha/marauder
name = "combat mech exhibit"
desc = "A stand with an empty old Nanotrasen Corporation combat mech bolted to it. It is described as the premier unit used to defend corporate interests and employees."
- icon = 'icons/mecha/mecha.dmi'
+ icon = 'icons/mob/mecha.dmi'
icon_state = "marauder"
/obj/structure/showcase/mecha/ripley
name = "construction mech exhibit"
desc = "A stand with a retired construction mech bolted to it. The clamps are rated at 9300PSI. It seems to be falling apart."
- icon = 'icons/mecha/mecha.dmi'
+ icon = 'icons/mob/mecha.dmi'
icon_state = "firefighter"
/obj/structure/showcase/machinery/implanter
diff --git a/code/game/objects/structures/signs/signs_flags.dm b/code/game/objects/structures/signs/signs_flags.dm
index 1d17765201e..64a9d7225bb 100644
--- a/code/game/objects/structures/signs/signs_flags.dm
+++ b/code/game/objects/structures/signs/signs_flags.dm
@@ -1,7 +1,7 @@
/obj/structure/sign/flag
name = "flag of the IT Division"
desc = "The flag of the Nanotrasen IT Division. Bears a symbol that only makes sense to those that understand."
- icon = 'icons/obj/flags.dmi'
+ icon = 'icons/obj/fluff/flags.dmi'
icon_state = "flag_coder"
/obj/structure/sign/flag/nanotrasen
diff --git a/code/game/objects/structures/spirit_board.dm b/code/game/objects/structures/spirit_board.dm
index ac3d10d926b..d30e1363052 100644
--- a/code/game/objects/structures/spirit_board.dm
+++ b/code/game/objects/structures/spirit_board.dm
@@ -1,7 +1,7 @@
/obj/structure/spirit_board
name = "spirit board"
desc = "A wooden board with letters etched into it, used in seances."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "spirit_board"
resistance_flags = FLAMMABLE
density = TRUE
diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm
index 95978496dbc..61a84c1f503 100644
--- a/code/game/objects/structures/tank_dispenser.dm
+++ b/code/game/objects/structures/tank_dispenser.dm
@@ -3,7 +3,7 @@
/obj/structure/tank_dispenser
name = "tank dispenser"
desc = "A simple yet bulky storage device for gas tanks. Holds up to 10 oxygen tanks and 10 plasma tanks."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "dispenser"
density = TRUE
anchored = TRUE
diff --git a/code/game/objects/structures/training_machine.dm b/code/game/objects/structures/training_machine.dm
index 8f2d2f6f3b4..ed57fc3a841 100644
--- a/code/game/objects/structures/training_machine.dm
+++ b/code/game/objects/structures/training_machine.dm
@@ -15,7 +15,7 @@
/obj/structure/training_machine
name = "AURUMILL-Brand MkII. Personnel Training Machine"
desc = "Used for combat training simulations. Accepts standard training targets. A pair of buckling straps are attached."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "training_machine"
can_buckle = TRUE
buckle_lying = 0
diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm
index 67b452ed3a8..cce21610862 100644
--- a/code/game/objects/structures/traps.dm
+++ b/code/game/objects/structures/traps.dm
@@ -102,7 +102,7 @@
/obj/structure/trap/stun/hunter
name = "bounty trap"
desc = "A trap that only goes off when a fugitive steps on it, announcing the location and stunning the target. You'd better avoid it."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "bounty_trap_on"
stun_time = 200
sparks = FALSE //the item version gives them off to prevent runtimes (see Destroy())
@@ -143,7 +143,7 @@
/obj/item/bountytrap
name = "bounty trap"
desc = "A trap that only goes off when a fugitive steps on it, announcing the location and stunning the target. It's currently inactive."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "bounty_trap_off"
var/obj/structure/trap/stun/hunter/stored_trap
var/obj/item/radio/radio
diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm
index e95b1487673..1179c3a34a1 100644
--- a/code/modules/antagonists/_common/antag_spawner.dm
+++ b/code/modules/antagonists/_common/antag_spawner.dm
@@ -16,7 +16,7 @@
/obj/item/antag_spawner/contract
name = "contract"
desc = "A magic contract previously signed by an apprentice. In exchange for instruction in the magical arts, they are bound to answer your call for aid."
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/obj/scrolls.dmi'
icon_state ="scroll2"
var/polling = FALSE
@@ -236,7 +236,7 @@
/obj/item/antag_spawner/slaughter_demon //Warning edgiest item in the game
name = "vial of blood"
desc = "A magically infused bottle of blood, distilled from countless murder victims. Used in unholy rituals to attract horrifying creatures."
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "vial"
var/shatter_msg = span_notice("You shatter the bottle, no turning back now!")
@@ -280,7 +280,7 @@
/obj/item/antag_spawner/slaughter_demon/laughter
name = "vial of tickles"
desc = "A magically infused bottle of clown love, distilled from countless hugging attacks. Used in funny rituals to attract adorable creatures."
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "vial"
color = "#FF69B4" // HOT PINK
diff --git a/code/modules/antagonists/abductor/equipment/gear/abductor_posters.dm b/code/modules/antagonists/abductor/equipment/gear/abductor_posters.dm
index 9d97b3a5568..2938e5f4fd2 100644
--- a/code/modules/antagonists/abductor/equipment/gear/abductor_posters.dm
+++ b/code/modules/antagonists/abductor/equipment/gear/abductor_posters.dm
@@ -6,7 +6,7 @@
icon_state = "rolled_abductor"
/obj/structure/sign/poster/abductor
- icon = 'icons/obj/abductor_posters.dmi'
+ icon = 'icons/obj/poster.dmi'
poster_item_name = "abductor poster"
poster_item_desc = "A sheet of holofiber resin, with a nanospike perforation on the back end for maximum adhesion."
poster_item_icon_state = "rolled_abductor"
diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
index 630bbb96521..ade3a76393d 100644
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ b/code/modules/antagonists/cult/blood_magic.dm
@@ -781,7 +781,7 @@
/obj/item/melee/blood_magic/manipulator/attack_self(mob/living/user)
if(IS_CULTIST(user))
var/static/list/spells = list(
- "Bloody Halberd (150)" = image(icon = 'icons/obj/cult/items_and_weapons.dmi', icon_state = "occultpoleaxe0"),
+ "Bloody Halberd (150)" = image(icon = 'icons/obj/weapons/spear.dmi', icon_state = "occultpoleaxe0"),
"Blood Bolt Barrage (300)" = image(icon = 'icons/obj/weapons/guns/ballistic.dmi', icon_state = "arcane_barrage"),
"Blood Beam (500)" = image(icon = 'icons/obj/weapons/hand.dmi', icon_state = "disintegrate")
)
diff --git a/code/modules/antagonists/cult/cult_bastard_sword.dm b/code/modules/antagonists/cult/cult_bastard_sword.dm
index 1d1179787a5..29bbc15c32f 100644
--- a/code/modules/antagonists/cult/cult_bastard_sword.dm
+++ b/code/modules/antagonists/cult/cult_bastard_sword.dm
@@ -15,7 +15,7 @@
light_color = "#ff0000"
attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "rends")
attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "rend")
- icon = 'icons/obj/cult/items_and_weapons.dmi'
+ icon = 'icons/obj/weapons/sword.dmi'
icon_state = "cultbastard"
inhand_icon_state = "cultbastard"
hitsound = 'sound/weapons/bladeslice.ogg'
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index 72d02d6b0ca..dade6f8c664 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -1,7 +1,7 @@
/obj/item/tome
name = "arcane tome"
desc = "An old, dusty tome with frayed edges and a sinister-looking cover."
- icon = 'icons/obj/cult/items_and_weapons.dmi'
+ icon = 'icons/obj/cult/items.dmi'
icon_state ="tome"
throw_speed = 2
throw_range = 5
@@ -10,7 +10,7 @@
/obj/item/melee/cultblade/dagger
name = "ritual dagger"
desc = "A strange dagger said to be used by sinister groups for \"preparing\" a corpse before sacrificing it to their dark gods."
- icon = 'icons/obj/cult/items_and_weapons.dmi'
+ icon = 'icons/obj/weapons/khopesh.dmi'
icon_state = "render"
inhand_icon_state = "cultdagger"
worn_icon_state = "render"
@@ -56,7 +56,7 @@ Striking a noncultist, however, will tear their flesh."}
/obj/item/melee/cultblade
name = "eldritch longsword"
desc = "A sword humming with unholy energy. It glows with a dim red light."
- icon = 'icons/obj/cult/items_and_weapons.dmi'
+ icon = 'icons/obj/weapons/sword.dmi'
icon_state = "cultblade"
inhand_icon_state = "cultblade"
worn_icon_state = "cultblade"
@@ -347,6 +347,7 @@ Striking a noncultist, however, will tear their flesh."}
/obj/item/sharpener/cult
name = "eldritch whetstone"
desc = "A block, empowered by dark magic. Sharp weapons will be enhanced when used on the stone."
+ icon = 'icons/obj/cult/items.dmi'
icon_state = "cult_sharpener"
uses = 1
increment = 5
@@ -483,7 +484,7 @@ Striking a noncultist, however, will tear their flesh."}
/obj/item/shuttle_curse
name = "cursed orb"
desc = "You peer within this smokey orb and glimpse terrible fates befalling the emergency escape shuttle. "
- icon = 'icons/obj/cult/items_and_weapons.dmi'
+ icon = 'icons/obj/cult/items.dmi'
icon_state = "shuttlecurse"
///how many times has the shuttle been cursed so far?
var/static/totalcurses = 0
@@ -558,7 +559,7 @@ Striking a noncultist, however, will tear their flesh."}
/obj/item/cult_shift
name = "veil shifter"
desc = "This relic instantly teleports you, and anything you're pulling, forward by a moderate distance."
- icon = 'icons/obj/cult/items_and_weapons.dmi'
+ icon = 'icons/obj/cult/items.dmi'
icon_state ="shifter"
///How many uses does the item have before becoming inert
var/uses = 4
@@ -678,7 +679,7 @@ Striking a noncultist, however, will tear their flesh."}
/obj/item/melee/cultblade/halberd
name = "bloody halberd"
desc = "A halberd with a volatile axehead made from crystallized blood. It seems linked to its creator. And, admittedly, more of a poleaxe than a halberd."
- icon = 'icons/obj/cult/items_and_weapons.dmi'
+ icon = 'icons/obj/weapons/spear.dmi'
icon_state = "occultpoleaxe0"
base_icon_state = "occultpoleaxe"
inhand_icon_state = "occultpoleaxe0"
diff --git a/code/modules/antagonists/cult/cult_structure_altar.dm b/code/modules/antagonists/cult/cult_structure_altar.dm
index 684afbb7ece..581ffab9c20 100644
--- a/code/modules/antagonists/cult/cult_structure_altar.dm
+++ b/code/modules/antagonists/cult/cult_structure_altar.dm
@@ -14,11 +14,11 @@
/obj/structure/destructible/cult/item_dispenser/altar/setup_options()
var/static/list/altar_items = list(
ELDRITCH_WHETSTONE = list(
- PREVIEW_IMAGE = image(icon = 'icons/obj/kitchen.dmi', icon_state = "cult_sharpener"),
+ PREVIEW_IMAGE = image(icon = 'icons/obj/cult/items.dmi', icon_state = "cult_sharpener"),
OUTPUT_ITEMS = list(/obj/item/sharpener/cult),
),
CONSTRUCT_SHELL = list(
- PREVIEW_IMAGE = image(icon = 'icons/obj/wizard.dmi', icon_state = "construct_cult"),
+ PREVIEW_IMAGE = image(icon = 'icons/mob/shells.dmi', icon_state = "construct_cult"),
OUTPUT_ITEMS = list(/obj/structure/constructshell),
),
UNHOLY_WATER = list(
diff --git a/code/modules/antagonists/cult/cult_structure_archives.dm b/code/modules/antagonists/cult/cult_structure_archives.dm
index efb6fe48198..6116d2dd827 100644
--- a/code/modules/antagonists/cult/cult_structure_archives.dm
+++ b/code/modules/antagonists/cult/cult_structure_archives.dm
@@ -20,11 +20,11 @@
OUTPUT_ITEMS = list(/obj/item/clothing/glasses/hud/health/night/cultblind),
),
CURSE_ORB = list(
- PREVIEW_IMAGE = image(icon = 'icons/obj/cult/items_and_weapons.dmi', icon_state = "shuttlecurse"),
+ PREVIEW_IMAGE = image(icon = 'icons/obj/cult/items.dmi', icon_state = "shuttlecurse"),
OUTPUT_ITEMS = list(/obj/item/shuttle_curse),
),
VEIL_WALKER = list(
- PREVIEW_IMAGE = image(icon = 'icons/obj/cult/items_and_weapons.dmi', icon_state = "shifter"),
+ PREVIEW_IMAGE = image(icon = 'icons/obj/cult/items.dmi', icon_state = "shifter"),
OUTPUT_ITEMS = list(/obj/item/cult_shift, /obj/item/flashlight/flare/culttorch),
),
)
diff --git a/code/modules/antagonists/cult/cult_structure_forge.dm b/code/modules/antagonists/cult/cult_structure_forge.dm
index 39ac15da5ee..ceb38398a67 100644
--- a/code/modules/antagonists/cult/cult_structure_forge.dm
+++ b/code/modules/antagonists/cult/cult_structure_forge.dm
@@ -24,7 +24,7 @@
OUTPUT_ITEMS = list(/obj/item/clothing/suit/hooded/cultrobes/berserker),
),
ELDRITCH_SWORD = list(
- PREVIEW_IMAGE = image(icon = 'icons/obj/cult/items_and_weapons.dmi', icon_state = "cultblade"),
+ PREVIEW_IMAGE = image(icon = 'icons/obj/weapons/sword.dmi', icon_state = "cultblade"),
OUTPUT_ITEMS = list(/obj/item/melee/cultblade),
),
)
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
index 368ace5d0ee..c8c4b5e3207 100644
--- a/code/modules/antagonists/cult/runes.dm
+++ b/code/modules/antagonists/cult/runes.dm
@@ -33,7 +33,7 @@ Runes can either be invoked by one's self or with many different cultists. Each
name = "rune"
desc = "An odd collection of symbols drawn in what seems to be blood."
anchored = TRUE
- icon = 'icons/obj/rune.dmi'
+ icon = 'icons/obj/cult/rune.dmi'
icon_state = "1"
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
layer = SIGIL_LAYER
diff --git a/code/modules/antagonists/heretic/items/heretic_blades.dm b/code/modules/antagonists/heretic/items/heretic_blades.dm
index b5bbfb3b598..c074e13c8d3 100644
--- a/code/modules/antagonists/heretic/items/heretic_blades.dm
+++ b/code/modules/antagonists/heretic/items/heretic_blades.dm
@@ -2,7 +2,7 @@
/obj/item/melee/sickly_blade
name = "\improper sickly blade"
desc = "A sickly green crescent blade, decorated with an ornamental eye. You feel like you're being watched..."
- icon = 'icons/obj/eldritch.dmi'
+ icon = 'icons/obj/weapons/khopesh.dmi'
icon_state = "eldritch_blade"
inhand_icon_state = "eldritch_blade"
lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_map.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_map.dm
index 90c09459fcc..a31f0a7cc97 100644
--- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_map.dm
+++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_map.dm
@@ -46,7 +46,7 @@ GLOBAL_LIST_EMPTY(heretic_sacrifice_landmarks)
/obj/structure/no_effect_signpost
name = "signpost"
desc = "Won't somebody give me a sign?"
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/fluff/general.dmi'
icon_state = "signpost"
anchored = TRUE
density = TRUE
diff --git a/code/modules/antagonists/heretic/magic/realignment.dm b/code/modules/antagonists/heretic/magic/realignment.dm
index 1b5dd05d059..b1860e86344 100644
--- a/code/modules/antagonists/heretic/magic/realignment.dm
+++ b/code/modules/antagonists/heretic/magic/realignment.dm
@@ -5,7 +5,7 @@
You cannot attack while realigning. Can be casted multiple times in short succession, but each cast lengthens the cooldown."
background_icon_state = "bg_heretic"
overlay_icon_state = "bg_heretic_border"
- button_icon = 'icons/obj/implants.dmi'
+ button_icon = 'icons/hud/implants.dmi'
button_icon_state = "adrenal"
// sound = 'sound/magic/whistlereset.ogg'
diff --git a/code/modules/antagonists/pirate/pirate_roles.dm b/code/modules/antagonists/pirate/pirate_roles.dm
index eb7bc1ead92..68683333c49 100644
--- a/code/modules/antagonists/pirate/pirate_roles.dm
+++ b/code/modules/antagonists/pirate/pirate_roles.dm
@@ -177,7 +177,7 @@
density = FALSE
you_are_text = "Once you were a proud Ethereal, now all that remains is your hunger for the precious bluespace crystal."
flavour_text = "The station has denied you your bluespace crystals, the sweet ambrosia of the fifth-dimension. Strike the earth!"
- icon = 'icons/obj/ethereal_crystal.dmi'
+ icon = 'icons/mob/effects/ethereal_crystal.dmi'
icon_state = "ethereal_crystal"
fluff_spawn = null
prompt_name = "a geode dweller"
diff --git a/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm b/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
index 77a1bfed881..105570e9e4b 100644
--- a/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
+++ b/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
@@ -167,7 +167,7 @@
//Pad & Pad Terminal
/obj/machinery/piratepad
name = "cargo hold pad"
- icon = 'icons/obj/telescience.dmi'
+ icon = 'icons/obj/machines/telepad.dmi'
icon_state = "lpad-idle-off"
///This is the icon_state that this telepad uses when it's not in use.
var/idle_state = "lpad-idle-off"
diff --git a/code/modules/antagonists/space_dragon/carp_rift.dm b/code/modules/antagonists/space_dragon/carp_rift.dm
index e87ceb3f071..dc9be2dfb8d 100644
--- a/code/modules/antagonists/space_dragon/carp_rift.dm
+++ b/code/modules/antagonists/space_dragon/carp_rift.dm
@@ -59,7 +59,7 @@
desc = "A rift akin to the ones space carp use to travel long distances."
armor_type = /datum/armor/structure_carp_rift
max_integrity = 300
- icon = 'icons/obj/carp_rift.dmi'
+ icon = 'icons/obj/anomaly.dmi'
icon_state = "carp_rift_carpspawn"
light_color = LIGHT_COLOR_PURPLE
light_range = 10
diff --git a/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm b/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm
index 39f03f517c4..015c4d7cf7b 100644
--- a/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm
+++ b/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm
@@ -133,7 +133,7 @@
/obj/item/weakpoint_locator
name = "structural weakpoint locator"
desc = "A device that can triangulate station's structural weakpoint. It has to be used in %AREA1% and %AREA2% in order to triangulate the weakpoint. Warning: station's AI will be notified as soon as the process starts!"
- icon = 'icons/obj/device.dmi'
+ icon = 'icons/obj/syndicate_tools.dmi'
icon_state = "weakpoint_locator"
inhand_icon_state = "weakpoint_locator"
lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
diff --git a/code/modules/antagonists/traitor/objectives/steal.dm b/code/modules/antagonists/traitor/objectives/steal.dm
index 1d45b7e40a7..789db981ba5 100644
--- a/code/modules/antagonists/traitor/objectives/steal.dm
+++ b/code/modules/antagonists/traitor/objectives/steal.dm
@@ -250,7 +250,7 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new())
desc = "It looks dangerous."
item_flags = EXAMINE_SKIP
- icon = 'icons/obj/device_syndie.dmi'
+ icon = 'icons/obj/syndicate_tools.dmi'
icon_state = "bug"
/// The object on which this bug can be planted on. Has to be a type.
diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm
index 44c0a564194..fe3fe795689 100644
--- a/code/modules/antagonists/wizard/equipment/artefact.dm
+++ b/code/modules/antagonists/wizard/equipment/artefact.dm
@@ -6,7 +6,7 @@
/obj/item/veilrender
name = "veil render"
desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast city."
- icon = 'icons/obj/eldritch.dmi'
+ icon = 'icons/obj/weapons/khopesh.dmi'
icon_state = "bone_blade"
inhand_icon_state = "bone_blade"
worn_icon_state = "bone_blade"
@@ -210,7 +210,7 @@
/obj/item/necromantic_stone
name = "necromantic stone"
desc = "A shard capable of resurrecting humans as skeleton thralls."
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "necrostone"
inhand_icon_state = "electronic"
lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
@@ -320,7 +320,7 @@
/obj/item/warp_whistle
name = "warp whistle"
desc = "Calls a cloud to come pick you up and drop you at a random location on the station."
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/obj/art/musician.dmi'
icon_state = "whistle"
/// Person using the warp whistle
@@ -341,7 +341,7 @@
/obj/effect/temp_visual/teleporting_tornado
name = "tornado"
desc = "This thing sucks!"
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/effects/magic.dmi'
icon_state = "tornado"
layer = FLY_LAYER
plane = ABOVE_GAME_PLANE
diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm
index f72fa42dce2..ce9a5023c82 100644
--- a/code/modules/antagonists/wizard/equipment/soulstone.dm
+++ b/code/modules/antagonists/wizard/equipment/soulstone.dm
@@ -1,6 +1,6 @@
/obj/item/soulstone
name = "soulstone shard"
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "soulstone"
inhand_icon_state = "electronic"
lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
@@ -260,7 +260,7 @@
///////////////////////////Transferring to constructs/////////////////////////////////////////////////////
/obj/structure/constructshell
name = "empty shell"
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/mob/shells.dmi'
icon_state = "construct_cult"
desc = "A wicked machine used by those skilled in magical arts. It is inactive."
diff --git a/code/modules/antagonists/wizard/grand_ritual/grand_ritual_finale.dm b/code/modules/antagonists/wizard/grand_ritual/grand_ritual_finale.dm
index 9e752363cf0..962fa24450b 100644
--- a/code/modules/antagonists/wizard/grand_ritual/grand_ritual_finale.dm
+++ b/code/modules/antagonists/wizard/grand_ritual/grand_ritual_finale.dm
@@ -274,7 +274,7 @@
/datum/grand_finale/magic
name = "Evolution"
desc = "The ultimate use of your gathered power! Give the crew their own magic, they'll surely realise that right and wrong have no meaning when you hold ultimate power!"
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/obj/scrolls.dmi'
icon_state = "scroll"
/datum/grand_finale/magic/trigger(mob/living/carbon/human/invoker)
diff --git a/code/modules/asset_cache/assets/rcd.dm b/code/modules/asset_cache/assets/rcd.dm
index 8050a86c766..0f085e2f67a 100644
--- a/code/modules/asset_cache/assets/rcd.dm
+++ b/code/modules/asset_cache/assets/rcd.dm
@@ -11,8 +11,8 @@
'icons/obj/lighting.dmi' = list("floodlight_c1"),
'icons/obj/monitors.dmi' = list("alarm_bitem"),
'icons/obj/wallframe.dmi' = list("apc"),
- 'icons/obj/stock_parts.dmi' = list("box_1"),
- 'icons/obj/objects.dmi' = list("bed"),
+ 'icons/obj/assemblies/stock_parts.dmi' = list("box_1"),
+ 'icons/obj/bed.dmi' = list("bed"),
'icons/obj/smooth_structures/catwalk.dmi' = list("catwalk-0"),
'icons/hud/radial.dmi' = list("cnorth", "csouth", "ceast", "cwest", "chair", "secure_windoor", "stool", "wallfloor", "windowsize", "windowtype", "windoor"),
'icons/obj/structures.dmi' = list("glass_table", "rack", "rwindow0", "reflector_base", "table", "window0", "girder"),
diff --git a/code/modules/asset_cache/assets/sheetmaterials.dm b/code/modules/asset_cache/assets/sheetmaterials.dm
index d746b5783e5..037a7e4b4fc 100644
--- a/code/modules/asset_cache/assets/sheetmaterials.dm
+++ b/code/modules/asset_cache/assets/sheetmaterials.dm
@@ -4,5 +4,3 @@
/datum/asset/spritesheet/sheetmaterials/create_spritesheets()
InsertAll("", 'icons/obj/stack_objects.dmi')
- // Special case to handle Bluespace Crystals
- Insert("polycrystal", 'icons/obj/telescience.dmi', "polycrystal")
diff --git a/code/modules/awaymissions/mission_code/Cabin.dm b/code/modules/awaymissions/mission_code/Cabin.dm
index 3a7bdef7be9..4e410df1a1f 100644
--- a/code/modules/awaymissions/mission_code/Cabin.dm
+++ b/code/modules/awaymissions/mission_code/Cabin.dm
@@ -107,7 +107,7 @@
/obj/structure/ladder/unbreakable/rune
name = "\improper Teleportation Rune"
desc = "Could lead anywhere."
- icon = 'icons/obj/rune.dmi'
+ icon = 'icons/obj/cult/rune.dmi'
icon_state = "1"
color = rgb(0,0,255)
diff --git a/code/modules/awaymissions/mission_code/moonoutpost19.dm b/code/modules/awaymissions/mission_code/moonoutpost19.dm
index 2447f45fac1..17385bc70bc 100644
--- a/code/modules/awaymissions/mission_code/moonoutpost19.dm
+++ b/code/modules/awaymissions/mission_code/moonoutpost19.dm
@@ -3,7 +3,7 @@
/obj/structure/fluff/minepost
name = "wooden post"
desc = "A sturdy space-wood post, capable of holding up a mineshaft."
- icon = 'icons/obj/fluff.dmi'
+ icon = 'icons/obj/fluff/general.dmi'
icon_state = "minepost"
density = FALSE
diff --git a/code/modules/awaymissions/mission_code/murderdome.dm b/code/modules/awaymissions/mission_code/murderdome.dm
index 2e3f4928fa2..d558ab812a6 100644
--- a/code/modules/awaymissions/mission_code/murderdome.dm
+++ b/code/modules/awaymissions/mission_code/murderdome.dm
@@ -30,7 +30,7 @@
/obj/effect/murderdome/dead_barricade
name = "dead barrier"
desc = "It provided cover in fire fights. And now it's gone."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "barrier0"
alpha = 100
diff --git a/code/modules/awaymissions/signpost.dm b/code/modules/awaymissions/signpost.dm
index 64aaca7aa99..c46b0b9aa3c 100644
--- a/code/modules/awaymissions/signpost.dm
+++ b/code/modules/awaymissions/signpost.dm
@@ -1,6 +1,6 @@
/*An alternative to exit gateways, signposts send you back to somewhere safe onstation with their semiotic magic.*/
/obj/structure/signpost
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/fluff/general.dmi'
icon_state = "signpost"
anchored = TRUE
density = TRUE
diff --git a/code/modules/capture_the_flag/ctf_game.dm b/code/modules/capture_the_flag/ctf_game.dm
index 84e5d35264c..9ca6fe89d8b 100644
--- a/code/modules/capture_the_flag/ctf_game.dm
+++ b/code/modules/capture_the_flag/ctf_game.dm
@@ -424,7 +424,7 @@
/obj/effect/ctf/dead_barricade
name = "dead barrier"
desc = "It provided cover in fire fights. And now it's gone."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "barrier0"
var/game_id = CTF_GHOST_CTF_GAME_ID
var/datum/ctf_controller/ctf_game
diff --git a/code/modules/clothing/head/beanie.dm b/code/modules/clothing/head/beanie.dm
index 5a97e308454..5ab9e7f917b 100644
--- a/code/modules/clothing/head/beanie.dm
+++ b/code/modules/clothing/head/beanie.dm
@@ -9,7 +9,7 @@
icon = 'icons/obj/clothing/head/beanie.dmi'
worn_icon = 'icons/mob/clothing/head/beanie.dmi'
icon_state = "beanie"
- icon_preview = 'icons/obj/previews.dmi'
+ icon_preview = 'icons/obj/fluff/previews.dmi'
icon_state_preview = "beanie_cloth"
custom_price = PAYCHECK_CREW * 1.2
greyscale_colors = "#EEEEEE#EEEEEE"
@@ -44,7 +44,7 @@
/obj/item/clothing/head/beanie/durathread
name = "durathread beanie"
desc = "A beanie made from durathread, its resilient fibres provide some protection to the wearer."
- icon_preview = 'icons/obj/previews.dmi'
+ icon_preview = 'icons/obj/fluff/previews.dmi'
icon_state_preview = "beanie_durathread"
greyscale_colors = "#8291A1#8291A1"
armor_type = /datum/armor/beanie_durathread
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 1064194d38d..ecdb3169d3a 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -491,7 +491,7 @@
name = "durathread beret"
desc = "A beret made from durathread, its resilient fibers provide some protection to the wearer."
icon_state = "beret_badge"
- icon_preview = 'icons/obj/previews.dmi'
+ icon_preview = 'icons/obj/fluff/previews.dmi'
icon_state_preview = "beret_durathread"
greyscale_config = /datum/greyscale_config/beret_badge
greyscale_config_worn = /datum/greyscale_config/beret_badge/worn
diff --git a/code/modules/clothing/masks/bandana.dm b/code/modules/clothing/masks/bandana.dm
index b7884744d90..3bf46f6ecee 100644
--- a/code/modules/clothing/masks/bandana.dm
+++ b/code/modules/clothing/masks/bandana.dm
@@ -131,7 +131,7 @@
desc = "A bandana made from durathread, you wish it would provide some protection to its wearer, but it's far too thin..."
greyscale_colors = "#5c6d80"
flags_1 = NONE
- icon_preview = 'icons/obj/previews.dmi'
+ icon_preview = 'icons/obj/fluff/previews.dmi'
icon_state_preview = "bandana_durathread"
/obj/item/clothing/mask/bandana/striped
diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
index 3e05f94a767..d1bcab55f13 100644
--- a/code/modules/clothing/neck/_neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -305,7 +305,7 @@
/obj/item/clothing/neck/scarf
name = "scarf"
icon_state = "scarf"
- icon_preview = 'icons/obj/previews.dmi'
+ icon_preview = 'icons/obj/fluff/previews.dmi'
icon_state_preview = "scarf_cloth"
desc = "A stylish scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks."
w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/clothing/shoes/sneakers.dm b/code/modules/clothing/shoes/sneakers.dm
index e02388d1c9d..a2a999db48b 100644
--- a/code/modules/clothing/shoes/sneakers.dm
+++ b/code/modules/clothing/shoes/sneakers.dm
@@ -54,7 +54,7 @@
/obj/item/clothing/shoes/sneakers/white
name = "white shoes"
greyscale_colors = "#ffffff#ffffff"
- icon_preview = 'icons/obj/previews.dmi'
+ icon_preview = 'icons/obj/fluff/previews.dmi'
icon_state_preview = "shoes_cloth"
armor_type = /datum/armor/sneakers_white
@@ -76,7 +76,7 @@
/obj/item/clothing/shoes/sneakers/orange
name = "orange shoes"
- icon_preview = 'icons/obj/previews.dmi'
+ icon_preview = 'icons/obj/fluff/previews.dmi'
icon_state_preview = "prisonshoes"
greyscale_colors = "#d15b1b#ffffff"
greyscale_config = /datum/greyscale_config/sneakers_orange
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index fd2dba4ce2b..1127ff9cd1c 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -231,7 +231,7 @@
name = "prison jumpsuit"
desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
icon_state = "jumpsuit"
- icon_preview = 'icons/obj/previews.dmi'
+ icon_preview = 'icons/obj/fluff/previews.dmi'
icon_state_preview = "prisonsuit"
inhand_icon_state = "jumpsuit"
greyscale_colors = "#ff8300"
@@ -247,7 +247,7 @@
name = "prison jumpskirt"
desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
icon_state = "jumpskirt"
- icon_preview = 'icons/obj/previews.dmi'
+ icon_preview = 'icons/obj/fluff/previews.dmi'
icon_state_preview = "prisonskirt"
greyscale_colors = "#ff8300"
greyscale_config = /datum/greyscale_config/jumpsuit_prison
diff --git a/code/modules/events/immovable_rod/immovable_rod.dm b/code/modules/events/immovable_rod/immovable_rod.dm
index 48e9b126510..07aa4d25683 100644
--- a/code/modules/events/immovable_rod/immovable_rod.dm
+++ b/code/modules/events/immovable_rod/immovable_rod.dm
@@ -2,7 +2,7 @@
/obj/effect/immovablerod
name = "immovable rod"
desc = "What the fuck is that?"
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/anomaly.dmi'
icon_state = "immrod"
throwforce = 100
move_force = INFINITY
diff --git a/code/modules/events/wizard/greentext.dm b/code/modules/events/wizard/greentext.dm
index 410a584aa63..2c2115f5959 100644
--- a/code/modules/events/wizard/greentext.dm
+++ b/code/modules/events/wizard/greentext.dm
@@ -26,7 +26,7 @@
name = "greentext"
desc = "No one knows what this massive tome does, but it feels desirable all the same..."
w_class = WEIGHT_CLASS_BULKY
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "greentext"
resistance_flags = FIRE_PROOF | ACID_PROOF | INDESTRUCTIBLE
///The current holder of the greentext.
diff --git a/code/modules/events/wizard/rpgloot.dm b/code/modules/events/wizard/rpgloot.dm
index 9e2f96c63c6..e31f970fea8 100644
--- a/code/modules/events/wizard/rpgloot.dm
+++ b/code/modules/events/wizard/rpgloot.dm
@@ -14,7 +14,7 @@
/obj/item/upgradescroll
name = "item fortification scroll"
desc = "Somehow, this piece of paper can be applied to items to make them \"better\". Apparently there's a risk of losing the item if it's already \"too good\". This all feels so arbitrary..."
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/obj/scrolls.dmi'
icon_state = "scroll"
worn_icon_state = "scroll"
w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/events/wormholes.dm b/code/modules/events/wormholes.dm
index f80d432c892..8de555345a1 100644
--- a/code/modules/events/wormholes.dm
+++ b/code/modules/events/wormholes.dm
@@ -50,7 +50,7 @@ GLOBAL_LIST_EMPTY(all_wormholes) // So we can pick wormholes to teleport to
/obj/effect/portal/wormhole
name = "wormhole"
desc = "It looks highly unstable; It could close at any moment."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/anomaly.dmi'
icon_state = "anom"
mech_sized = TRUE
diff --git a/code/modules/fishing/fish/chasm_detritus.dm b/code/modules/fishing/fish/chasm_detritus.dm
index ef6674c04e4..69105daeba4 100644
--- a/code/modules/fishing/fish/chasm_detritus.dm
+++ b/code/modules/fishing/fish/chasm_detritus.dm
@@ -9,7 +9,7 @@
/obj/item/chasm_detritus
name = "chasm detritus"
desc = "Abstract concept of an object which once fell into a deep hole."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/maintenance_loot.dmi'
icon_state = "skub"
/// The chance (out of 100) to fish out something from `default_contents`
/// even if there's something in GLOB.chasm_storage.
@@ -98,10 +98,10 @@
return chasm_contents
/// Body detritus is selected in favor of bodies belonging to sentient mobs
-/// The first sentient body found in the list of contents is returned, otherwise
+/// The first sentient body found in the list of contents is returned, otherwise
/// if none are sentient choose randomly.
/obj/item/chasm_detritus/restricted/bodies/determine_detritus(list/chasm_stuff)
- for(var/mob/fallen_mob as anything in chasm_stuff)
+ for(var/mob/fallen_mob as anything in chasm_stuff)
if(fallen_mob.mind)
return fallen_mob
return ..()
diff --git a/code/modules/food_and_drinks/machinery/deep_fryer.dm b/code/modules/food_and_drinks/machinery/deep_fryer.dm
index e3cf77a3479..6947faaaa42 100644
--- a/code/modules/food_and_drinks/machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/machinery/deep_fryer.dm
@@ -16,7 +16,7 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
/obj/machinery/deepfryer
name = "deep fryer"
desc = "Deep fried everything."
- icon = 'icons/obj/kitchen.dmi'
+ icon = 'icons/obj/machines/kitchenmachines.dmi'
icon_state = "fryer_off"
density = TRUE
pass_flags_self = PASSMACHINE | LETPASSTHROW
diff --git a/code/modules/food_and_drinks/machinery/gibber.dm b/code/modules/food_and_drinks/machinery/gibber.dm
index 5bf49c0778c..1386568786f 100644
--- a/code/modules/food_and_drinks/machinery/gibber.dm
+++ b/code/modules/food_and_drinks/machinery/gibber.dm
@@ -1,7 +1,7 @@
/obj/machinery/gibber
name = "gibber"
desc = "The name isn't descriptive enough?"
- icon = 'icons/obj/kitchen.dmi'
+ icon = 'icons/obj/machines/kitchenmachines.dmi'
icon_state = "grinder"
density = TRUE
circuit = /obj/item/circuitboard/machine/gibber
diff --git a/code/modules/food_and_drinks/machinery/grill.dm b/code/modules/food_and_drinks/machinery/grill.dm
index 3c2d462c673..48009a296ed 100644
--- a/code/modules/food_and_drinks/machinery/grill.dm
+++ b/code/modules/food_and_drinks/machinery/grill.dm
@@ -6,7 +6,7 @@
/obj/machinery/grill
name = "grill"
desc = "Just like the old days."
- icon = 'icons/obj/kitchen.dmi'
+ icon = 'icons/obj/machines/kitchenmachines.dmi'
icon_state = "grill_open"
density = TRUE
pass_flags_self = PASSMACHINE | LETPASSTHROW
diff --git a/code/modules/food_and_drinks/machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/machinery/monkeyrecycler.dm
index 1a9c8db1bb0..eb1cdd72a81 100644
--- a/code/modules/food_and_drinks/machinery/monkeyrecycler.dm
+++ b/code/modules/food_and_drinks/machinery/monkeyrecycler.dm
@@ -3,7 +3,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers)
/obj/machinery/monkey_recycler
name = "monkey recycler"
desc = "A machine used for recycling dead monkeys into monkey cubes."
- icon = 'icons/obj/kitchen.dmi'
+ icon = 'icons/obj/machines/kitchenmachines.dmi'
icon_state = "grinder"
layer = BELOW_OBJ_LAYER
density = TRUE
diff --git a/code/modules/food_and_drinks/machinery/processor.dm b/code/modules/food_and_drinks/machinery/processor.dm
index fa5b0fb3c5d..1b6dcc28381 100644
--- a/code/modules/food_and_drinks/machinery/processor.dm
+++ b/code/modules/food_and_drinks/machinery/processor.dm
@@ -3,7 +3,7 @@
/obj/machinery/processor
name = "food processor"
desc = "An industrial grinder used to process meat and other foods. Keep hands clear of intake area while operating."
- icon = 'icons/obj/kitchen.dmi'
+ icon = 'icons/obj/machines/kitchenmachines.dmi'
icon_state = "processor1"
layer = BELOW_OBJ_LAYER
density = TRUE
diff --git a/code/modules/food_and_drinks/machinery/smartfridge.dm b/code/modules/food_and_drinks/machinery/smartfridge.dm
index a7c5907129a..d39a1f6e552 100644
--- a/code/modules/food_and_drinks/machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/machinery/smartfridge.dm
@@ -4,7 +4,7 @@
/obj/machinery/smartfridge
name = "smartfridge"
desc = "Keeps cold things cold and hot things cold."
- icon = 'icons/obj/smartfridge.dmi'
+ icon = 'icons/obj/machines/smartfridge.dmi'
icon_state = "smartfridge"
layer = BELOW_OBJ_LAYER
density = TRUE
diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm
index 57bb3115406..d96bc1ec009 100644
--- a/code/modules/hydroponics/fermenting_barrel.dm
+++ b/code/modules/hydroponics/fermenting_barrel.dm
@@ -1,7 +1,7 @@
/obj/structure/fermenting_barrel
name = "wooden barrel"
desc = "A large wooden barrel. You can ferment fruits and such inside it, or just use it to hold reagents."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "barrel"
base_icon_state = "barrel"
resistance_flags = FLAMMABLE
diff --git a/code/modules/industrial_lift/elevator/elevator_panel.dm b/code/modules/industrial_lift/elevator/elevator_panel.dm
index 989ac390015..ee137f7c36d 100644
--- a/code/modules/industrial_lift/elevator/elevator_panel.dm
+++ b/code/modules/industrial_lift/elevator/elevator_panel.dm
@@ -15,7 +15,7 @@
desc = "\"In case of emergency, please use the stairs.\" Thus, always use the stairs."
density = FALSE
- icon = 'icons/obj/stationobjs.dmi'
+ icon = 'icons/obj/wallmounts.dmi'
icon_state = "elevpanel0"
base_icon_state = "elevpanel"
diff --git a/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm b/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm
index a038f7075e1..0bb5b40bdc3 100644
--- a/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm
+++ b/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm
@@ -139,7 +139,7 @@
/obj/item/nullrod/claymore/darkblade
name = "dark blade"
desc = "Spread the glory of the dark gods!"
- icon = 'icons/obj/cult/items_and_weapons.dmi'
+ icon = 'icons/obj/weapons/sword.dmi'
icon_state = "cultblade"
inhand_icon_state = "cultblade"
worn_icon_state = "cultblade"
@@ -365,7 +365,7 @@
/obj/item/nullrod/clown
name = "clown dagger"
desc = "Used for absolutely hilarious sacrifices."
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/obj/weapons/khopesh.dmi'
icon_state = "clownrender"
inhand_icon_state = "cultdagger"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
diff --git a/code/modules/mapfluff/ruins/icemoonruin_code/library.dm b/code/modules/mapfluff/ruins/icemoonruin_code/library.dm
index 149cb64f63b..aa2fe26d770 100644
--- a/code/modules/mapfluff/ruins/icemoonruin_code/library.dm
+++ b/code/modules/mapfluff/ruins/icemoonruin_code/library.dm
@@ -26,7 +26,7 @@
/obj/item/feather
name = "feather"
desc = "A dark, wilting feather. It seems as old as time."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/library.dmi'
icon_state = "feather"
force = 0
throwforce = 0
diff --git a/code/modules/mapfluff/ruins/lavaland_ruin_code.dm b/code/modules/mapfluff/ruins/lavaland_ruin_code.dm
index 059075c8e5d..6b5690de633 100644
--- a/code/modules/mapfluff/ruins/lavaland_ruin_code.dm
+++ b/code/modules/mapfluff/ruins/lavaland_ruin_code.dm
@@ -31,7 +31,7 @@
/obj/item/golem_shell
name = "incomplete free golem shell"
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/mob/shells.dmi'
icon_state = "shell_unfinished"
desc = "The incomplete body of a golem. Add ten sheets of certain minerals to finish."
w_class = WEIGHT_CLASS_BULKY
diff --git a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm
index b5b68b7326a..435b863868f 100644
--- a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm
+++ b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm
@@ -20,7 +20,7 @@
custom_materials = list(/datum/material/bone=SHEET_MATERIAL_AMOUNT*4)
icon = 'icons/obj/art/statuelarge.dmi'
icon_state = "rib"
- icon_preview = 'icons/obj/previews.dmi'
+ icon_preview = 'icons/obj/fluff/previews.dmi'
icon_state_preview = "rib"
/obj/structure/statue/bone/skull
@@ -29,7 +29,7 @@
custom_materials = list(/datum/material/bone=SHEET_MATERIAL_AMOUNT*12)
icon = 'icons/obj/art/statuelarge.dmi'
icon_state = "skull"
- icon_preview = 'icons/obj/previews.dmi'
+ icon_preview = 'icons/obj/fluff/previews.dmi'
icon_state_preview = "skull"
/obj/structure/statue/bone/skull/half
@@ -37,7 +37,7 @@
custom_materials = list(/datum/material/bone=SHEET_MATERIAL_AMOUNT*6)
icon = 'icons/obj/art/statuelarge.dmi'
icon_state = "skull-half"
- icon_preview = 'icons/obj/previews.dmi'
+ icon_preview = 'icons/obj/fluff/previews.dmi'
icon_state_preview = "halfskull"
//***Wasteland floor and rock turfs here.
diff --git a/code/modules/mapfluff/ruins/lavalandruin_code/puzzle.dm b/code/modules/mapfluff/ruins/lavalandruin_code/puzzle.dm
index 23747bc525b..713bf6e9360 100644
--- a/code/modules/mapfluff/ruins/lavalandruin_code/puzzle.dm
+++ b/code/modules/mapfluff/ruins/lavalandruin_code/puzzle.dm
@@ -138,10 +138,10 @@
return sortTim(elements,cmp=/proc/cmp_xy_desc)
/obj/effect/sliding_puzzle/proc/get_base_icon()
- var/icon/I = new('icons/obj/puzzle.dmi')
+ var/icon/I = new('icons/obj/fluff/puzzle.dmi')
var/list/puzzles = icon_states(I)
var/puzzle_state = pick(puzzles)
- var/icon/P = new('icons/obj/puzzle.dmi',puzzle_state)
+ var/icon/P = new('icons/obj/fluff/puzzle.dmi',puzzle_state)
return P
/obj/effect/sliding_puzzle/proc/setup()
diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/mapfluff/ruins/objects_and_mobs/sin_ruins.dm
index acb351813cf..9f69ce07c7c 100644
--- a/code/modules/mapfluff/ruins/objects_and_mobs/sin_ruins.dm
+++ b/code/modules/mapfluff/ruins/objects_and_mobs/sin_ruins.dm
@@ -112,7 +112,7 @@
/obj/item/knife/envy //Envy's knife: Found in the Envy ruin. Attackers take on the appearance of whoever they strike.
name = "envy's knife"
desc = "Their success will be yours."
- icon = 'icons/obj/cult/items_and_weapons.dmi'
+ icon = 'icons/obj/weapons/khopesh.dmi'
icon_state = "render"
inhand_icon_state = "knife"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
diff --git a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
index 633081ecefe..046fe1f2e39 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
@@ -4,7 +4,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
/obj/item/hilbertshotel
name = "Hilbert's Hotel"
desc = "A sphere of what appears to be an intricate network of bluespace. Observing it in detail seems to give you a headache as you try to comprehend the infinite amount of infinitesimally distinct points on its surface."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/structures.dmi'
icon_state = "hilbertshotel"
w_class = WEIGHT_CLASS_SMALL
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
diff --git a/code/modules/mapfluff/ruins/spaceruin_code/originalcontent.dm b/code/modules/mapfluff/ruins/spaceruin_code/originalcontent.dm
index a6307fee400..d2380479a56 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/originalcontent.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/originalcontent.dm
@@ -4,7 +4,7 @@
desc = "Various scrawled out drawings and sketches reside on the paper, apparently he didn't much care for these drawings."
/obj/item/paper/pamphlet/ruin/originalcontent
- icon = 'icons/obj/fluff.dmi'
+ icon = 'icons/obj/fluff/general.dmi'
icon_state = "painting1"
/obj/item/paper/pamphlet/ruin/originalcontent/stickman
diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm
index 380198832c9..d875d6b73c4 100644
--- a/code/modules/mining/aux_base.dm
+++ b/code/modules/mining/aux_base.dm
@@ -334,7 +334,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/auxiliary_base, 32)
anchored = FALSE
density = FALSE
var/shuttle_ID = "landing_zone_dock"
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/mining.dmi'
icon_state = "miningbeacon"
var/obj/docking_port/stationary/Mport //Linked docking port for the mining shuttle
pressure_resistance = 200 //So it does not get blown into lava.
diff --git a/code/modules/mining/lavaland/megafauna_loot.dm b/code/modules/mining/lavaland/megafauna_loot.dm
index f42d48b5b1d..515a263cd1c 100644
--- a/code/modules/mining/lavaland/megafauna_loot.dm
+++ b/code/modules/mining/lavaland/megafauna_loot.dm
@@ -238,7 +238,7 @@
/obj/item/mayhem
name = "mayhem in a bottle"
desc = "A magically infused bottle of blood, the scent of which will drive anyone nearby into a murderous frenzy."
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "vial"
/obj/item/mayhem/attack_self(mob/user)
@@ -710,7 +710,7 @@
/obj/item/dragons_blood
name = "bottle of dragons blood"
desc = "You're not actually going to drink this, are you?"
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "vial"
/obj/item/dragons_blood/attack_self(mob/living/carbon/human/user)
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index f52a59a269a..ecd5a8e9b00 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -104,7 +104,7 @@
name = "pile of bear armor"
desc = "A scattered pile of various shaped armor pieces fitted for a bear, some duct tape, and a nail filer. Crude instructions \
are written on the back of one of the plates in russian. This seems like an awful idea."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/device.dmi'
icon_state = "bear_armor_upgrade"
/obj/item/bear_armor/afterattack(atom/target, mob/user, proximity_flag)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
index 6caea3efaad..86a44af1e82 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
@@ -233,7 +233,7 @@ Difficulty: Extremely Hard
/obj/item/resurrection_crystal
name = "resurrection crystal"
desc = "When used by anything holding it, this crystal gives them a second chance at life if they die."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/mining.dmi'
icon_state = "demonic_crystal"
/obj/item/resurrection_crystal/attack_self(mob/living/user)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
index 150e744eff7..5cc73c3e84b 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
@@ -296,7 +296,7 @@
duration = 13
/obj/effect/temp_visual/fireball
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/effects/magic.dmi'
icon_state = "fireball"
name = "fireball"
desc = "Get out of the way!"
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
index 5fc03caf8e2..efd53561458 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
@@ -291,7 +291,7 @@ Difficulty: Hard
/obj/item/wendigo_blood
name = "bottle of wendigo blood"
desc = "A bottle of viscous red liquid... You're not actually going to drink this, are you?"
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "vial"
/obj/item/wendigo_blood/attack_self(mob/living/user)
diff --git a/code/modules/mob_spawn/ghost_roles/golem_roles.dm b/code/modules/mob_spawn/ghost_roles/golem_roles.dm
index 4c6ee693c88..f574aa31e0b 100644
--- a/code/modules/mob_spawn/ghost_roles/golem_roles.dm
+++ b/code/modules/mob_spawn/ghost_roles/golem_roles.dm
@@ -5,7 +5,7 @@
/obj/effect/mob_spawn/ghost_role/human/golem
name = "inert free golem shell"
desc = "A humanoid shape, empty, lifeless, and full of potential."
- icon = 'icons/obj/wizard.dmi'
+ icon = 'icons/mob/shells.dmi'
icon_state = "shell_complete"
mob_species = /datum/species/golem
anchored = FALSE
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 5bababb9a50..772e64cfae3 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -6,7 +6,7 @@
/obj/machinery/power/solar
name = "solar panel"
desc = "A solar panel. Generates electricity when in contact with sunlight."
- icon = 'icons/obj/solar.dmi'
+ icon = 'icons/obj/machines/solar.dmi'
icon_state = "sp_base"
density = TRUE
use_power = NO_POWER_USE
@@ -269,7 +269,7 @@
/obj/item/solar_assembly
name = "solar panel assembly"
desc = "A solar panel assembly kit, allows constructions of a solar panel, or with a tracking circuit board, a solar tracker."
- icon = 'icons/obj/solar.dmi'
+ icon = 'icons/obj/machines/solar.dmi'
icon_state = "sp_base"
inhand_icon_state = "electropack"
lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm
index 63733acf8a7..922f0ede646 100644
--- a/code/modules/power/tracker.dm
+++ b/code/modules/power/tracker.dm
@@ -9,7 +9,7 @@
/obj/machinery/power/tracker
name = "solar tracker"
desc = "A solar directional tracker."
- icon = 'icons/obj/solar.dmi'
+ icon = 'icons/obj/machines/solar.dmi'
icon_state = "tracker_base"
density = TRUE
use_power = NO_POWER_USE
diff --git a/code/modules/projectiles/guns/ballistic/bows/_bow.dm b/code/modules/projectiles/guns/ballistic/bows/_bow.dm
index 9add02889ad..6d560804368 100644
--- a/code/modules/projectiles/guns/ballistic/bows/_bow.dm
+++ b/code/modules/projectiles/guns/ballistic/bows/_bow.dm
@@ -1,6 +1,6 @@
/obj/item/gun/ballistic/bow
- icon = 'icons/obj/weapons/guns/bows/bows.dmi'
+ icon = 'icons/obj/weapons/bows/bows.dmi'
lefthand_file = 'icons/mob/inhands/weapons/bows_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/bows_righthand.dmi'
name = "bow"
diff --git a/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm b/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm
index 7b52baff4dc..6bdbd5f5474 100644
--- a/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm
+++ b/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm
@@ -2,7 +2,7 @@
/obj/item/ammo_casing/arrow
name = "arrow"
desc = "Stabby Stabman!"
- icon = 'icons/obj/weapons/guns/bows/arrows.dmi'
+ icon = 'icons/obj/weapons/bows/arrows.dmi'
icon_state = "arrow"
base_icon_state = "arrow"
inhand_icon_state = "arrow"
@@ -27,7 +27,17 @@
/obj/projectile/bullet/arrow
name = "arrow"
desc = "Ow! Get it out of me!"
- icon = 'icons/obj/weapons/guns/bows/arrows.dmi'
+ icon = 'icons/obj/weapons/bows/arrows.dmi'
+ icon_state = "arrow_projectile"
+ damage = 50
+ speed = 1
+ range = 25
+
+///*sigh* NON-REUSABLE base arrow projectile. In the future: let's componentize the reusable subtype, jesus
+/obj/projectile/bullet/arrow
+ name = "arrow"
+ desc = "Ow! Get it out of me!"
+ icon = 'icons/obj/weapons/bows/arrows.dmi'
icon_state = "arrow_projectile"
damage = 50
speed = 1
diff --git a/code/modules/projectiles/guns/ballistic/bows/bow_quivers.dm b/code/modules/projectiles/guns/ballistic/bows/bow_quivers.dm
index 7fe37c1ed65..fe543e9458c 100644
--- a/code/modules/projectiles/guns/ballistic/bows/bow_quivers.dm
+++ b/code/modules/projectiles/guns/ballistic/bows/bow_quivers.dm
@@ -2,7 +2,7 @@
/obj/item/storage/bag/quiver
name = "quiver"
desc = "Holds arrows for your bow. Good, because while pocketing arrows is possible, it surely can't be pleasant."
- icon = 'icons/obj/weapons/guns/bows/quivers.dmi'
+ icon = 'icons/obj/weapons/bows/quivers.dmi'
icon_state = "quiver"
inhand_icon_state = null
worn_icon_state = "harpoon_quiver"
diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm
index 60225e8db12..7b15149a73a 100644
--- a/code/modules/projectiles/guns/ballistic/launchers.dm
+++ b/code/modules/projectiles/guns/ballistic/launchers.dm
@@ -23,7 +23,7 @@
/obj/item/gun/ballistic/revolver/grenadelauncher/cyborg
desc = "A 6-shot grenade launcher."
name = "multi grenade launcher"
- icon = 'icons/mecha/mecha_equipment.dmi'
+ icon = 'icons/mob/mecha_equipment.dmi'
icon_state = "mecha_grenadelnchr"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/grenademulti
pin = /obj/item/firing_pin
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index 9f59d1677b7..4d230387f08 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -223,7 +223,7 @@
/obj/item/borg/upgrade/modkit
name = "kinetic accelerator modification kit"
desc = "An upgrade for kinetic accelerators."
- icon = 'icons/obj/objects.dmi'
+ icon = 'icons/obj/mining.dmi'
icon_state = "modkit"
w_class = WEIGHT_CLASS_SMALL
require_model = TRUE
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index a56f4439fb7..afe59235478 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -431,9 +431,9 @@
/// The duration of the trail before deleting.
var/trail_lifespan = 0 SECONDS
/// The icon the trail uses.
- var/trail_icon = 'icons/obj/wizard.dmi'
+ var/trail_icon = 'icons/effects/magic.dmi'
/// The icon state the trail uses.
- var/trail_icon_state = "trail"
+ var/trail_icon_state = "arrow"
/obj/projectile/magic/aoe/Range()
if(trigger_range >= 1)
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index 4a960458401..f23883b82a3 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -2,7 +2,7 @@
/obj/machinery/reagentgrinder
name = "\improper All-In-One Grinder"
desc = "From BlenderTech. Will It Blend? Let's test it out!"
- icon = 'icons/obj/kitchen.dmi'
+ icon = 'icons/obj/machines/kitchenmachines.dmi'
icon_state = "juicer1"
base_icon_state = "juicer"
layer = BELOW_OBJ_LAYER
diff --git a/code/modules/religion/honorbound/honorbound_rites.dm b/code/modules/religion/honorbound/honorbound_rites.dm
index d2718fe1bde..6ba557d5a30 100644
--- a/code/modules/religion/honorbound/honorbound_rites.dm
+++ b/code/modules/religion/honorbound/honorbound_rites.dm
@@ -138,8 +138,8 @@
return TRUE
/obj/item/paper/holy_writ
- icon = 'icons/obj/wizard.dmi'
- icon_state = "scroll"
+ icon = 'icons/obj/scrolls.dmi'
+ icon_state = "honorscroll"
slot_flags = null
show_written_words = FALSE
diff --git a/code/modules/religion/sparring/sparring_contract.dm b/code/modules/religion/sparring/sparring_contract.dm
index 4f1f17e6837..c31be81f649 100644
--- a/code/modules/religion/sparring/sparring_contract.dm
+++ b/code/modules/religion/sparring/sparring_contract.dm
@@ -1,7 +1,7 @@
/obj/item/sparring_contract
desc = "A contract for setting up sparring matches. Both sparring partners must agree with the terms to begin."
- icon = 'icons/obj/wizard.dmi'
- icon_state = "scroll"
+ icon = 'icons/obj/scrolls.dmi'
+ icon_state = "sparringcontract"
drop_sound = 'sound/items/handling/paper_drop.ogg'
pickup_sound = 'sound/items/handling/paper_pickup.ogg'
throw_range = 1
diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm
index 1b64d613297..5e524f79349 100644
--- a/code/modules/research/stock_parts.dm
+++ b/code/modules/research/stock_parts.dm
@@ -240,7 +240,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
/obj/item/stock_parts
name = "stock part"
desc = "What?"
- icon = 'icons/obj/stock_parts.dmi'
+ icon = 'icons/obj/assemblies/stock_parts.dmi'
w_class = WEIGHT_CLASS_SMALL
var/rating = 1
///Used when a base part has a different name to higher tiers of part. For example, machine frames want any servo and not just a micro-servo.
@@ -474,6 +474,6 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
/obj/item/research//Makes testing much less of a pain -Sieve
name = "research"
- icon = 'icons/obj/stock_parts.dmi'
+ icon = 'icons/obj/assemblies/stock_parts.dmi'
icon_state = "capacitor"
desc = "A debug item for research."
diff --git a/code/modules/research/xenobiology/crossbreeding/_weapons.dm b/code/modules/research/xenobiology/crossbreeding/_weapons.dm
index 4e2adcb958b..2d4f01ed7c2 100644
--- a/code/modules/research/xenobiology/crossbreeding/_weapons.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_weapons.dm
@@ -20,7 +20,7 @@ Slimecrossing Weapons
/obj/item/knife/rainbowknife
name = "rainbow knife"
desc = "A strange, transparent knife which constantly shifts color. It hums slightly when moved."
- icon = 'icons/obj/xenobiology/slimecrossing.dmi'
+ icon = 'icons/obj/weapons/stabby.dmi'
icon_state = "rainbowknife"
inhand_icon_state = "rainbowknife"
force = 15
diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm
index bb401765d6b..5d2c91d1b48 100644
--- a/code/modules/station_goals/bsa.dm
+++ b/code/modules/station_goals/bsa.dm
@@ -147,7 +147,7 @@ GLOBAL_VAR_INIT(bsa_unlock, FALSE)
/obj/machinery/bsa/full
name = "Bluespace Artillery"
desc = "Long range bluespace artillery."
- icon = 'icons/obj/lavaland/cannon.dmi'
+ icon = 'icons/obj/machines/cannon.dmi'
icon_state = "cannon_west"
var/static/mutable_appearance/top_layer
var/ex_power = 3
diff --git a/code/modules/surgery/organs/internal/heart/_heart.dm b/code/modules/surgery/organs/internal/heart/_heart.dm
index 3a9920fe5f4..9e82316f944 100644
--- a/code/modules/surgery/organs/internal/heart/_heart.dm
+++ b/code/modules/surgery/organs/internal/heart/_heart.dm
@@ -457,7 +457,7 @@
/obj/structure/ethereal_crystal
name = "ethereal resurrection crystal"
desc = "It seems to contain the corpse of an ethereal mending its wounds."
- icon = 'icons/obj/ethereal_crystal.dmi'
+ icon = 'icons/mob/effects/ethereal_crystal.dmi'
icon_state = "ethereal_crystal"
damage_deflection = 0
max_integrity = 100
diff --git a/code/modules/vehicles/lavaboat.dm b/code/modules/vehicles/lavaboat.dm
index ee26db06aa8..07622336fc0 100644
--- a/code/modules/vehicles/lavaboat.dm
+++ b/code/modules/vehicles/lavaboat.dm
@@ -6,7 +6,7 @@
desc = "A boat used for traversing lava."
icon = 'icons/obj/lavaland/dragonboat.dmi'
icon_state = "goliath_boat"
- icon_preview = 'icons/obj/previews.dmi'
+ icon_preview = 'icons/obj/fluff/previews.dmi'
icon_state_preview = "boat"
resistance_flags = LAVA_PROOF | FIRE_PROOF
can_buckle = TRUE
diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm
index 1d3fb658f48..f53cc9bbe8a 100644
--- a/code/modules/vehicles/mecha/_mecha.dm
+++ b/code/modules/vehicles/mecha/_mecha.dm
@@ -20,7 +20,7 @@
/obj/vehicle/sealed/mecha
name = "exosuit"
desc = "Exosuit"
- icon = 'icons/mecha/mecha.dmi'
+ icon = 'icons/mob/mecha.dmi'
resistance_flags = FIRE_PROOF | ACID_PROOF
max_integrity = 300
armor_type = /datum/armor/sealed_mecha
diff --git a/code/modules/vehicles/mecha/combat/durand.dm b/code/modules/vehicles/mecha/combat/durand.dm
index 021ca168177..79d79ae6c59 100644
--- a/code/modules/vehicles/mecha/combat/durand.dm
+++ b/code/modules/vehicles/mecha/combat/durand.dm
@@ -156,7 +156,7 @@ own integrity back to max. Shield is automatically dropped if we run out of powe
/obj/durand_shield //projectiles get passed to this when defense mode is enabled
name = "defense grid"
- icon = 'icons/mecha/durand_shield.dmi'
+ icon = 'icons/mob/effects/durand_shield.dmi'
icon_state = "shield_null"
invisibility = INVISIBILITY_MAXIMUM //no showing on right-click
pixel_y = 4
diff --git a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
index 1ffc40fc10b..798cae231de 100644
--- a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
+++ b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
@@ -15,7 +15,7 @@
/obj/vehicle/sealed/mecha/savannah_ivanov
name = "\improper Savannah-Ivanov"
desc = "An insanely overbulked mecha that handily crushes single-pilot opponents. The price is that you need two pilots to use it."
- icon = 'icons/mecha/coop_mech.dmi'
+ icon = 'icons/mob/coop_mech.dmi'
base_icon_state = "savannah_ivanov"
icon_state = "savannah_ivanov_0_0"
//does not include mmi compatibility
diff --git a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm
index 16decef7733..4c03034e99b 100644
--- a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm
+++ b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm
@@ -4,7 +4,7 @@
*/
/obj/item/mecha_parts/mecha_equipment
name = "mecha equipment"
- icon = 'icons/mecha/mecha_equipment.dmi'
+ icon = 'icons/mob/mecha_equipment.dmi'
icon_state = "mecha_equip"
force = 5
max_integrity = 300
diff --git a/code/modules/vehicles/mecha/equipment/tools/other_tools.dm b/code/modules/vehicles/mecha/equipment/tools/other_tools.dm
index 1ad90432151..df80a13b6d0 100644
--- a/code/modules/vehicles/mecha/equipment/tools/other_tools.dm
+++ b/code/modules/vehicles/mecha/equipment/tools/other_tools.dm
@@ -514,7 +514,7 @@
/obj/item/mecha_parts/camera_kit
name = "exosuit-mounted camera"
desc = "A security camera meant for exosuit-mounted surveillance-on-the-go."
- icon = 'icons/mecha/mecha_equipment.dmi'
+ icon = 'icons/mob/mecha_equipment.dmi'
icon_state = "mecha_camera"
w_class = WEIGHT_CLASS_SMALL
diff --git a/code/modules/vehicles/mecha/equipment/weapons/mecha_ammo.dm b/code/modules/vehicles/mecha/equipment/weapons/mecha_ammo.dm
index ce644adfcac..0ad7bdf84a0 100644
--- a/code/modules/vehicles/mecha/equipment/weapons/mecha_ammo.dm
+++ b/code/modules/vehicles/mecha/equipment/weapons/mecha_ammo.dm
@@ -2,7 +2,7 @@
name = "generic ammo box"
desc = "A box of ammo for an unknown weapon."
w_class = WEIGHT_CLASS_BULKY
- icon = 'icons/mecha/mecha_ammo.dmi'
+ icon = 'icons/mob/mecha_ammo.dmi'
icon_state = "empty"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
diff --git a/code/modules/vehicles/mecha/mech_bay.dm b/code/modules/vehicles/mecha/mech_bay.dm
index 78130a18d5e..398a9c6c59b 100644
--- a/code/modules/vehicles/mecha/mech_bay.dm
+++ b/code/modules/vehicles/mecha/mech_bay.dm
@@ -3,7 +3,7 @@
desc = "This port recharges a mech's internal power cell."
density = TRUE
dir = EAST
- icon = 'icons/mecha/mech_bay.dmi'
+ icon = 'icons/obj/machines/mech_bay.dmi'
icon_state = "recharge_port"
circuit = /obj/item/circuitboard/machine/mech_recharger
///Weakref to currently recharging mech on our recharging_turf
diff --git a/code/modules/vehicles/mecha/mech_fabricator.dm b/code/modules/vehicles/mecha/mech_fabricator.dm
index 97894b28992..d3aa604ef49 100644
--- a/code/modules/vehicles/mecha/mech_fabricator.dm
+++ b/code/modules/vehicles/mecha/mech_fabricator.dm
@@ -1,5 +1,5 @@
/obj/machinery/mecha_part_fabricator
- icon = 'icons/obj/robotics.dmi'
+ icon = 'icons/obj/machines/robotics.dmi'
icon_state = "fab-idle"
name = "exosuit fabricator"
desc = "Nothing is being built."
diff --git a/code/modules/vehicles/mecha/mecha_construction_paths.dm b/code/modules/vehicles/mecha/mecha_construction_paths.dm
index 80db3df2bfb..8938ee8f0de 100644
--- a/code/modules/vehicles/mecha/mecha_construction_paths.dm
+++ b/code/modules/vehicles/mecha/mecha_construction_paths.dm
@@ -66,7 +66,7 @@
/datum/component/construction/unordered/mecha_chassis/spawn_result()
var/atom/parent_atom = parent
- parent_atom.icon = 'icons/mecha/mech_construction.dmi'
+ parent_atom.icon = 'icons/mob/mech_construction.dmi'
parent_atom.set_density(TRUE)
parent_atom.cut_overlays()
..()
@@ -559,7 +559,7 @@
/datum/component/construction/mecha/honker/update_parent(step_index)
if(step_index == 1)
var/atom/parent_atom = parent
- parent_atom.icon = 'icons/mecha/mech_construct.dmi'
+ parent_atom.icon = 'icons/mob/mech_construct.dmi'
parent_atom.icon_state = "honker_chassis"
..()
diff --git a/code/modules/vehicles/mecha/mecha_parts.dm b/code/modules/vehicles/mecha/mecha_parts.dm
index 54ab923be1f..c33beb3f713 100644
--- a/code/modules/vehicles/mecha/mecha_parts.dm
+++ b/code/modules/vehicles/mecha/mecha_parts.dm
@@ -4,7 +4,7 @@
/obj/item/mecha_parts
name = "mecha part"
- icon = 'icons/mecha/mech_construct.dmi'
+ icon = 'icons/mob/mech_construct.dmi'
icon_state = "blank"
w_class = WEIGHT_CLASS_GIGANTIC
flags_1 = CONDUCT_1
diff --git a/code/modules/vehicles/mecha/mecha_wreckage.dm b/code/modules/vehicles/mecha/mecha_wreckage.dm
index ff78cebb346..3540891d336 100644
--- a/code/modules/vehicles/mecha/mecha_wreckage.dm
+++ b/code/modules/vehicles/mecha/mecha_wreckage.dm
@@ -6,7 +6,7 @@
/obj/structure/mecha_wreckage
name = "exosuit wreckage"
desc = "Remains of some unfortunate mecha. Completely irreparable, but perhaps something can be salvaged."
- icon = 'icons/mecha/mecha.dmi'
+ icon = 'icons/mob/mecha.dmi'
density = TRUE
anchored = FALSE
opacity = FALSE
@@ -220,7 +220,7 @@
/obj/structure/mecha_wreckage/savannah_ivanov
name = "\improper Savannah-Ivanov wreckage"
- icon = 'icons/mecha/coop_mech.dmi'
+ icon = 'icons/mob/coop_mech.dmi'
icon_state = "savannah_ivanov-broken"
welder_salvage = list(/obj/item/stack/sheet/mineral/silver, /obj/item/stack/sheet/iron, /obj/item/stack/rods)
parts = list(
diff --git a/icons/effects/magic.dmi b/icons/effects/magic.dmi
index 480332df134..9bcb886d853 100644
Binary files a/icons/effects/magic.dmi and b/icons/effects/magic.dmi differ
diff --git a/icons/obj/implants.dmi b/icons/hud/implants.dmi
similarity index 100%
rename from icons/obj/implants.dmi
rename to icons/hud/implants.dmi
diff --git a/icons/mecha/coop_mech.dmi b/icons/mob/coop_mech.dmi
similarity index 100%
rename from icons/mecha/coop_mech.dmi
rename to icons/mob/coop_mech.dmi
diff --git a/icons/mecha/durand_shield.dmi b/icons/mob/effects/durand_shield.dmi
similarity index 100%
rename from icons/mecha/durand_shield.dmi
rename to icons/mob/effects/durand_shield.dmi
diff --git a/icons/obj/ethereal_crystal.dmi b/icons/mob/effects/ethereal_crystal.dmi
similarity index 100%
rename from icons/obj/ethereal_crystal.dmi
rename to icons/mob/effects/ethereal_crystal.dmi
diff --git a/icons/effects/genetics.dmi b/icons/mob/effects/genetics.dmi
similarity index 100%
rename from icons/effects/genetics.dmi
rename to icons/mob/effects/genetics.dmi
diff --git a/icons/mecha/mech_construct.dmi b/icons/mob/mech_construct.dmi
similarity index 100%
rename from icons/mecha/mech_construct.dmi
rename to icons/mob/mech_construct.dmi
diff --git a/icons/mecha/mech_construction.dmi b/icons/mob/mech_construction.dmi
similarity index 100%
rename from icons/mecha/mech_construction.dmi
rename to icons/mob/mech_construction.dmi
diff --git a/icons/mecha/mecha.dmi b/icons/mob/mecha.dmi
similarity index 100%
rename from icons/mecha/mecha.dmi
rename to icons/mob/mecha.dmi
diff --git a/icons/mecha/mecha_ammo.dmi b/icons/mob/mecha_ammo.dmi
similarity index 100%
rename from icons/mecha/mecha_ammo.dmi
rename to icons/mob/mecha_ammo.dmi
diff --git a/icons/mecha/mecha_equipment.dmi b/icons/mob/mecha_equipment.dmi
similarity index 100%
rename from icons/mecha/mecha_equipment.dmi
rename to icons/mob/mecha_equipment.dmi
diff --git a/icons/mob/shells.dmi b/icons/mob/shells.dmi
new file mode 100644
index 00000000000..eeff1967071
Binary files /dev/null and b/icons/mob/shells.dmi differ
diff --git a/icons/obj/abductor_posters.dmi b/icons/obj/abductor_posters.dmi
deleted file mode 100644
index bcd2c0200a2..00000000000
Binary files a/icons/obj/abductor_posters.dmi and /dev/null differ
diff --git a/icons/obj/anomaly.dmi b/icons/obj/anomaly.dmi
new file mode 100644
index 00000000000..ad712e290fb
Binary files /dev/null and b/icons/obj/anomaly.dmi differ
diff --git a/icons/obj/art/musician.dmi b/icons/obj/art/musician.dmi
index 22e5a24ba54..6f98eb0d7b0 100644
Binary files a/icons/obj/art/musician.dmi and b/icons/obj/art/musician.dmi differ
diff --git a/icons/obj/stock_parts.dmi b/icons/obj/assemblies/stock_parts.dmi
similarity index 100%
rename from icons/obj/stock_parts.dmi
rename to icons/obj/assemblies/stock_parts.dmi
diff --git a/icons/obj/bed.dmi b/icons/obj/bed.dmi
new file mode 100644
index 00000000000..0ba8f799d59
Binary files /dev/null and b/icons/obj/bed.dmi differ
diff --git a/icons/obj/boxcutter.dmi b/icons/obj/boxcutter.dmi
deleted file mode 100644
index dd920507563..00000000000
Binary files a/icons/obj/boxcutter.dmi and /dev/null differ
diff --git a/icons/obj/carp_rift.dmi b/icons/obj/carp_rift.dmi
deleted file mode 100644
index 9a07b3b16f8..00000000000
Binary files a/icons/obj/carp_rift.dmi and /dev/null differ
diff --git a/icons/obj/sofa.dmi b/icons/obj/chairs_wide.dmi
similarity index 100%
rename from icons/obj/sofa.dmi
rename to icons/obj/chairs_wide.dmi
diff --git a/icons/obj/cosmetic.dmi b/icons/obj/cosmetic.dmi
index c5bd95f6c69..e53e490b956 100644
Binary files a/icons/obj/cosmetic.dmi and b/icons/obj/cosmetic.dmi differ
diff --git a/icons/obj/cult/items.dmi b/icons/obj/cult/items.dmi
new file mode 100644
index 00000000000..9a3435dcd83
Binary files /dev/null and b/icons/obj/cult/items.dmi differ
diff --git a/icons/obj/cult/items_and_weapons.dmi b/icons/obj/cult/items_and_weapons.dmi
deleted file mode 100644
index f338d297391..00000000000
Binary files a/icons/obj/cult/items_and_weapons.dmi and /dev/null differ
diff --git a/icons/obj/rune.dmi b/icons/obj/cult/rune.dmi
similarity index 100%
rename from icons/obj/rune.dmi
rename to icons/obj/cult/rune.dmi
diff --git a/icons/obj/debris.dmi b/icons/obj/debris.dmi
new file mode 100644
index 00000000000..d256d1ddd6e
Binary files /dev/null and b/icons/obj/debris.dmi differ
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index 526e378cbd2..c5288a01997 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/icons/obj/device_syndie.dmi b/icons/obj/device_syndie.dmi
deleted file mode 100644
index 25ac0ef9b39..00000000000
Binary files a/icons/obj/device_syndie.dmi and /dev/null differ
diff --git a/icons/obj/dyespray.dmi b/icons/obj/dyespray.dmi
deleted file mode 100644
index eb056036799..00000000000
Binary files a/icons/obj/dyespray.dmi and /dev/null differ
diff --git a/icons/obj/eldritch.dmi b/icons/obj/eldritch.dmi
index f3049a088cc..d59bf3dbdeb 100644
Binary files a/icons/obj/eldritch.dmi and b/icons/obj/eldritch.dmi differ
diff --git a/icons/obj/fluff.dmi b/icons/obj/fluff.dmi
deleted file mode 100644
index 591880717ea..00000000000
Binary files a/icons/obj/fluff.dmi and /dev/null differ
diff --git a/icons/obj/billboard.dmi b/icons/obj/fluff/billboard.dmi
similarity index 100%
rename from icons/obj/billboard.dmi
rename to icons/obj/fluff/billboard.dmi
diff --git a/icons/obj/brokentiling.dmi b/icons/obj/fluff/brokentiling.dmi
similarity index 100%
rename from icons/obj/brokentiling.dmi
rename to icons/obj/fluff/brokentiling.dmi
diff --git a/icons/obj/bus.dmi b/icons/obj/fluff/bus.dmi
similarity index 100%
rename from icons/obj/bus.dmi
rename to icons/obj/fluff/bus.dmi
diff --git a/icons/obj/containers.dmi b/icons/obj/fluff/containers.dmi
similarity index 100%
rename from icons/obj/containers.dmi
rename to icons/obj/fluff/containers.dmi
diff --git a/icons/obj/flags.dmi b/icons/obj/fluff/flags.dmi
similarity index 100%
rename from icons/obj/flags.dmi
rename to icons/obj/fluff/flags.dmi
diff --git a/icons/obj/fluff/general.dmi b/icons/obj/fluff/general.dmi
new file mode 100644
index 00000000000..a99681428bb
Binary files /dev/null and b/icons/obj/fluff/general.dmi differ
diff --git a/icons/obj/gym_equipment.dmi b/icons/obj/fluff/gym_equipment.dmi
similarity index 100%
rename from icons/obj/gym_equipment.dmi
rename to icons/obj/fluff/gym_equipment.dmi
diff --git a/icons/obj/previews.dmi b/icons/obj/fluff/previews.dmi
similarity index 100%
rename from icons/obj/previews.dmi
rename to icons/obj/fluff/previews.dmi
diff --git a/icons/obj/puzzle.dmi b/icons/obj/fluff/puzzle.dmi
similarity index 100%
rename from icons/obj/puzzle.dmi
rename to icons/obj/fluff/puzzle.dmi
diff --git a/icons/obj/tomb.dmi b/icons/obj/fluff/tomb.dmi
similarity index 100%
rename from icons/obj/tomb.dmi
rename to icons/obj/fluff/tomb.dmi
diff --git a/icons/obj/items_cyborg.dmi b/icons/obj/items_cyborg.dmi
index 56250b3961f..aefea9fddce 100644
Binary files a/icons/obj/items_cyborg.dmi and b/icons/obj/items_cyborg.dmi differ
diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi
index 8144e1c987b..4633a6c20cf 100644
Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ
diff --git a/icons/obj/lavaland/artefacts.dmi b/icons/obj/lavaland/artefacts.dmi
index cdf33013785..2e93f3be7e2 100644
Binary files a/icons/obj/lavaland/artefacts.dmi and b/icons/obj/lavaland/artefacts.dmi differ
diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi
index ebf48682325..f9cf4475e38 100644
Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ
diff --git a/icons/obj/machines/basic_machines.dmi b/icons/obj/machines/basic_machines.dmi
new file mode 100644
index 00000000000..7b24359d43c
Binary files /dev/null and b/icons/obj/machines/basic_machines.dmi differ
diff --git a/icons/obj/lavaland/cannon.dmi b/icons/obj/machines/cannon.dmi
similarity index 100%
rename from icons/obj/lavaland/cannon.dmi
rename to icons/obj/machines/cannon.dmi
diff --git a/icons/obj/machines/kitchenmachines.dmi b/icons/obj/machines/kitchenmachines.dmi
index 06c21235ac1..5bd820e554a 100644
Binary files a/icons/obj/machines/kitchenmachines.dmi and b/icons/obj/machines/kitchenmachines.dmi differ
diff --git a/icons/mecha/mech_bay.dmi b/icons/obj/machines/mech_bay.dmi
similarity index 100%
rename from icons/mecha/mech_bay.dmi
rename to icons/obj/machines/mech_bay.dmi
diff --git a/icons/obj/money_machine.dmi b/icons/obj/machines/money_machine.dmi
similarity index 100%
rename from icons/obj/money_machine.dmi
rename to icons/obj/machines/money_machine.dmi
diff --git a/icons/obj/money_machine_64.dmi b/icons/obj/machines/money_machine_64.dmi
similarity index 100%
rename from icons/obj/money_machine_64.dmi
rename to icons/obj/machines/money_machine_64.dmi
diff --git a/icons/obj/robotics.dmi b/icons/obj/machines/robotics.dmi
similarity index 100%
rename from icons/obj/robotics.dmi
rename to icons/obj/machines/robotics.dmi
diff --git a/icons/obj/smartfridge.dmi b/icons/obj/machines/smartfridge.dmi
similarity index 100%
rename from icons/obj/smartfridge.dmi
rename to icons/obj/machines/smartfridge.dmi
diff --git a/icons/obj/solar.dmi b/icons/obj/machines/solar.dmi
similarity index 100%
rename from icons/obj/solar.dmi
rename to icons/obj/machines/solar.dmi
diff --git a/icons/obj/machines/telepad.dmi b/icons/obj/machines/telepad.dmi
new file mode 100644
index 00000000000..2ae0d4f1259
Binary files /dev/null and b/icons/obj/machines/telepad.dmi differ
diff --git a/icons/obj/magic.dmi b/icons/obj/magic.dmi
deleted file mode 100644
index c376dc73219..00000000000
Binary files a/icons/obj/magic.dmi and /dev/null differ
diff --git a/icons/obj/maintenance_loot.dmi b/icons/obj/maintenance_loot.dmi
index 09b0892b859..c75cb583c19 100644
Binary files a/icons/obj/maintenance_loot.dmi and b/icons/obj/maintenance_loot.dmi differ
diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi
index 668bf4ae8c6..c029b52ba9b 100644
Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ
diff --git a/icons/obj/nuke_tools.dmi b/icons/obj/nuke_tools.dmi
deleted file mode 100644
index e98b2b79952..00000000000
Binary files a/icons/obj/nuke_tools.dmi and /dev/null differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
deleted file mode 100644
index 9df8fea4a6a..00000000000
Binary files a/icons/obj/objects.dmi and /dev/null differ
diff --git a/icons/obj/pillow.dmi b/icons/obj/pillow.dmi
deleted file mode 100644
index b086d56b125..00000000000
Binary files a/icons/obj/pillow.dmi and /dev/null differ
diff --git a/icons/obj/poster.dmi b/icons/obj/poster.dmi
index d1b425d31b4..c1120d0be0b 100644
Binary files a/icons/obj/poster.dmi and b/icons/obj/poster.dmi differ
diff --git a/icons/obj/scrolls.dmi b/icons/obj/scrolls.dmi
new file mode 100644
index 00000000000..b35d5255df4
Binary files /dev/null and b/icons/obj/scrolls.dmi differ
diff --git a/icons/obj/shards.dmi b/icons/obj/shards.dmi
deleted file mode 100644
index f4fbe4078d2..00000000000
Binary files a/icons/obj/shards.dmi and /dev/null differ
diff --git a/icons/obj/signs.dmi b/icons/obj/signs.dmi
index cacb18fabda..761e430ba89 100644
Binary files a/icons/obj/signs.dmi and b/icons/obj/signs.dmi differ
diff --git a/icons/obj/stack_objects.dmi b/icons/obj/stack_objects.dmi
index 09c580cbee0..1a27cf9df2b 100644
Binary files a/icons/obj/stack_objects.dmi and b/icons/obj/stack_objects.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
deleted file mode 100644
index 0cda9735d98..00000000000
Binary files a/icons/obj/stationobjs.dmi and /dev/null differ
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index a931c282f4d..7ef69d55a13 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ
diff --git a/icons/obj/syndicate_tools.dmi b/icons/obj/syndicate_tools.dmi
new file mode 100644
index 00000000000..05a4c405d7d
Binary files /dev/null and b/icons/obj/syndicate_tools.dmi differ
diff --git a/icons/obj/telescience.dmi b/icons/obj/telescience.dmi
deleted file mode 100644
index 3035ce83d3e..00000000000
Binary files a/icons/obj/telescience.dmi and /dev/null differ
diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi
index c670170acc0..c7b8c0ae742 100644
Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ
diff --git a/icons/obj/wallmounts.dmi b/icons/obj/wallmounts.dmi
index d9dc9b50e97..8c3569b50ca 100644
Binary files a/icons/obj/wallmounts.dmi and b/icons/obj/wallmounts.dmi differ
diff --git a/icons/obj/weapons/guns/bows/arrows.dmi b/icons/obj/weapons/bows/arrows.dmi
similarity index 100%
rename from icons/obj/weapons/guns/bows/arrows.dmi
rename to icons/obj/weapons/bows/arrows.dmi
diff --git a/icons/obj/weapons/guns/bows/bows.dmi b/icons/obj/weapons/bows/bows.dmi
similarity index 100%
rename from icons/obj/weapons/guns/bows/bows.dmi
rename to icons/obj/weapons/bows/bows.dmi
diff --git a/icons/obj/weapons/guns/bows/quivers.dmi b/icons/obj/weapons/bows/quivers.dmi
similarity index 100%
rename from icons/obj/weapons/guns/bows/quivers.dmi
rename to icons/obj/weapons/bows/quivers.dmi
diff --git a/icons/obj/weapons/khopesh.dmi b/icons/obj/weapons/khopesh.dmi
new file mode 100644
index 00000000000..e53add1c086
Binary files /dev/null and b/icons/obj/weapons/khopesh.dmi differ
diff --git a/icons/obj/weapons/spear.dmi b/icons/obj/weapons/spear.dmi
index b9e63fbff04..917365235ec 100644
Binary files a/icons/obj/weapons/spear.dmi and b/icons/obj/weapons/spear.dmi differ
diff --git a/icons/obj/weapons/stabby.dmi b/icons/obj/weapons/stabby.dmi
new file mode 100644
index 00000000000..f49bac3272a
Binary files /dev/null and b/icons/obj/weapons/stabby.dmi differ
diff --git a/icons/obj/weapons/sword.dmi b/icons/obj/weapons/sword.dmi
index 6ebd1e6b381..8e6ee6bdd2f 100644
Binary files a/icons/obj/weapons/sword.dmi and b/icons/obj/weapons/sword.dmi differ
diff --git a/icons/obj/wizard.dmi b/icons/obj/wizard.dmi
deleted file mode 100644
index ac99107f393..00000000000
Binary files a/icons/obj/wizard.dmi and /dev/null differ
diff --git a/icons/obj/xenobiology/slimecrossing.dmi b/icons/obj/xenobiology/slimecrossing.dmi
index 07bdc442022..5edb59c58a4 100644
Binary files a/icons/obj/xenobiology/slimecrossing.dmi and b/icons/obj/xenobiology/slimecrossing.dmi differ
diff --git a/icons/materials/composite.dmi b/icons/turf/composite.dmi
similarity index 100%
rename from icons/materials/composite.dmi
rename to icons/turf/composite.dmi
diff --git a/tgstation.dme b/tgstation.dme
index 90d7b466281..eea8de8c9db 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1877,7 +1877,7 @@
#include "code\game\objects\items\door_seal.dm"
#include "code\game\objects\items\drug_items.dm"
#include "code\game\objects\items\dualsaber.dm"
-#include "code\game\objects\items\dyekit.dm"
+#include "code\game\objects\items\dyespray.dm"
#include "code\game\objects\items\eightball.dm"
#include "code\game\objects\items\emags.dm"
#include "code\game\objects\items\etherealdiscoball.dm"