diff --git a/_maps/map_files/Mafia/mafia_spiderclan.dmm b/_maps/map_files/Mafia/mafia_spiderclan.dmm index aae3f9914f3..535b2b2e78b 100644 --- a/_maps/map_files/Mafia/mafia_spiderclan.dmm +++ b/_maps/map_files/Mafia/mafia_spiderclan.dmm @@ -67,7 +67,7 @@ name = "Station Night Shutters" }, /turf/closed/indestructible/fakeglass{ - icon = 'icons/obj/smooth_structures/structure_variations.dmi'; + icon = 'icons/obj/structures/smooth/structure_variations.dmi'; icon_state = "paper-whole" }, /area/centcom/mafia) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index a1ef3a14dd3..14594d57362 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -1185,7 +1185,7 @@ /area/centcom/central_command_areas/ferry) "fy" = ( /obj/structure/signpost/salvation{ - icon = 'icons/obj/structures.dmi'; + icon = 'icons/obj/fluff/general.dmi'; icon_state = "ladder10"; invisibility = 100 }, diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm index cb94fb91e4c..b9246bee6a8 100644 --- a/_maps/map_files/wawastation/wawastation.dmm +++ b/_maps/map_files/wawastation/wawastation.dmm @@ -2970,7 +2970,7 @@ /area/station/science/research) "aZt" = ( /obj/structure/transport/linear/public{ - icon = 'icons/obj/smooth_structures/catwalk.dmi'; + icon = 'icons/obj/structures/smooth/catwalk.dmi'; base_icon_state = "catwalk"; icon_state = "catwalk-6" }, @@ -4363,7 +4363,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/stairs{ - icon = 'icons/obj/stairs.dmi'; + icon = 'icons/obj/structures/stairs.dmi'; icon_state = "stairs_wood" }, /area/station/service/chapel) @@ -6145,7 +6145,7 @@ /area/station/engineering/atmos) "ciR" = ( /obj/structure/transport/linear/public{ - icon = 'icons/obj/smooth_structures/catwalk.dmi'; + icon = 'icons/obj/structures/smooth/catwalk.dmi'; base_icon_state = "catwalk"; icon_state = "catwalk-8" }, @@ -14635,7 +14635,7 @@ /area/space/nearstation) "fnO" = ( /obj/structure/transport/linear/public{ - icon = 'icons/obj/smooth_structures/catwalk.dmi'; + icon = 'icons/obj/structures/smooth/catwalk.dmi'; base_icon_state = "catwalk"; icon_state = "catwalk-13" }, @@ -15236,7 +15236,7 @@ /area/station/command/heads_quarters/qm) "fxG" = ( /obj/structure/transport/linear/public{ - icon = 'icons/obj/smooth_structures/catwalk.dmi'; + icon = 'icons/obj/structures/smooth/catwalk.dmi'; base_icon_state = "catwalk"; icon_state = "catwalk-137" }, @@ -15898,7 +15898,7 @@ /area/station/engineering/atmos) "fHk" = ( /obj/structure/transport/linear/public{ - icon = 'icons/obj/smooth_structures/catwalk.dmi'; + icon = 'icons/obj/structures/smooth/catwalk.dmi'; base_icon_state = "catwalk"; icon_state = "catwalk-74" }, @@ -21123,7 +21123,7 @@ /area/station/asteroid) "hvA" = ( /obj/structure/transport/linear/public{ - icon = 'icons/obj/smooth_structures/catwalk.dmi'; + icon = 'icons/obj/structures/smooth/catwalk.dmi'; base_icon_state = "catwalk"; icon_state = "catwalk-78" }, @@ -21935,7 +21935,7 @@ /area/station/maintenance/department/bridge) "hNC" = ( /obj/structure/transport/linear/public{ - icon = 'icons/obj/smooth_structures/catwalk.dmi'; + icon = 'icons/obj/structures/smooth/catwalk.dmi'; base_icon_state = "catwalk"; icon_state = "catwalk-4" }, @@ -22500,7 +22500,7 @@ /area/station/hallway/secondary/entry) "hVQ" = ( /obj/structure/transport/linear/public{ - icon = 'icons/obj/smooth_structures/catwalk.dmi'; + icon = 'icons/obj/structures/smooth/catwalk.dmi'; base_icon_state = "catwalk"; icon_state = "catwalk-203" }, @@ -27741,7 +27741,7 @@ /area/station/medical/treatment_center) "jPR" = ( /obj/structure/transport/linear/public{ - icon = 'icons/obj/smooth_structures/catwalk.dmi'; + icon = 'icons/obj/structures/smooth/catwalk.dmi'; base_icon_state = "catwalk"; icon_state = "catwalk-255" }, @@ -43417,7 +43417,7 @@ /area/station/medical/chemistry/minisat) "puP" = ( /obj/structure/transport/linear/public{ - icon = 'icons/obj/smooth_structures/catwalk.dmi'; + icon = 'icons/obj/structures/smooth/catwalk.dmi'; base_icon_state = "catwalk"; icon_state = "catwalk-3" }, @@ -44286,7 +44286,7 @@ /area/station/command/heads_quarters/cmo) "pJL" = ( /obj/structure/transport/linear/public{ - icon = 'icons/obj/smooth_structures/catwalk.dmi'; + icon = 'icons/obj/structures/smooth/catwalk.dmi'; base_icon_state = "catwalk"; icon_state = "catwalk-157" }, @@ -49458,7 +49458,7 @@ /area/station/service/bar) "rzg" = ( /obj/structure/transport/linear/public{ - icon = 'icons/obj/smooth_structures/catwalk.dmi'; + icon = 'icons/obj/structures/smooth/catwalk.dmi'; base_icon_state = "catwalk"; icon_state = "catwalk-55" }, @@ -54485,7 +54485,7 @@ /obj/structure/cable, /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/stairs{ - icon = 'icons/obj/stairs.dmi'; + icon = 'icons/obj/structures/stairs.dmi'; icon_state = "stairs_wood"; dir = 4 }, @@ -58983,7 +58983,7 @@ /area/station/command/heads_quarters/cmo) "uKA" = ( /obj/structure/transport/linear/public{ - icon = 'icons/obj/smooth_structures/catwalk.dmi'; + icon = 'icons/obj/structures/smooth/catwalk.dmi'; base_icon_state = "catwalk"; icon_state = "catwalk-14" }, @@ -66323,7 +66323,7 @@ /area/station/maintenance/department/cargo) "xrH" = ( /obj/structure/transport/linear/public{ - icon = 'icons/obj/smooth_structures/catwalk.dmi'; + icon = 'icons/obj/structures/smooth/catwalk.dmi'; base_icon_state = "catwalk"; icon_state = "catwalk-21" }, diff --git a/code/_globalvars/rcd.dm b/code/_globalvars/rcd.dm index df70cb4902c..5cc66ba3bb1 100644 --- a/code/_globalvars/rcd.dm +++ b/code/_globalvars/rcd.dm @@ -5,9 +5,9 @@ GLOBAL_VAR_INIT(holographic_window, init_holographic_window()) return generate_joined_wall('icons/turf/walls/metal_wall.dmi', NONE) /proc/init_holographic_window() - var/mutable_appearance/window_frame = mutable_appearance('icons/obj/smooth_structures/window_frames/window_frame_normal.dmi', "window_frame_normal-0") - var/mutable_appearance/window = mutable_appearance('icons/obj/smooth_structures/windows/normal_window.dmi', "0-lower") - var/mutable_appearance/window_frill = mutable_appearance('icons/obj/smooth_structures/windows/normal_window.dmi', "0-upper") + var/mutable_appearance/window_frame = mutable_appearance('icons/obj/structures/smooth/window_frames/window_frame_normal.dmi', "window_frame_normal-0") + var/mutable_appearance/window = mutable_appearance('icons/obj/structures/smooth/windows/normal_window.dmi', "0-lower") + var/mutable_appearance/window_frill = mutable_appearance('icons/obj/structures/smooth/windows/normal_window.dmi', "0-upper") window_frill.pixel_z = 32 window_frame.add_overlay(list(window, window_frill)) return window_frame diff --git a/code/datums/actions/mobs/charge_apc.dm b/code/datums/actions/mobs/charge_apc.dm index 8d617f010c6..8e67ce58470 100644 --- a/code/datums/actions/mobs/charge_apc.dm +++ b/code/datums/actions/mobs/charge_apc.dm @@ -3,7 +3,7 @@ /datum/action/cooldown/mob_cooldown/charge_apc name = "Charge APCs" - button_icon = 'icons/obj/APC.dmi' + button_icon = 'icons/obj/machines/APC.dmi' button_icon_state = "frame" desc = "Give off charge to an APC." cooldown_time = 5 SECONDS diff --git a/code/datums/components/aquarium_content.dm b/code/datums/components/aquarium_content.dm index 21c6c75ca16..3b395637a6c 100644 --- a/code/datums/components/aquarium_content.dm +++ b/code/datums/components/aquarium_content.dm @@ -34,7 +34,7 @@ /// Icon used for in aquarium sprite - var/icon = 'icons/obj/aquarium/fish.dmi' + var/icon = 'icons/obj/structures/aquarium/fish.dmi' /// If this is set this icon state will be used for the holder while icon_state will only be used for item/catalog. Transformation from source_width/height WON'T be applied. var/icon_state /// Applied to vc object only for use with greyscaled icons. diff --git a/code/datums/components/pet_commands/pet_commands_basic.dm b/code/datums/components/pet_commands/pet_commands_basic.dm index 9f4dda9cca3..ff73cf84eaf 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/bed.dmi' + radial_icon = 'icons/obj/structures/bed.dmi' radial_icon_state = "dogbed" speech_commands = list("sit", "stay", "stop") command_feedback = "sits" @@ -281,7 +281,7 @@ /datum/pet_command/point_targeting/fish command_name = "Fish" command_desc = "Command your pet to try fishing at a nearby fishing spot." - radial_icon = 'icons/obj/aquarium/fish.dmi' + radial_icon = 'icons/obj/structures/aquarium/fish.dmi' radial_icon_state = "goldfish" speech_commands = list("fish") diff --git a/code/datums/elements/turf_transparency.dm b/code/datums/elements/turf_transparency.dm index c9fb667cff9..595b7825368 100644 --- a/code/datums/elements/turf_transparency.dm +++ b/code/datums/elements/turf_transparency.dm @@ -219,7 +219,7 @@ GLOBAL_LIST_EMPTY(pillars_by_z) // it will make them look significantly nicer, and should let you tie into their logic more easily // Just please don't break behavior yeah? thanks, I love you <3 if(isclosedturf(our_turf)) //Show girders below closed turfs - var/mutable_appearance/girder_underlay = mutable_appearance('icons/obj/structures.dmi', "girder", layer = BELOW_CLOSED_TURF_LAYER) + var/mutable_appearance/girder_underlay = mutable_appearance('icons/obj/structures/tall.dmi', "girder", layer = BELOW_CLOSED_TURF_LAYER) girder_underlay.appearance_flags = RESET_ALPHA | RESET_COLOR our_turf.underlays += girder_underlay var/mutable_appearance/plating_underlay = mutable_appearance('icons/turf/floors.dmi', "plating", layer = LOW_FLOOR_LAYER, offset_spokesman = our_turf, plane = FLOOR_PLANE) @@ -240,7 +240,7 @@ GLOBAL_LIST_EMPTY(pillars_by_z) our_turf.underlays -= get_baseturf_underlay(our_turf) if(isclosedturf(our_turf)) //Show girders below closed turfs - var/mutable_appearance/girder_underlay = mutable_appearance('icons/obj/structures.dmi', "girder", layer = BELOW_CLOSED_TURF_LAYER) + var/mutable_appearance/girder_underlay = mutable_appearance('icons/obj/structures/tall.dmi', "girder", layer = BELOW_CLOSED_TURF_LAYER) girder_underlay.appearance_flags = RESET_ALPHA | RESET_COLOR our_turf.underlays -= girder_underlay var/mutable_appearance/plating_underlay = mutable_appearance('icons/turf/floors.dmi', "plating", layer = LOW_FLOOR_LAYER, offset_spokesman = our_turf, plane = FLOOR_PLANE) 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 6f35ba9cff6..591f76f7891 100644 --- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_objects.dm +++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_objects.dm @@ -25,27 +25,27 @@ /datum/greyscale_config/bench_solo name = "Bench Solo" - icon_file = 'icons/obj/chairs_wide.dmi' + icon_file = 'icons/obj/structures/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/chairs_wide.dmi' + icon_file = 'icons/obj/structures/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/chairs_wide.dmi' + icon_file = 'icons/obj/structures/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/chairs_wide.dmi' + icon_file = 'icons/obj/structures/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/chairs_wide.dmi' + icon_file = 'icons/obj/structures/chairs_wide.dmi' json_config = 'code/datums/greyscale/json_configs/bench_corner.json' // diff --git a/code/game/machinery/computer/atmos_computers/_air_sensor.dm b/code/game/machinery/computer/atmos_computers/_air_sensor.dm index 91a616cc5f6..f66b9179fa5 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/wallmounts.dmi' + icon = 'icons/obj/structures/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/wallmounts.dmi' + icon = 'icons/obj/structures/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/orders/order_computer/mining_order.dm b/code/game/machinery/computer/orders/order_computer/mining_order.dm index 7e7eabcc1bf..cbc62dbb330 100644 --- a/code/game/machinery/computer/orders/order_computer/mining_order.dm +++ b/code/game/machinery/computer/orders/order_computer/mining_order.dm @@ -134,7 +134,7 @@ /obj/item/mining_voucher name = "mining voucher" desc = "A token to redeem a piece of equipment. Use it on a mining equipment vendor." - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "mining_voucher" w_class = WEIGHT_CLASS_TINY diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index b2317d45bab..d2a6a2b3c6b 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -56,7 +56,7 @@ /obj/structure/barricade/wooden name = "wooden barricade" desc = "This space is blocked off by a wooden barricade." - icon = 'icons/obj/structures_tall.dmi' + icon = 'icons/obj/structures/tall.dmi' icon_state = "woodenbarricade" resistance_flags = FLAMMABLE bar_material = WOOD @@ -99,8 +99,8 @@ /obj/structure/barricade/wooden/crude name = "crude plank barricade" desc = "This space is blocked off by a crude assortment of planks." - icon = 'icons/obj/structures.dmi' - icon_state = "plankbarricade" + icon = 'icons/obj/structures/tall.dmi' + icon_state = "woodenbarricade" drop_amount = 1 max_integrity = 50 proj_pass_rate = 65 @@ -108,8 +108,8 @@ /obj/structure/barricade/wooden/crude/snow desc = "This space is blocked off by a crude assortment of planks. It seems to be covered in a layer of snow." - icon = 'icons/obj/structures.dmi' - icon_state = "plankbarricade_snow" + icon = 'icons/obj/structures/tall.dmi' + icon_state = "woodenbarricade_snow" max_integrity = 75 /obj/structure/barricade/wooden/make_debris() @@ -118,7 +118,7 @@ /obj/structure/barricade/sandbags name = "sandbags" desc = "Bags of sand. Self explanatory." - icon = 'icons/obj/smooth_structures/sandbags.dmi' + icon = 'icons/obj/structures/smooth/sandbags.dmi' icon_state = "sandbags-0" base_icon_state = "sandbags" max_integrity = 280 @@ -137,7 +137,7 @@ /obj/structure/barricade/security name = "security barrier" desc = "A deployable barrier. Provides good cover in fire fights." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/structures/tall.dmi' icon_state = "barrier0" density = FALSE anchored = FALSE diff --git a/code/game/machinery/digital_clock.dm b/code/game/machinery/digital_clock.dm index 6ebebc931c2..1c8cadecf24 100644 --- a/code/game/machinery/digital_clock.dm +++ b/code/game/machinery/digital_clock.dm @@ -2,7 +2,7 @@ name = "digital clock" desc = "An ultra-futuristic, sleek, advanced, next-gen normal digital clock that tells the time. Powered by bluespace. Despite supposedly being better in every way to classic clocks, it just doesn't feel the same. They just don't make them the way they used to..." icon_state = "digital_clock_base" - icon = 'icons/obj/digital_clock.dmi' + icon = 'icons/obj/machines/digital_clock.dmi' verb_say = "beeps" verb_ask = "bloops" verb_exclaim = "blares" @@ -14,7 +14,7 @@ name = "digital clock frame" desc = "Used to build digital clocks, just secure to the wall." icon_state = "digital_clock_base" - icon = 'icons/obj/digital_clock.dmi' + icon = 'icons/obj/machines/digital_clock.dmi' custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 7, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 4) result_path = /obj/machinery/digital_clock @@ -132,22 +132,22 @@ var/return_overlays = list() - var/mutable_appearance/minute_one_overlay = mutable_appearance('icons/obj/digital_clock.dmi', "+[station_minute_one]") + var/mutable_appearance/minute_one_overlay = mutable_appearance('icons/obj/machines/digital_clock.dmi', "+[station_minute_one]") minute_one_overlay.pixel_w = 0 return_overlays += minute_one_overlay - var/mutable_appearance/minute_tenth_overlay = mutable_appearance('icons/obj/digital_clock.dmi', "+[station_minute_tenth]") + var/mutable_appearance/minute_tenth_overlay = mutable_appearance('icons/obj/machines/digital_clock.dmi', "+[station_minute_tenth]") minute_tenth_overlay.pixel_w = -4 return_overlays += minute_tenth_overlay - var/mutable_appearance/separator = mutable_appearance('icons/obj/digital_clock.dmi', "+separator") + var/mutable_appearance/separator = mutable_appearance('icons/obj/machines/digital_clock.dmi', "+separator") return_overlays += separator - var/mutable_appearance/hour_one_overlay = mutable_appearance('icons/obj/digital_clock.dmi', "+[station_hours_one]") + var/mutable_appearance/hour_one_overlay = mutable_appearance('icons/obj/machines/digital_clock.dmi', "+[station_hours_one]") hour_one_overlay.pixel_w = -10 return_overlays += hour_one_overlay - var/mutable_appearance/hour_tenth_overlay = mutable_appearance('icons/obj/digital_clock.dmi', "+[station_hours_tenth]") + var/mutable_appearance/hour_tenth_overlay = mutable_appearance('icons/obj/machines/digital_clock.dmi', "+[station_hours_tenth]") hour_tenth_overlay.pixel_w = -14 return_overlays += hour_tenth_overlay diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 9665bc08419..5c28273bd60 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/flash.dmi' + icon = 'icons/obj/machines/flash.dmi' icon_state = "mflash1" base_icon_state = "mflash" max_integrity = 250 @@ -217,7 +217,7 @@ WALL_MOUNT_DIRECTIONAL_HELPERS(/obj/machinery/flasher) /obj/item/wallframe/flasher name = "mounted flash frame" desc = "Used for building wall-mounted flashers." - icon = 'icons/obj/flash.dmi' + icon = 'icons/obj/machines/flash.dmi' icon_state = "mflash_frame" result_path = /obj/machinery/flasher var/id = null diff --git a/code/game/machinery/flatpacker.dm b/code/game/machinery/flatpacker.dm index 182db1edc08..fe67ae5b650 100644 --- a/code/game/machinery/flatpacker.dm +++ b/code/game/machinery/flatpacker.dm @@ -412,7 +412,7 @@ /obj/structure/flatpack_cart name = "flatpack cart" desc = "A cart specifically made to hold flatpacks from a flatpacker, evenly distributing weight. Convenient!" - icon = 'icons/obj/structures.dmi' + icon = 'icons/mob/rideables/vehicles.dmi' icon_state = "flatcart" density = TRUE opacity = FALSE diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 1a8625aa427..86f632d8090 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -136,7 +136,7 @@ WALL_MOUNT_DIRECTIONAL_HELPERS(/obj/machinery/igniter) /obj/item/wallframe/sparker name = "Sparker WallFrame" desc = "An unmounted sparker. Attach it to a wall to use." - icon = 'icons/obj/igniter.dmi' + icon = 'icons/obj/machines/igniter.dmi' icon_state = "migniter" result_path = /obj/machinery/sparker custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT) @@ -144,7 +144,7 @@ WALL_MOUNT_DIRECTIONAL_HELPERS(/obj/machinery/igniter) /obj/machinery/sparker name = "mounted igniter" desc = "A wall-mounted ignition device." - icon = 'icons/obj/igniter.dmi' + icon = 'icons/obj/machines/igniter.dmi' icon_state = "migniter" base_icon_state = "migniter" resistance_flags = FIRE_PROOF diff --git a/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm b/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm index 6503c3e805e..a37ae88cf7f 100644 --- a/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm +++ b/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm @@ -255,7 +255,7 @@ /datum/dimension_theme/radioactive name = "Radioactive" - icon = 'icons/obj/ore.dmi' + icon = 'icons/obj/mining_zones/ore.dmi' icon_state = "uranium" material = /datum/material/uranium sound = 'sound/items/welder.ogg' @@ -407,8 +407,8 @@ /datum/dimension_theme/disco name = "Disco" - icon = 'icons/obj/lighting.dmi' - icon_state = "lbulb" + icon = 'icons/obj/service/janitor.dmi' + icon_state = "bulb" replace_walls = /turf/closed/wall/fake_hierophant material = /datum/material/glass replace_floors = list(/turf/open/floor/light = 1) diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm index a9d7a9981e4..caa7637c097 100644 --- a/code/game/objects/effects/decals/misc.dm +++ b/code/game/objects/effects/decals/misc.dm @@ -99,6 +99,6 @@ /obj/effect/decal/fakelattice name = "lattice" desc = "A lightweight support lattice." - icon = 'icons/obj/smooth_structures/lattice.dmi' + icon = 'icons/obj/structures/smooth/lattice.dmi' icon_state = "lattice-255" density = TRUE diff --git a/code/game/objects/effects/effect_system/fluid_spread/effects_foam.dm b/code/game/objects/effects/effect_system/fluid_spread/effects_foam.dm index 564c396731d..c6bfb8d7749 100644 --- a/code/game/objects/effects/effect_system/fluid_spread/effects_foam.dm +++ b/code/game/objects/effects/effect_system/fluid_spread/effects_foam.dm @@ -291,7 +291,7 @@ /// FOAM STRUCTURE. Formed by metal foams. Dense and opaque, but easy to break /obj/structure/foamedmetal - icon = 'icons/obj/structures_tall.dmi' + icon = 'icons/obj/structures/tall.dmi' icon_state = "metalfoam" density = TRUE opacity = TRUE // changed in New() diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index 9ea6b7dd962..9a3f39d9145 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -7,7 +7,7 @@ GLOBAL_VAR_INIT(glowshrooms, 0) anchored = TRUE opacity = FALSE density = FALSE - icon = 'icons/obj/lighting.dmi' + icon = 'icons/turf/overlays.dmi' icon_state = "glowshroom" //replaced in New layer = ABOVE_NORMAL_TURF_LAYER max_integrity = GLOWSHROOM_BASE_INTEGRITY diff --git a/code/game/objects/effects/spiderwebs.dm b/code/game/objects/effects/spiderwebs.dm index 2d0f1b9b14d..18b1a7f78b5 100644 --- a/code/game/objects/effects/spiderwebs.dm +++ b/code/game/objects/effects/spiderwebs.dm @@ -34,7 +34,7 @@ /obj/structure/spider/stickyweb plane = FLOOR_PLANE layer = MID_TURF_LAYER - icon = 'icons/obj/smooth_structures/stickyweb.dmi' + icon = 'icons/obj/structures/smooth/stickyweb.dmi' base_icon_state = "stickyweb" icon_state = "stickyweb-0" smoothing_flags = SMOOTH_BITMASK @@ -149,7 +149,7 @@ /obj/structure/spider/stickyweb/sealed name = "sealed web" desc = "A solid wall of web, dense enough to block air flow." - icon = 'icons/obj/smooth_structures/webwall.dmi' + icon = 'icons/obj/structures/smooth/webwall.dmi' base_icon_state = "webwall" icon_state = "webwall-0" smoothing_groups = SMOOTH_GROUP_SPIDER_WEB_WALL @@ -168,7 +168,7 @@ /obj/structure/spider/stickyweb/sealed/reflector name = "reflective silk screen" desc = "Hardened webbing treated with special chemicals which cause it to repel projectiles." - icon = 'icons/obj/smooth_structures/webwall_reflector.dmi' + icon = 'icons/obj/structures/smooth/webwall_reflector.dmi' base_icon_state = "webwall_reflector" icon_state = "webwall_reflector-0" smoothing_groups = SMOOTH_GROUP_SPIDER_WEB_WALL_MIRROR @@ -182,7 +182,7 @@ /obj/structure/spider/stickyweb/sealed/tough name = "hardened web" desc = "Webbing hardened through a chemical process into a durable barrier." - icon = 'icons/obj/smooth_structures/webwall_dark.dmi' + icon = 'icons/obj/structures/smooth/webwall_dark.dmi' base_icon_state = "webwall_dark" icon_state = "webwall_dark-0" smoothing_groups = SMOOTH_GROUP_SPIDER_WEB_WALL_TOUGH @@ -196,7 +196,7 @@ /obj/structure/spider/passage name = "web passage" desc = "An opaque curtain of web which seals in air but doesn't impede passage." - icon = 'icons/obj/smooth_structures/stickyweb_rotated.dmi' + icon = 'icons/obj/structures/smooth/stickyweb_rotated.dmi' base_icon_state = "stickyweb_rotated" icon_state = "stickyweb_rotated-0" smoothing_flags = SMOOTH_BITMASK @@ -250,7 +250,7 @@ desc = "Silk hardened into small yet deadly spikes." plane = FLOOR_PLANE layer = MID_TURF_LAYER - icon = 'icons/obj/smooth_structures/stickyweb_spikes.dmi' + icon = 'icons/obj/structures/smooth/stickyweb_spikes.dmi' base_icon_state = "stickyweb_spikes" icon_state = "stickyweb_spikes-0" smoothing_flags = SMOOTH_BITMASK diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index f834c9fc3d4..b742a3a89c0 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -2,7 +2,7 @@ /obj/item/wallframe/apc name = "\improper APC frame" desc = "Used for repairing or building APCs." - icon = 'icons/obj/APC.dmi' + icon = 'icons/obj/machines/APC.dmi' icon_state = "frame" result_path = /obj/machinery/power/apc/auto_name diff --git a/code/game/objects/items/climbingrope.dm b/code/game/objects/items/climbingrope.dm index e68e5087712..a699c8e4d39 100644 --- a/code/game/objects/items/climbingrope.dm +++ b/code/game/objects/items/climbingrope.dm @@ -1,7 +1,7 @@ /obj/item/climbing_hook name = "climbing hook" desc = "Standard hook with rope to scale up holes. The rope is of average quality, but due to your weight amongst other factors, may not withstand extreme use." - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "climbingrope" inhand_icon_state = "crowbar_brass" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index 6565bcae44f..15f51e83b2d 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -14,7 +14,7 @@ name = "soap" desc = "A cheap bar of soap. Doesn't smell." gender = PLURAL - icon = 'icons/obj/watercloset.dmi' + icon = 'icons/obj/cosmetic.dmi' icon_state = "soap" inhand_icon_state = "soap" worn_icon_state = "soap" @@ -257,7 +257,7 @@ /obj/item/bikehorn/rubberducky name = "rubber ducky" desc = "Rubber ducky you're so fine, you make bathtime lots of fuuun. Rubber ducky I'm awfully fooooond of yooooouuuu~" //thanks doohl - icon = 'icons/obj/watercloset.dmi' + icon = 'icons/obj/toys/toy.dmi' icon_state = "rubberducky" inhand_icon_state = "rubberducky" lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' diff --git a/code/game/objects/items/debug_items.dm b/code/game/objects/items/debug_items.dm index 071561d57a0..24dc0950d18 100644 --- a/code/game/objects/items/debug_items.dm +++ b/code/game/objects/items/debug_items.dm @@ -84,8 +84,8 @@ "Wrench" = image(icon = 'icons/obj/tools.dmi', icon_state = "wrench"), "Welding Tool" = image(icon = 'icons/obj/tools.dmi', icon_state = "miniwelder"), "Analyzer" = image(icon = 'icons/obj/devices/scanner.dmi', icon_state = "analyzer"), - "Pickaxe" = image(icon = 'icons/obj/mining.dmi', icon_state = "minipick"), - "Shovel" = image(icon = 'icons/obj/mining.dmi', icon_state = "shovel"), + "Pickaxe" = image(icon = 'icons/obj/mining_zones/equipment.dmi', icon_state = "minipick"), + "Shovel" = image(icon = 'icons/obj/mining_zones/equipment.dmi', icon_state = "shovel"), "Retractor" = image(icon = 'icons/obj/medical/surgery_tools.dmi', icon_state = "retractor"), "Hemostat" = image(icon = 'icons/obj/medical/surgery_tools.dmi', icon_state = "hemostat"), "Cautery" = image(icon = 'icons/obj/medical/surgery_tools.dmi', icon_state = "cautery"), diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index c619f7d7018..867183b5e33 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -1,7 +1,7 @@ /obj/item/aicard name = "intelliCard" desc = "A storage device for AIs. Patent pending." - icon = 'icons/obj/aicards.dmi' + icon = 'icons/obj/devices/aicards.dmi' icon_state = "aicard" // aicard-full base_icon_state = "aicard" inhand_icon_state = "electronic" diff --git a/code/game/objects/items/devices/aicard_evil.dm b/code/game/objects/items/devices/aicard_evil.dm index 3e8c56ce940..530daa46886 100644 --- a/code/game/objects/items/devices/aicard_evil.dm +++ b/code/game/objects/items/devices/aicard_evil.dm @@ -2,7 +2,7 @@ /obj/item/aicard/syndie name = "syndiCard" desc = "A storage device for AIs. Nanotrasen forgot to make the patent, so the Syndicate made their own version!" - icon = 'icons/obj/aicards.dmi' + icon = 'icons/obj/devices/aicards.dmi' icon_state = "syndicard" base_icon_state = "syndicard" item_flags = null diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 968a2f11f4d..b7451bd02d8 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -7,7 +7,7 @@ name = "flashlight" desc = "A hand-held emergency light." custom_price = PAYCHECK_CREW - icon = 'icons/obj/lighting.dmi' + icon = 'icons/obj/devices/lighting.dmi' dir = WEST icon_state = "flashlight" inhand_icon_state = "flashlight" @@ -297,6 +297,7 @@ name = "penlight" desc = "A pen-sized light, used by medical staff. It can also be used to create a hologram to alert people of incoming medical assistance." dir = EAST + icon = 'icons/obj/service/bureaucracy.dmi' icon_state = "penlight" inhand_icon_state = "" worn_icon_state = "pen" @@ -698,7 +699,7 @@ gender = PLURAL name = "glowing slime extract" desc = "Extract from a yellow slime. It emits a strong light when squeezed." - icon = 'icons/obj/lighting.dmi' + icon = 'icons/obj/science/slimecrossing.dmi' icon_state = "slime" inhand_icon_state = null w_class = WEIGHT_CLASS_SMALL @@ -773,6 +774,7 @@ light_power = 2 light_system = OVERLAY_LIGHT color = LIGHT_COLOR_GREEN + icon = 'icons/obj/toys/toy.dmi' icon_state = "glowstick" base_icon_state = "glowstick" inhand_icon_state = null diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index f6fb14c2f19..f8d3f43e9a6 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -169,7 +169,7 @@ /obj/item/multitool/cyborg name = "electronic multitool" desc = "Optimised version of a regular multitool. Streamlines processes handled by its internal microchip." - icon = 'icons/obj/items_cyborg.dmi' + icon = 'icons/mob/silicon/robot_items.dmi' icon_state = "toolkit_engiborg_multitool" toolspeed = 0.5 diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm index 9a55b1cd574..d3011e86803 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -104,7 +104,7 @@ /obj/item/knife/kitchen/silicon name = "Kitchen Toolset" - icon = 'icons/obj/items_cyborg.dmi' + icon = 'icons/mob/silicon/robot_items.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 diff --git a/code/game/objects/items/knives.dm b/code/game/objects/items/knives.dm index 848058a6a27..6ea12e72f34 100644 --- a/code/game/objects/items/knives.dm +++ b/code/game/objects/items/knives.dm @@ -199,7 +199,7 @@ /obj/item/knife/combat/cyborg name = "cyborg knife" - icon = 'icons/obj/items_cyborg.dmi' + icon = 'icons/mob/silicon/robot_items.dmi' icon_state = "knife_cyborg" worn_icon_state = "knife_cyborg" //error sprite - this shouldn't have been dropped desc = "A cyborg-mounted plasteel knife. Extremely sharp and durable." diff --git a/code/game/objects/items/pet_carrier.dm b/code/game/objects/items/pet_carrier.dm index 2e2e622ff6c..8f17704b8c7 100644 --- a/code/game/objects/items/pet_carrier.dm +++ b/code/game/objects/items/pet_carrier.dm @@ -5,7 +5,7 @@ /obj/item/pet_carrier name = "pet carrier" desc = "A big white-and-blue pet carrier. Good for carrying meat to the chef cute animals around." - icon = 'icons/obj/pet_carrier.dmi' + icon = 'icons/obj/storage/pet_carrier.dmi' base_icon_state = "pet_carrier" icon_state = "pet_carrier_open" inhand_icon_state = "pet_carrier" diff --git a/code/game/objects/items/pillow.dm b/code/game/objects/items/pillow.dm index b924983a427..d92c317356c 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/bed.dmi' + icon = 'icons/obj/structures/bed.dmi' icon_state = "pillow_1_t" inhand_icon_state = "pillow_t" lefthand_file = 'icons/mob/inhands/items/pillow_lefthand.dmi' @@ -166,7 +166,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/bed.dmi' + icon = 'icons/obj/structures/bed.dmi' worn_icon = 'icons/mob/clothing/suits/pillow.dmi' icon_state = "pillow_suit" armor_type = /datum/armor/suit_pillow_suit @@ -189,7 +189,7 @@ name = "pillow hood" desc = "The final piece of the pillow juggernaut" body_parts_covered = HEAD - icon = 'icons/obj/bed.dmi' + icon = 'icons/obj/structures/bed.dmi' worn_icon = 'icons/mob/clothing/suits/pillow.dmi' icon_state = "pillowcase_hat" body_parts_covered = HEAD @@ -203,7 +203,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/bed.dmi' + icon = 'icons/obj/structures/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/puzzle_pieces.dm b/code/game/objects/items/puzzle_pieces.dm index 823f04b926f..46b3d16dba4 100644 --- a/code/game/objects/items/puzzle_pieces.dm +++ b/code/game/objects/items/puzzle_pieces.dm @@ -520,7 +520,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/puzzle/password/pin, 32) /obj/structure/puzzle_blockade/oneway name = "one-way gate" desc = "A wall of solid light, likely defending something important. Virtually indestructible." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/fluff/general.dmi' icon_state = "oneway" base_icon_state = "oneway" light_color = COLOR_BIOLUMINESCENCE_BLUE diff --git a/code/game/objects/items/rcd/RLD.dm b/code/game/objects/items/rcd/RLD.dm index 2a99f535f42..40027863881 100644 --- a/code/game/objects/items/rcd/RLD.dm +++ b/code/game/objects/items/rcd/RLD.dm @@ -36,9 +36,9 @@ ///reference to thr original icons var/static/list/original_options = list( "Color Pick" = icon(icon = 'icons/hud/radial.dmi', icon_state = "omni"), - "Glow Stick" = icon(icon = 'icons/obj/lighting.dmi', icon_state = "glowstick"), + "Glow Stick" = icon(icon = 'icons/obj/toys/toy.dmi', icon_state = "glowstick"), "Deconstruct" = icon(icon = 'icons/obj/tools.dmi', icon_state = "wrench"), - "Light Fixture" = icon(icon = 'icons/obj/lighting.dmi', icon_state = "ltube"), + "Light Fixture" = icon(icon = 'icons/obj/service/janitor.dmi', icon_state = "tube"), ) ///will contain the original icons modified with the color choice var/list/display_options = list() diff --git a/code/game/objects/items/robot/items/tools.dm b/code/game/objects/items/robot/items/tools.dm index f16cd084490..fcdc43818dc 100644 --- a/code/game/objects/items/robot/items/tools.dm +++ b/code/game/objects/items/robot/items/tools.dm @@ -288,7 +288,7 @@ /obj/item/borg/cyborg_omnitool/engineering name = "engineering omni-toolset" desc = "A set of engineering tools used by cyborgs to conduct various engineering tasks." - icon = 'icons/obj/items_cyborg.dmi' + icon = 'icons/mob/silicon/robot_items.dmi' icon_state = "toolkit_engiborg" omni_toolkit = list( diff --git a/code/game/objects/items/rollertable_dock.dm b/code/game/objects/items/rollertable_dock.dm index d0067e8c675..a140d64d80f 100644 --- a/code/game/objects/items/rollertable_dock.dm +++ b/code/game/objects/items/rollertable_dock.dm @@ -1,7 +1,7 @@ /obj/item/rolling_table_dock name = "rolling table dock" desc = "A collapsed roller table that can be ejected for service on the go. Must be collected or replaced after use." - icon = 'icons/obj/smooth_structures/rollingtable.dmi' + icon = 'icons/obj/structures/smooth/rollingtable.dmi' icon_state = "rollingtable" var/obj/structure/table/rolling/loaded = null diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 03b1e325c43..dd2ab600824 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -2,7 +2,7 @@ SET_BASE_VISUAL_PIXEL(0, DEPTH_OFFSET) name = "shooting target" desc = "A shooting target." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/art/cardboard_cutout.dmi' icon_state = "target_h" density = FALSE max_integrity = 1800 diff --git a/code/game/objects/items/stacks/bscrystal.dm b/code/game/objects/items/stacks/bscrystal.dm index 29795410389..20c974ad063 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/ore.dmi' + icon = 'icons/obj/mining_zones/ore.dmi' icon_state = "bluespace_crystal" singular_name = "bluespace crystal" dye_color = DYE_COSMIC diff --git a/code/game/objects/items/stacks/golem_food/golem_hand_actions.dm b/code/game/objects/items/stacks/golem_food/golem_hand_actions.dm index e4b65e03397..fbae20ead1d 100644 --- a/code/game/objects/items/stacks/golem_food/golem_hand_actions.dm +++ b/code/game/objects/items/stacks/golem_food/golem_hand_actions.dm @@ -7,7 +7,7 @@ /obj/item/gibtonite_hand name = "stabilised gibtonite fist" desc = "You had better launch this at something before it comes out the other end of your body." - icon = 'icons/obj/ore.dmi' + icon = 'icons/obj/mining_zones/ore.dmi' icon_state = "Gibtonite ore" lefthand_file = 'icons/mob/inhands/golem_lefthand.dmi' righthand_file = 'icons/mob/inhands/golem_righthand.dmi' diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index a58eece0631..10ce7e7fa1c 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -239,7 +239,7 @@ GLOBAL_LIST_INIT(leather_recipes, list ( \ */ /obj/item/stack/sheet/sinew name = "watcher sinew" - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' desc = "Long stringy filaments which presumably came from a watcher's wings." singular_name = "watcher sinew" icon_state = "sinew" diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 0d4393efea6..114222b4312 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -444,7 +444,7 @@ GLOBAL_LIST_INIT(abductor_recipes, list ( \ /obj/item/stack/sheet/mineral/coal name = "coal" desc = "Someone's gotten on the naughty list." - icon = 'icons/obj/ore.dmi' + icon = 'icons/obj/mining_zones/ore.dmi' icon_state = "slag" singular_name = "coal lump" merge_type = /obj/item/stack/sheet/mineral/coal diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 996cd933647..5c4037577c2 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -119,7 +119,7 @@ /obj/item/storage/bag/ore name = "mining satchel" desc = "This little bugger can be used to store and transport ores." - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "satchel" worn_icon_state = "satchel" slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_POCKETS @@ -286,7 +286,7 @@ /obj/item/storage/bag/sheetsnatcher name = "sheet snatcher" desc = "A patented Nanotrasen storage system designed for any kind of mineral sheet." - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "sheetsnatcher" worn_icon_state = "satchel" diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 20e3846adef..776dd16d781 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -189,7 +189,7 @@ /obj/item/crowbar/cyborg name = "hydraulic crowbar" desc = "A hydraulic prying tool, simple but powerful." - icon = 'icons/obj/items_cyborg.dmi' + icon = 'icons/mob/silicon/robot_items.dmi' icon_state = "toolkit_engiborg_crowbar" worn_icon_state = "toolkit_engiborg_crowbar" //error sprite - this shouldn't have been dropped usesound = 'sound/items/jaws_pry.ogg' diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index b9e0d15e69f..63ee56be7f1 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -148,7 +148,7 @@ /obj/item/screwdriver/cyborg name = "automated screwdriver" desc = "A powerful automated screwdriver, designed to be both precise and quick." - icon = 'icons/obj/items_cyborg.dmi' + icon = 'icons/mob/silicon/robot_items.dmi' icon_state = "toolkit_engiborg_screwdriver" hitsound = 'sound/items/drill_hit.ogg' usesound = 'sound/items/drill_use.ogg' diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index fb40a70cbee..7ffa183f576 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -340,7 +340,7 @@ /obj/item/weldingtool/largetank/cyborg name = "integrated welding tool" desc = "An advanced welder designed to be used in robotic systems. Custom framework doubles the speed of welding." - icon = 'icons/obj/items_cyborg.dmi' + icon = 'icons/mob/silicon/robot_items.dmi' icon_state = "indwelder_cyborg" toolspeed = 0.5 diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index 7f2b11777d8..9ce1bc24091 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -77,7 +77,7 @@ /obj/item/wirecutters/cyborg name = "powered wirecutters" desc = "Cuts wires with the power of ELECTRICITY. Faster than normal wirecutters." - icon = 'icons/obj/items_cyborg.dmi' + icon = 'icons/mob/silicon/robot_items.dmi' icon_state = "toolkit_engiborg_cutters" worn_icon_state = "cutters" toolspeed = 0.5 diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm index aa72b5d257a..fce0a6b16f5 100644 --- a/code/game/objects/items/tools/wrench.dm +++ b/code/game/objects/items/tools/wrench.dm @@ -87,7 +87,7 @@ /obj/item/wrench/cyborg name = "hydraulic wrench" desc = "An advanced robotic wrench, powered by internal hydraulics. Twice as fast as the handheld version." - icon = 'icons/obj/items_cyborg.dmi' + icon = 'icons/mob/silicon/robot_items.dmi' icon_state = "toolkit_engiborg_wrench" toolspeed = 0.5 diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index ff540932f31..5fced3e7bb1 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -113,7 +113,7 @@ /obj/item/trash/flare name = "burnt flare" - icon = 'icons/obj/lighting.dmi' + icon = 'icons/obj/devices/lighting.dmi' icon_state = "flare-empty" /obj/item/trash/can diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index bc817ea118f..a5df7b4790b 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -327,7 +327,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 playsound(user, 'sound/items/screwdriver2.ogg', 50, TRUE) /obj/item/claymore/highlander/robot //BLOODTHIRSTY BORGS NOW COME IN PLAID - icon = 'icons/obj/items_cyborg.dmi' + icon = 'icons/mob/silicon/robot_items.dmi' icon_state = "claymore_cyborg" var/mob/living/silicon/robot/robot diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index ff6e6e171bb..6b168790954 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -1,6 +1,6 @@ /// Inert structures, such as girders, machine frames, and crates/lockers. /obj/structure - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/structures/tall.dmi' pressure_resistance = 8 max_integrity = 300 interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_UI_INTERACT diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index a0d00c5d6fa..a550efd4803 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -50,7 +50,7 @@ /obj/structure/alien/resin name = "resin" desc = "Looks like some kind of thick resin." - icon = 'icons/obj/smooth_structures/alien/resin_wall_1.dmi' + icon = 'icons/obj/structures/smooth/alien/resin_wall_1.dmi' density = TRUE opacity = TRUE anchored = TRUE @@ -82,8 +82,8 @@ /obj/structure/alien/resin/proc/get_icon() if(prob(50)) - return 'icons/obj/smooth_structures/alien/resin_wall_1.dmi' - return 'icons/obj/smooth_structures/alien/resin_wall_2.dmi' + return 'icons/obj/structures/smooth/alien/resin_wall_1.dmi' + return 'icons/obj/structures/smooth/alien/resin_wall_2.dmi' /obj/structure/alien/resin/wall name = "resin wall" @@ -105,7 +105,7 @@ /obj/structure/alien/resin/membrane name = "resin membrane" desc = "Resin just thin enough to let light pass through." - icon = 'icons/obj/smooth_structures/alien/resin_membrane.dmi' + icon = 'icons/obj/structures/smooth/alien/resin_membrane.dmi' icon_state = "resin_membrane-0" base_icon_state = "resin_membrane" opacity = FALSE @@ -118,7 +118,7 @@ return /obj/structure/alien/resin/membrane/get_icon() - return 'icons/obj/smooth_structures/alien/resin_membrane.dmi' + return 'icons/obj/structures/smooth/alien/resin_membrane.dmi' /obj/structure/alien/resin/attack_paw(mob/user, list/modifiers) return attack_hand(user, modifiers) @@ -143,7 +143,7 @@ density = FALSE layer = MID_TURF_LAYER plane = FLOOR_PLANE - icon = 'icons/obj/smooth_structures/alien/weeds1.dmi' + icon = 'icons/obj/structures/smooth/alien/weeds1.dmi' icon_state = "weeds1-0" base_icon_state = "weeds1" max_integrity = 15 @@ -185,13 +185,13 @@ . = base_icon_state switch(rand(1,3)) if(1) - icon = 'icons/obj/smooth_structures/alien/weeds1.dmi' + icon = 'icons/obj/structures/smooth/alien/weeds1.dmi' base_icon_state = "weeds1" if(2) - icon = 'icons/obj/smooth_structures/alien/weeds2.dmi' + icon = 'icons/obj/structures/smooth/alien/weeds2.dmi' base_icon_state = "weeds2" if(3) - icon = 'icons/obj/smooth_structures/alien/weeds3.dmi' + icon = 'icons/obj/structures/smooth/alien/weeds3.dmi' base_icon_state = "weeds3" set_smoothed_icon_state(smoothing_junction) @@ -261,7 +261,7 @@ /obj/structure/alien/weeds/node name = "glowing resin" desc = "Blue bioluminescence shines from beneath the surface." - icon = 'icons/obj/smooth_structures/alien/weednode.dmi' + icon = 'icons/obj/structures/smooth/alien/weednode.dmi' icon_state = "weednode-0" base_icon_state = "weednode" light_color = LIGHT_COLOR_BLUE diff --git a/code/game/objects/structures/beds_chairs/alien_nest.dm b/code/game/objects/structures/beds_chairs/alien_nest.dm index 77759c9e309..2fab156e1b4 100644 --- a/code/game/objects/structures/beds_chairs/alien_nest.dm +++ b/code/game/objects/structures/beds_chairs/alien_nest.dm @@ -3,7 +3,7 @@ /obj/structure/bed/nest name = "alien nest" desc = "It's a gruesome pile of thick, sticky resin shaped like a nest." - icon = 'icons/obj/smooth_structures/alien/nest.dmi' + icon = 'icons/obj/structures/smooth/alien/nest.dmi' icon_state = "nest-0" base_icon_state = "nest" max_integrity = 120 @@ -41,7 +41,7 @@ unbuckle_mob(captive) add_fingerprint(hero) return - + captive.visible_message(span_warning("[captive.name] struggles to break free from the gelatinous resin!"), span_notice("You struggle to break free from the gelatinous resin... (Stay still for about a minute and a half.)"), span_hear("You hear squelching...")) diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm index c9185611d94..e7cffb0184c 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -12,7 +12,7 @@ name = "bed" desc = "This is used to lie in, sleep in or strap on." icon_state = "bed" - icon = 'icons/obj/bed.dmi' + icon = 'icons/obj/structures/bed.dmi' anchored = TRUE can_buckle = TRUE buckle_lying = 90 diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index b4683da5a87..b36790ec784 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -2,7 +2,7 @@ SET_BASE_VISUAL_PIXEL(0, DEPTH_OFFSET) name = "chair" desc = "You sit in this. Either by will or force." - icon = 'icons/obj/chairs.dmi' + icon = 'icons/obj/structures/chairs.dmi' icon_state = "chair" anchored = TRUE can_buckle = TRUE @@ -67,7 +67,7 @@ if(!user.temporarilyRemoveItemFromInventory(input_shock_kit)) return if(!overlays_from_child_procs || overlays_from_child_procs.len == 0) - var/image/echair_over_overlay = image('icons/obj/chairs.dmi', loc, "echair_over") + var/image/echair_over_overlay = image('icons/obj/structures/chairs.dmi', loc, "echair_over") AddComponent(/datum/component/electrified_buckle, (SHOCK_REQUIREMENT_ITEM | SHOCK_REQUIREMENT_LIVE_CABLE | SHOCK_REQUIREMENT_SIGNAL_RECEIVED_TOGGLE), input_shock_kit, list(echair_over_overlay), FALSE) else AddComponent(/datum/component/electrified_buckle, (SHOCK_REQUIREMENT_ITEM | SHOCK_REQUIREMENT_LIVE_CABLE | SHOCK_REQUIREMENT_SIGNAL_RECEIVED_TOGGLE), input_shock_kit, overlays_from_child_procs, FALSE) @@ -208,7 +208,7 @@ /obj/structure/chair/comfy/shuttle/electrify_self(obj/item/assembly/shock_kit/input_shock_kit, mob/user, list/overlays_from_child_procs) if(!overlays_from_child_procs) - overlays_from_child_procs = list(image('icons/obj/chairs.dmi', loc, "echair_over", pixel_x = -1)) + overlays_from_child_procs = list(image('icons/obj/structures/chairs.dmi', loc, "echair_over", pixel_x = -1)) . = ..() /obj/structure/chair/comfy/shuttle/tactical @@ -232,7 +232,7 @@ /obj/structure/chair/office/electrify_self(obj/item/assembly/shock_kit/input_shock_kit, mob/user, list/overlays_from_child_procs) if(!overlays_from_child_procs) - overlays_from_child_procs = list(image('icons/obj/chairs.dmi', loc, "echair_over", pixel_x = -1)) + overlays_from_child_procs = list(image('icons/obj/structures/chairs.dmi', loc, "echair_over", pixel_x = -1)) . = ..() /obj/structure/chair/office/tactical @@ -299,7 +299,7 @@ MAPPING_DIRECTIONAL_HELPERS_EMPTY(/obj/structure/chair/stool/bar) /obj/item/chair name = "chair" desc = "Bar brawl essential." - icon = 'icons/obj/chairs.dmi' + icon = 'icons/obj/structures/chairs.dmi' icon_state = "chair_toppled" inhand_icon_state = "chair" lefthand_file = 'icons/mob/inhands/items/chairs_lefthand.dmi' @@ -520,7 +520,7 @@ MAPPING_DIRECTIONAL_HELPERS_EMPTY(/obj/structure/chair/stool/bar) /obj/item/chair/plastic name = "folding plastic chair" desc = "Somehow, you can always find one under the wrestling ring." - icon = 'icons/obj/chairs.dmi' + icon = 'icons/obj/structures/chairs.dmi' icon_state = "folded_chair" inhand_icon_state = "folded_chair" lefthand_file = 'icons/mob/inhands/items/chairs_lefthand.dmi' diff --git a/code/game/objects/structures/beds_chairs/pew.dm b/code/game/objects/structures/beds_chairs/pew.dm index 0283003485c..31915aba2d0 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/chairs_wide.dmi' + icon = 'icons/obj/structures/chairs_wide.dmi' icon_state = "pewmiddle" resistance_flags = FLAMMABLE max_integrity = 70 @@ -28,7 +28,7 @@ update_leftpewarmrest() /obj/structure/chair/pew/left/proc/GetLeftPewArmrest() - return mutable_appearance('icons/obj/chairs_wide.dmi', "pewend_left_armrest") + return mutable_appearance('icons/obj/structures/chairs_wide.dmi', "pewend_left_armrest") /obj/structure/chair/pew/left/Destroy() QDEL_NULL(leftpewarmrest) @@ -63,7 +63,7 @@ update_rightpewarmrest() /obj/structure/chair/pew/right/proc/GetRightPewArmrest() - return mutable_appearance('icons/obj/chairs_wide.dmi', "pewend_right_armrest") + return mutable_appearance('icons/obj/structures/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 c8cd754feb1..6701529eeb3 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/chairs_wide.dmi' + icon = 'icons/obj/structures/chairs_wide.dmi' buildstackamount = 1 item_chair = null var/mutable_appearance/armrest @@ -32,7 +32,7 @@ path/corner/color_name {\ /obj/structure/chair/sofa/electrify_self(obj/item/assembly/shock_kit/input_shock_kit, mob/user, list/overlays_from_child_procs) if(!overlays_from_child_procs) - overlays_from_child_procs = list(image('icons/obj/chairs.dmi', loc, "echair_over", pixel_x = -1)) + overlays_from_child_procs = list(image('icons/obj/structures/chairs.dmi', loc, "echair_over", pixel_x = -1)) . = ..() /obj/structure/chair/sofa/post_buckle_mob(mob/living/M) diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 054f7822c57..a8faf485478 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -578,7 +578,7 @@ LINEN BINS /obj/structure/bedsheetbin name = "linen bin" desc = "It looks rather cosy." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/fluff/general.dmi' icon_state = "linenbin-full" base_icon_state = "linenbin" anchored = TRUE diff --git a/code/game/objects/structures/construction_console/construction_console.dm b/code/game/objects/structures/construction_console/construction_console.dm index f13dd1d78c6..fabb8c8068e 100644 --- a/code/game/objects/structures/construction_console/construction_console.dm +++ b/code/game/objects/structures/construction_console/construction_console.dm @@ -99,7 +99,7 @@ name = "construction holo-drone" //Allows any curious crew to watch the base after it leaves. (This is safe as the base cannot be modified once it leaves) move_on_shuttle = TRUE - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "construction_drone" invisibility = INVISIBILITY_MAXIMUM ///Reference to the camera console controlling this drone diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm index be4180b5fa1..1282864aa33 100644 --- a/code/game/objects/structures/curtains.dm +++ b/code/game/objects/structures/curtains.dm @@ -4,7 +4,7 @@ /obj/structure/curtain name = "curtain" desc = "Contains less than 1% mercury." - icon = 'icons/obj/watercloset.dmi' + icon = 'icons/obj/structures/watercloset.dmi' icon_state = "bathroom-open" color = "#ACD1E9" //Default color, didn't bother hardcoding other colors, mappers can and should easily change it. alpha = 200 //Mappers can also just set this to 255 if they want curtains that can't be seen through diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index e6dd5701b90..629ae07e06c 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -1,7 +1,7 @@ /obj/structure/displaycase SET_BASE_VISUAL_PIXEL(0, DEPTH_OFFSET) name = "display case" - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "glassbox" desc = "A display case for prized possessions." density = TRUE @@ -223,7 +223,7 @@ /obj/structure/displaycase_chassis name = "display case chassis" desc = "The wooden base of a display case." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "glassbox_chassis" resistance_flags = FLAMMABLE anchored = TRUE diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index 8d7be60a4f9..f6b46915c0f 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -9,7 +9,7 @@ /obj/structure/chair/e_chair/Initialize(mapload) . = ..() var/obj/item/assembly/shock_kit/stored_kit = new(contents) - var/image/export_to_component = image('icons/obj/chairs.dmi', loc, "echair_over") + var/image/export_to_component = image('icons/obj/structures/chairs.dmi', loc, "echair_over") AddComponent(/datum/component/electrified_buckle, (SHOCK_REQUIREMENT_ITEM | SHOCK_REQUIREMENT_LIVE_CABLE | SHOCK_REQUIREMENT_SIGNAL_RECEIVED_TOGGLE), stored_kit, list(export_to_component)) /obj/structure/chair/e_chair/attackby(obj/item/W, mob/user, params) diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index c78d733231e..6d56cd95c0a 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -1,7 +1,7 @@ /obj/structure/extinguisher_cabinet name = "extinguisher cabinet" desc = "A small wall mounted cabinet designed to hold a fire extinguisher." - icon = 'icons/obj/extinguisher.dmi' + icon = 'icons/obj/structures/cabinet.dmi' icon_state = "cabinet" anchored = TRUE density = FALSE @@ -171,6 +171,6 @@ WALL_MOUNT_DIRECTIONAL_HELPERS(/obj/structure/extinguisher_cabinet) /obj/item/wallframe/extinguisher_cabinet name = "extinguisher cabinet frame" desc = "Used for building wall-mounted extinguisher cabinets." - icon = 'icons/obj/extinguisher.dmi' + icon = 'icons/obj/structures/cabinet.dmi' icon_state = "cabinet" result_path = /obj/structure/extinguisher_cabinet diff --git a/code/game/objects/structures/fake_stairs.dm b/code/game/objects/structures/fake_stairs.dm index a75129d5441..57d49282278 100644 --- a/code/game/objects/structures/fake_stairs.dm +++ b/code/game/objects/structures/fake_stairs.dm @@ -1,7 +1,7 @@ /// Stairs but they are FAKE and dont have any of the Z-changing behavior. DO NOT MAP THESE NEXT TO REAL STAIRS /obj/structure/fake_stairs name = "stairs" - icon = 'icons/obj/stairs.dmi' + icon = 'icons/obj/structures/stairs.dmi' icon_state = "stairs" anchored = TRUE move_resist = INFINITY diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm index 95c725868ca..4496f5681ef 100644 --- a/code/game/objects/structures/fence.dm +++ b/code/game/objects/structures/fence.dm @@ -16,7 +16,7 @@ density = TRUE anchored = TRUE - icon = 'icons/obj/fence.dmi' + icon = 'icons/obj/structures/fence.dmi' icon_state = "straight" var/cuttable = TRUE diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index 12b071e6d3b..c154d45e345 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -1,7 +1,7 @@ /obj/structure/fireaxecabinet name = "fire axe cabinet" desc = "There is a small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if." - icon = 'icons/obj/extinguisher.dmi' + icon = 'icons/obj/structures/cabinet.dmi' icon_state = "fireaxe" anchored = TRUE density = FALSE @@ -214,7 +214,7 @@ WALL_MOUNT_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet/empty) /obj/item/wallframe/fireaxecabinet name = "fire axe cabinet" desc = "Home to a window's greatest nightmare. Apply to wall to use." - icon = 'icons/obj/extinguisher.dmi' + icon = 'icons/obj/structures/cabinet.dmi' icon_state = "fireaxe" result_path = /obj/structure/fireaxecabinet/empty diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm index d80b0a5cde8..2f4ca5a9298 100644 --- a/code/game/objects/structures/fluff.dm +++ b/code/game/objects/structures/fluff.dm @@ -210,7 +210,7 @@ /obj/structure/fluff/beach_towel name = "beach towel" desc = "A towel decorated in various beach-themed designs." - icon = 'icons/obj/railings.dmi' + icon = 'icons/obj/structures/railings.dmi' icon_state = "railing" density = FALSE anchored = TRUE @@ -281,7 +281,7 @@ /obj/structure/fluff/tram_rail name = "tram rail" desc = "Great for trams, not so great for skating." - icon = 'icons/obj/tram/tram_rails.dmi' + icon = 'icons/obj/structures/tram/tram_rails.dmi' icon_state = "rail" layer = TRAM_RAIL_LAYER plane = FLOOR_PLANE diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index a48b0ffcb40..7d1a7150296 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -1,6 +1,6 @@ /obj/structure/girder name = "girder" - icon = 'icons/obj/structures_tall.dmi' + icon = 'icons/obj/structures/tall.dmi' icon_state = "girder" desc = "A large structural assembly made out of metal; It requires a layer of iron before it can be considered a wall." anchored = TRUE @@ -425,7 +425,7 @@ /obj/structure/girder/tram name = "tram girder" desc = "Titanium framework to construct tram walls. Can be plated with titanium glass or other wall materials." - icon = 'icons/obj/structures.dmi' // Not 3/4ths, tram pain + icon = 'icons/obj/structures/tall.dmi' icon_state = "tram" state = GIRDER_TRAM obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 71cde2cdda0..2e570e51f33 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -4,7 +4,7 @@ /obj/structure/grille desc = "A flimsy framework of iron rods." name = "grille" - icon = 'icons/obj/smooth_structures/grille.dmi' + icon = 'icons/obj/structures/smooth/grille.dmi' icon_state = "grille-0" base_icon_state = "grille" density = TRUE @@ -47,10 +47,10 @@ var/old_base_state = base_icon_state var/ratio = atom_integrity / max_integrity if(ratio <= 0.7) - icon = 'icons/obj/smooth_structures/grille_damaged.dmi' + icon = 'icons/obj/structures/smooth/grille_damaged.dmi' base_icon_state = "grille_damaged" else - icon = 'icons/obj/smooth_structures/grille.dmi' + icon = 'icons/obj/structures/smooth/grille.dmi' base_icon_state = "grille" if(old_base_state != base_icon_state) @@ -58,7 +58,7 @@ var/old_smoothing_flags = smoothing_flags if(broken) - icon = 'icons/obj/smooth_structures/tall_structure_variations.dmi' + icon = 'icons/obj/structures/smooth/tall_structure_variations.dmi' icon_state = "grille-broken" base_icon_state = "grille-broken" smoothing_flags = NONE @@ -397,7 +397,7 @@ return null /obj/structure/grille/broken // Pre-broken grilles for map placement - icon = 'icons/obj/smooth_structures/tall_structure_variations.dmi' + icon = 'icons/obj/structures/smooth/tall_structure_variations.dmi' icon_state = "grille-broken" density = FALSE broken = TRUE diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm index a51e82498e2..8501ce40bf1 100644 --- a/code/game/objects/structures/guillotine.dm +++ b/code/game/objects/structures/guillotine.dm @@ -31,7 +31,7 @@ /obj/structure/guillotine name = "guillotine" desc = "A large structure used to remove the heads of traitors and treasonists." - icon = 'icons/obj/guillotine.dmi' + icon = 'icons/obj/structures/guillotine.dmi' icon_state = "guillotine_raised" icon_preview = 'icons/obj/fluff/previews.dmi' icon_state_preview = "guilliotine" diff --git a/code/game/objects/structures/headpike.dm b/code/game/objects/structures/headpike.dm index fca32574455..4d26332a275 100644 --- a/code/game/objects/structures/headpike.dm +++ b/code/game/objects/structures/headpike.dm @@ -1,7 +1,7 @@ /obj/structure/headpike name = "spooky head on a spear" desc = "When you really want to send a message." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/weapons/spear.dmi' icon_state = "headpike" density = FALSE anchored = TRUE diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index 314539aa2b4..79acf784663 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -2,7 +2,7 @@ /obj/structure/ladder name = "ladder" desc = "A sturdy metal ladder." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/fluff/general.dmi' icon_state = "ladder11" anchored = TRUE obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 291c58d26bd..5f1d138b90b 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -1,7 +1,7 @@ /obj/structure/lattice name = "lattice" desc = "A lightweight support lattice. These hold our station together." - icon = 'icons/obj/smooth_structures/lattice.dmi' + icon = 'icons/obj/structures/smooth/lattice.dmi' icon_state = "lattice-255" base_icon_state = "lattice" density = FALSE @@ -89,7 +89,7 @@ /obj/structure/lattice/catwalk name = "catwalk" desc = "A catwalk for easier EVA maneuvering and cable placement." - icon = 'icons/obj/smooth_structures/catwalk.dmi' + icon = 'icons/obj/structures/smooth/catwalk.dmi' icon_state = "catwalk-0" base_icon_state = "catwalk" number_of_mats = 2 @@ -138,7 +138,7 @@ /obj/structure/lattice/lava name = "heatproof support lattice" desc = "A specialized support beam for building across lava. Watch your step." - icon = 'icons/obj/smooth_structures/catwalk.dmi' + icon = 'icons/obj/structures/smooth/catwalk.dmi' icon_state = "catwalk-0" base_icon_state = "catwalk" number_of_mats = 1 diff --git a/code/game/objects/structures/lavaland/geyser.dm b/code/game/objects/structures/lavaland/geyser.dm index 4168a100751..48601a3ec98 100644 --- a/code/game/objects/structures/lavaland/geyser.dm +++ b/code/game/objects/structures/lavaland/geyser.dm @@ -117,7 +117,7 @@ /obj/item/plunger name = "plunger" desc = "It's a plunger for plunging." - icon = 'icons/obj/watercloset.dmi' + icon = 'icons/obj/tools.dmi' icon_state = "plunger" worn_icon_state = "plunger" diff --git a/code/game/objects/structures/maintenance.dm b/code/game/objects/structures/maintenance.dm index a196b2e0e83..4a82664e7f6 100644 --- a/code/game/objects/structures/maintenance.dm +++ b/code/game/objects/structures/maintenance.dm @@ -5,6 +5,7 @@ at the cost of risking a vicious bite.**/ SET_BASE_VISUAL_PIXEL(0, DEPTH_OFFSET) name = "moisture trap" desc = "A device installed in order to control moisture in poorly ventilated areas.\nThe stagnant water inside basin seems to produce serious biofouling issues when improperly maintained.\nThis unit in particular seems to be teeming with life!\nWho thought mother Gaia could assert herself so vigoriously in this sterile and desolate place?" + icon = 'icons/obj/maintenance_loot.dmi' icon_state = "moisture_trap" anchored = TRUE density = FALSE @@ -249,6 +250,7 @@ at the cost of risking a vicious bite.**/ /obj/structure/steam_vent name = "steam vent" desc = "A device periodically filtering out moisture particles from the nearby walls and windows. It's only possible due to the moisture traps nearby." + icon = 'icons/obj/maintenance_loot.dmi' icon_state = "steam_vent" anchored = TRUE density = FALSE diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 2d1a94fe633..83df6ca35a6 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -18,7 +18,7 @@ /obj/structure/mirror name = "mirror" desc = "Mirror mirror on the wall, who's the most robust of them all?" - icon = 'icons/obj/watercloset.dmi' + icon = 'icons/obj/structures/watercloset.dmi' icon_state = "mirror" movement_type = FLOATING density = FALSE @@ -42,7 +42,7 @@ if (isnull(reflection_filters)) reflection_filters = list() for (var/car_dir in GLOB.cardinals) - reflection_filters["[car_dir]"] = alpha_mask_filter(icon = icon('icons/obj/watercloset.dmi', "mirror_mask", dir = car_dir)) + reflection_filters["[car_dir]"] = alpha_mask_filter(icon = icon('icons/obj/structures/watercloset.dmi', "mirror_mask", dir = car_dir)) AddComponent(/datum/component/reflection, reflection_filter = reflection_filters["[dir]"], reflection_matrix = reflection_matrix, can_reflect = can_reflect, update_signals = update_signals) AddComponent(/datum/component/examine_balloon) @@ -57,6 +57,14 @@ WALL_MOUNT_DIRECTIONAL_HELPERS(/obj/structure/mirror) +/obj/structure/mirror/Initialize(mapload) + . = ..() + var/static/list/reflection_filter = alpha_mask_filter(icon = icon('icons/obj/structures/watercloset.dmi', "mirror_mask")) + var/static/matrix/reflection_matrix = matrix(0.75, 0, 0, 0, 0.75, 0) + var/datum/callback/can_reflect = CALLBACK(src, PROC_REF(can_reflect)) + var/list/update_signals = list(COMSIG_ATOM_BREAK) + AddComponent(/datum/component/reflection, reflection_filter = reflection_filter, reflection_matrix = reflection_matrix, can_reflect = can_reflect, update_signals = update_signals) + /obj/structure/mirror/proc/can_reflect(atom/movable/target) ///I'm doing it this way too, because the signal is sent before the broken variable is set to TRUE. if(atom_integrity <= integrity_failure * max_integrity) @@ -307,7 +315,7 @@ WALL_MOUNT_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken) /obj/item/wallframe/mirror name = "mirror" desc = "An unmounted mirror. Attach it to a wall to use." - icon = 'icons/obj/watercloset.dmi' + icon = 'icons/obj/structures/watercloset.dmi' icon_state = "mirror" custom_materials = list( /datum/material/glass = SHEET_MATERIAL_AMOUNT, diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index b80cee093fc..76a2c71848a 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/structures.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "morgue1" density = TRUE anchored = TRUE @@ -594,7 +594,7 @@ GLOBAL_LIST_EMPTY(crematoriums) /obj/structure/tray/m_tray name = "morgue tray" desc = "Apply corpse before closing." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "morguet" pass_flags_self = PASSTABLE | LETPASSTHROW layer = /obj/structure/bodycontainer/morgue::layer - 0.03 diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 841a951900d..cfc0295757c 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. It is made of the finest Spanish cork." - icon = 'icons/obj/noticeboard.dmi' + icon = 'icons/obj/structures/wallmounts.dmi' icon_state = "noticeboard" density = FALSE anchored = TRUE @@ -126,7 +126,7 @@ WALL_MOUNT_DIRECTIONAL_HELPERS(/obj/structure/noticeboard) /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/noticeboard.dmi' + icon = 'icons/obj/structures/wallmounts.dmi' icon_state = "noticeboard" 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 172fa01083d..e7c753f2fbd 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/structures_tall.dmi' + icon = 'icons/obj/structures/tall.dmi' icon_state = "plasticflaps" armor_type = /datum/armor/structure_plasticflaps density = FALSE diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm index ae4044f8405..cd33230d51a 100644 --- a/code/game/objects/structures/railings.dm +++ b/code/game/objects/structures/railings.dm @@ -1,7 +1,7 @@ /obj/structure/railing name = "railing" desc = "Basic railing meant to protect idiots like you from falling." - icon = 'icons/obj/railings.dmi' + icon = 'icons/obj/structures/railings.dmi' icon_state = "railing" flags_1 = ON_BORDER_1 obj_flags = CAN_BE_HIT | BLOCKS_CONSTRUCTION_DIR @@ -165,7 +165,7 @@ /obj/structure/railing/wooden_fence name = "wooden fence" desc = "wooden fence meant to keep animals in." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/structures/railings.dmi' icon_state = "wooden_railing" item_deconstruct = /obj/item/stack/sheet/mineral/wood layer = ABOVE_MOB_LAYER @@ -185,9 +185,9 @@ /obj/structure/railing/corner/end/wooden_fence - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/structures/railings.dmi' icon_state = "wooden_railing_corner" /obj/structure/railing/corner/end/flip/wooden_fence - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/structures/railings.dmi' icon_state = "wooden_railing_corner_flipped" diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm index e27f5fcf42b..e589fc62a1c 100644 --- a/code/game/objects/structures/reflector.dm +++ b/code/game/objects/structures/reflector.dm @@ -1,6 +1,6 @@ /obj/structure/reflector name = "reflector base" - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/machines/engine/reflector.dmi' icon_state = "reflector_map" desc = "A base for reflector assemblies." anchored = FALSE diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index bcc9d138695..c47d2bfd890 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -13,7 +13,7 @@ FLOOR SAFES /obj/structure/safe name = "safe" desc = "A huge chunk of metal with a dial embedded in it. Fine print on the dial reads \"Scarborough Arms - 2 tumbler safe, guaranteed thermite resistant, explosion resistant, and assistant resistant.\"" - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "safe" anchored = TRUE density = TRUE diff --git a/code/game/objects/structures/secure_safe.dm b/code/game/objects/structures/secure_safe.dm index 70287a37c0e..3256f096eac 100644 --- a/code/game/objects/structures/secure_safe.dm +++ b/code/game/objects/structures/secure_safe.dm @@ -96,7 +96,7 @@ WALL_MOUNT_DIRECTIONAL_HELPERS(/obj/structure/secure_safe/hos) It is made out of the same material as the station's Black Box and is designed to resist all conventional weaponry. \ There appears to be a small amount of surface corrosion. It doesn't look like it could withstand much of an explosion.\ Due to the expensive material, it was made incredibly small to cut corners, leaving only enough room to fit something as slim as an ID card." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "spare_safe" base_icon_state = "spare_safe" armor_type = /datum/armor/safe_caps_spare diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index 16ab5ba79ad..6bc9027848c 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -29,7 +29,7 @@ GLOBAL_LIST_INIT(shower_mode_descriptions, list( /obj/machinery/shower name = "shower" desc = "The HS-452. Installed in the 2550s by the Nanotrasen Hygiene Division, now with 2560 lead compliance! Passively replenishes itself with water when not in use." - icon = 'icons/obj/watercloset.dmi' + icon = 'icons/obj/structures/watercloset.dmi' icon_state = "shower" density = FALSE layer = ABOVE_WINDOW_LAYER @@ -177,7 +177,7 @@ SHOWER_DIRECTIONAL_HELPERS(/obj/machinery/shower) . = ..() if(!actually_on) return - var/mutable_appearance/water_falling = mutable_appearance('icons/obj/watercloset.dmi', "water", ABOVE_MOB_LAYER) + var/mutable_appearance/water_falling = mutable_appearance('icons/obj/structures/watercloset.dmi', "water", ABOVE_MOB_LAYER) water_falling.color = mix_color_from_reagents(reagents.reagent_list) . += water_falling @@ -309,7 +309,7 @@ SHOWER_DIRECTIONAL_HELPERS(/obj/machinery/shower) /obj/structure/showerframe name = "shower frame" - icon = 'icons/obj/watercloset.dmi' + icon = 'icons/obj/structures/watercloset.dmi' icon_state = "shower_frame" desc = "A shower frame, that needs a water recycler to finish construction." anchored = FALSE @@ -345,7 +345,7 @@ SHOWER_DIRECTIONAL_HELPERS(/obj/machinery/shower) /obj/effect/mist name = "mist" - icon = 'icons/obj/watercloset.dmi' + icon = 'icons/obj/structures/watercloset.dmi' icon_state = "mist" layer = FLY_LAYER anchored = TRUE diff --git a/code/game/objects/structures/signs/signs_departments.dm b/code/game/objects/structures/signs/signs_departments.dm index ea890146013..eed80bea8b1 100644 --- a/code/game/objects/structures/signs/signs_departments.dm +++ b/code/game/objects/structures/signs/signs_departments.dm @@ -2,7 +2,7 @@ //departmental signs /obj/structure/sign/departments - icon = 'icons/obj/departmental_signs.dmi' + icon = 'icons/obj/structures/departmental_signs.dmi' is_editable = TRUE ///////MEDBAY diff --git a/code/game/objects/structures/signs/signs_maps.dm b/code/game/objects/structures/signs/signs_maps.dm index 46ca54da8af..dd4e81e076f 100644 --- a/code/game/objects/structures/signs/signs_maps.dm +++ b/code/game/objects/structures/signs/signs_maps.dm @@ -40,7 +40,7 @@ WALL_MOUNT_DIRECTIONAL_HELPERS(/obj/structure/sign/map/left/metastation) WALL_MOUNT_DIRECTIONAL_HELPERS(/obj/structure/sign/map/right/metastation) /obj/structure/sign/directions - icon = 'icons/obj/directional_signs.dmi' + icon = 'icons/obj/structures/directional_signs.dmi' /// What direction is the arrow on the sign pointing? var/sign_arrow_direction = null /// If this sign has a support on the left or right, which side? null if niether diff --git a/code/game/objects/structures/spirit_board.dm b/code/game/objects/structures/spirit_board.dm index e8882251237..c10eded8bdd 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/structures.dmi' + icon = 'icons/obj/fluff/general.dmi' icon_state = "spirit_board" resistance_flags = FLAMMABLE density = TRUE diff --git a/code/game/objects/structures/stairs.dm b/code/game/objects/structures/stairs.dm index a26354211dc..99a2f8971f8 100644 --- a/code/game/objects/structures/stairs.dm +++ b/code/game/objects/structures/stairs.dm @@ -8,7 +8,7 @@ /obj/structure/stairs name = "stairs" - icon = 'icons/obj/stairs.dmi' + icon = 'icons/obj/structures/stairs.dmi' icon_state = "stairs" anchored = TRUE move_resist = INFINITY @@ -162,7 +162,7 @@ /obj/structure/stairs_frame name = "stairs frame" desc = "Everything you need to call something a staircase, aside from the stuff you actually step on." - icon = 'icons/obj/stairs.dmi' + icon = 'icons/obj/structures/stairs.dmi' icon_state = "stairs_frame" density = FALSE anchored = FALSE diff --git a/code/game/objects/structures/table_frames.dm b/code/game/objects/structures/table_frames.dm index cb45eb18e75..556276319c6 100644 --- a/code/game/objects/structures/table_frames.dm +++ b/code/game/objects/structures/table_frames.dm @@ -12,7 +12,7 @@ /obj/structure/table_frame name = "table frame" desc = "Four metal legs with four framing rods for a table. You could easily pass through this." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/structures/smooth/table_singles.dmi' icon_state = "table_frame" density = FALSE anchored = FALSE diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index f79c753076d..98f4d500f08 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -18,7 +18,7 @@ SET_BASE_VISUAL_PIXEL(0, 8) name = "table" desc = "A square piece of iron standing on four metal legs. It can not move." - icon = 'icons/obj/smooth_structures/table.dmi' + icon = 'icons/obj/structures/smooth/table.dmi' icon_state = "table-0" base_icon_state = "table" density = TRUE @@ -381,7 +381,7 @@ return COMSIG_LIVING_SHOVE_HANDLED /obj/structure/table/greyscale - icon = 'icons/obj/smooth_structures/table_greyscale.dmi' + icon = 'icons/obj/structures/smooth/table_greyscale.dmi' icon_state = "table_greyscale-0" base_icon_state = "table_greyscale" material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS @@ -405,7 +405,7 @@ smoothing_flags = NONE smoothing_groups = null canSmoothWith = null - icon = 'icons/obj/smooth_structures/rollingtable.dmi' + icon = 'icons/obj/structures/smooth/rollingtable.dmi' icon_state = "rollingtable" // this one's 32x32 so it uses different clickable bounds bottom_placable_y = 12 @@ -465,7 +465,7 @@ /obj/structure/table/glass name = "glass table" desc = "What did I say about leaning on the glass tables? Now you need surgery." - icon = 'icons/obj/smooth_structures/glass_table.dmi' + icon = 'icons/obj/structures/smooth/glass_table.dmi' icon_state = "glass_table-0" base_icon_state = "glass_table" custom_materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT) @@ -537,7 +537,7 @@ /obj/structure/table/glass/plasmaglass name = "plasma glass table" desc = "Someone thought this was a good idea." - icon = 'icons/obj/smooth_structures/plasmaglass_table.dmi' + icon = 'icons/obj/structures/smooth/plasmaglass_table.dmi' icon_state = "plasmaglass_table-0" base_icon_state = "plasmaglass_table" custom_materials = list(/datum/material/alloy/plasmaglass =SHEET_MATERIAL_AMOUNT) @@ -552,7 +552,7 @@ /obj/structure/table/wood name = "wooden table" desc = "Do not apply fire to this. Rumour says it burns easily." - icon = 'icons/obj/smooth_structures/wood_table.dmi' + icon = 'icons/obj/structures/smooth/wood_table.dmi' icon_state = "wood_table-0" base_icon_state = "wood_table" frame = /obj/structure/table_frame/wood @@ -570,7 +570,7 @@ /obj/structure/table/wood/poker //No specialties, Just a mapping object. name = "gambling table" desc = "A seedy table for seedy dealings in seedy places." - icon = 'icons/obj/smooth_structures/poker_table.dmi' + icon = 'icons/obj/structures/smooth/poker_table.dmi' icon_state = "poker_table-0" base_icon_state = "poker_table" buildstack = /obj/item/stack/tile/carpet @@ -581,7 +581,7 @@ /obj/structure/table/wood/fancy name = "fancy table" desc = "A standard metal table frame covered with an amazingly fancy, patterned cloth." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/structures/smooth/table_singles.dmi' icon_state = "fancy_table" base_icon_state = "fancy_table" frame = /obj/structure/table_frame @@ -589,7 +589,7 @@ buildstack = /obj/item/stack/tile/carpet smoothing_groups = SMOOTH_GROUP_FANCY_WOOD_TABLES //Don't smooth with SMOOTH_GROUP_TABLES or SMOOTH_GROUP_WOOD_TABLES canSmoothWith = SMOOTH_GROUP_FANCY_WOOD_TABLES - var/smooth_icon = 'icons/obj/smooth_structures/fancy_table.dmi' // see Initialize() + var/smooth_icon = 'icons/obj/structures/smooth/fancy_table.dmi' // see Initialize() /obj/structure/table/wood/fancy/Initialize(mapload) . = ..() @@ -603,55 +603,55 @@ icon_state = "fancy_table_black" base_icon_state = "fancy_table_black" buildstack = /obj/item/stack/tile/carpet/black - smooth_icon = 'icons/obj/smooth_structures/fancy_table_black.dmi' + smooth_icon = 'icons/obj/structures/smooth/fancy_table_black.dmi' /obj/structure/table/wood/fancy/blue icon_state = "fancy_table_blue" base_icon_state = "fancy_table_blue" buildstack = /obj/item/stack/tile/carpet/blue - smooth_icon = 'icons/obj/smooth_structures/fancy_table_blue.dmi' + smooth_icon = 'icons/obj/structures/smooth/fancy_table_blue.dmi' /obj/structure/table/wood/fancy/cyan icon_state = "fancy_table_cyan" base_icon_state = "fancy_table_cyan" buildstack = /obj/item/stack/tile/carpet/cyan - smooth_icon = 'icons/obj/smooth_structures/fancy_table_cyan.dmi' + smooth_icon = 'icons/obj/structures/smooth/fancy_table_cyan.dmi' /obj/structure/table/wood/fancy/green icon_state = "fancy_table_green" base_icon_state = "fancy_table_green" buildstack = /obj/item/stack/tile/carpet/green - smooth_icon = 'icons/obj/smooth_structures/fancy_table_green.dmi' + smooth_icon = 'icons/obj/structures/smooth/fancy_table_green.dmi' /obj/structure/table/wood/fancy/orange icon_state = "fancy_table_orange" base_icon_state = "fancy_table_orange" buildstack = /obj/item/stack/tile/carpet/orange - smooth_icon = 'icons/obj/smooth_structures/fancy_table_orange.dmi' + smooth_icon = 'icons/obj/structures/smooth/fancy_table_orange.dmi' /obj/structure/table/wood/fancy/purple icon_state = "fancy_table_purple" base_icon_state = "fancy_table_purple" buildstack = /obj/item/stack/tile/carpet/purple - smooth_icon = 'icons/obj/smooth_structures/fancy_table_purple.dmi' + smooth_icon = 'icons/obj/structures/smooth/fancy_table_purple.dmi' /obj/structure/table/wood/fancy/red icon_state = "fancy_table_red" base_icon_state = "fancy_table_red" buildstack = /obj/item/stack/tile/carpet/red - smooth_icon = 'icons/obj/smooth_structures/fancy_table_red.dmi' + smooth_icon = 'icons/obj/structures/smooth/fancy_table_red.dmi' /obj/structure/table/wood/fancy/royalblack icon_state = "fancy_table_royalblack" base_icon_state = "fancy_table_royalblack" buildstack = /obj/item/stack/tile/carpet/royalblack - smooth_icon = 'icons/obj/smooth_structures/fancy_table_royalblack.dmi' + smooth_icon = 'icons/obj/structures/smooth/fancy_table_royalblack.dmi' /obj/structure/table/wood/fancy/royalblue icon_state = "fancy_table_royalblue" base_icon_state = "fancy_table_royalblue" buildstack = /obj/item/stack/tile/carpet/royalblue - smooth_icon = 'icons/obj/smooth_structures/fancy_table_royalblue.dmi' + smooth_icon = 'icons/obj/structures/smooth/fancy_table_royalblue.dmi' /* * Reinforced tables @@ -659,7 +659,7 @@ /obj/structure/table/reinforced name = "reinforced table" desc = "A reinforced version of the four legged table." - icon = 'icons/obj/smooth_structures/reinforced_table.dmi' + icon = 'icons/obj/structures/smooth/reinforced_table.dmi' icon_state = "reinforced_table-0" base_icon_state = "reinforced_table" deconstruction_ready = FALSE @@ -720,7 +720,7 @@ /obj/structure/table/bronze name = "bronze table" desc = "A solid table made out of bronze." - icon = 'icons/obj/smooth_structures/brass_table.dmi' + icon = 'icons/obj/structures/smooth/brass_table.dmi' icon_state = "brass_table-0" base_icon_state = "brass_table" resistance_flags = FIRE_PROOF | ACID_PROOF @@ -735,7 +735,7 @@ /obj/structure/table/reinforced/rglass name = "reinforced glass table" desc = "A reinforced version of the glass table." - icon = 'icons/obj/smooth_structures/rglass_table.dmi' + icon = 'icons/obj/structures/smooth/rglass_table.dmi' icon_state = "rglass_table-0" base_icon_state = "rglass_table" custom_materials = list(/datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/iron =SHEET_MATERIAL_AMOUNT) @@ -745,7 +745,7 @@ /obj/structure/table/reinforced/plasmarglass name = "reinforced plasma glass table" desc = "A reinforced version of the plasma glass table." - icon = 'icons/obj/smooth_structures/rplasmaglass_table.dmi' + icon = 'icons/obj/structures/smooth/rplasmaglass_table.dmi' icon_state = "rplasmaglass_table-0" base_icon_state = "rplasmaglass_table" custom_materials = list(/datum/material/alloy/plasmaglass =SHEET_MATERIAL_AMOUNT, /datum/material/iron =SHEET_MATERIAL_AMOUNT) @@ -754,7 +754,7 @@ /obj/structure/table/reinforced/titaniumglass name = "titanium glass table" desc = "A titanium reinforced glass table, with a fresh coat of NT white paint." - icon = 'icons/obj/smooth_structures/titaniumglass_table.dmi' + icon = 'icons/obj/structures/smooth/titaniumglass_table.dmi' icon_state = "titaniumglass_table-0" base_icon_state = "titaniumglass_table" custom_materials = list(/datum/material/alloy/titaniumglass =SHEET_MATERIAL_AMOUNT) @@ -764,7 +764,7 @@ /obj/structure/table/reinforced/plastitaniumglass name = "plastitanium glass table" desc = "A table made of titanium reinforced silica-plasma composite. About as durable as it sounds." - icon = 'icons/obj/smooth_structures/plastitaniumglass_table.dmi' + icon = 'icons/obj/structures/smooth/plastitaniumglass_table.dmi' icon_state = "plastitaniumglass_table-0" base_icon_state = "plastitaniumglass_table" custom_materials = list(/datum/material/alloy/plastitaniumglass =SHEET_MATERIAL_AMOUNT) @@ -860,7 +860,7 @@ /obj/structure/rack name = "rack" desc = "Different from the Middle Ages version." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/fluff/general.dmi' icon_state = "rack" layer = TABLE_LAYER density = TRUE @@ -954,7 +954,7 @@ /obj/item/rack_parts name = "rack parts" desc = "Parts of a rack." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/fluff/general.dmi' icon_state = "rack_parts" inhand_icon_state = "rack_parts" obj_flags = CONDUCTS_ELECTRICITY diff --git a/code/game/objects/structures/tall_stairs.dm b/code/game/objects/structures/tall_stairs.dm index c097b28443d..1a1cd6f5e64 100644 --- a/code/game/objects/structures/tall_stairs.dm +++ b/code/game/objects/structures/tall_stairs.dm @@ -1,6 +1,6 @@ /obj/structure/tall_stairs name = "stairs" - icon = 'icons/obj/structures_tall.dmi' + icon = 'icons/obj/structures/tall.dmi' icon_state = "stairs_start" anchored = TRUE move_resist = INFINITY diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index a8cc14f617e..79217f2373e 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -4,7 +4,7 @@ SET_BASE_VISUAL_PIXEL(0, DEPTH_OFFSET) name = "tank dispenser" desc = "A simple yet bulky storage device for gas tanks." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/canisters.dmi' icon_state = "dispenser" density = TRUE anchored = TRUE diff --git a/code/game/objects/structures/toiletbong.dm b/code/game/objects/structures/toiletbong.dm index 254f151c017..a348835af38 100644 --- a/code/game/objects/structures/toiletbong.dm +++ b/code/game/objects/structures/toiletbong.dm @@ -1,7 +1,7 @@ /obj/structure/toiletbong name = "toilet bong" desc = "A repurposed toilet with re-arranged piping and an attached flamethrower. Why would anyone build this?" - icon = 'icons/obj/watercloset.dmi' + icon = 'icons/obj/structures/watercloset.dmi' icon_state = "toiletbong" base_icon_state = "toiletbong" density = FALSE @@ -18,7 +18,7 @@ atom_storage.do_rustle = FALSE atom_storage.animated = FALSE - weed_overlay = mutable_appearance('icons/obj/watercloset.dmi', "[base_icon_state]_overlay") + weed_overlay = mutable_appearance('icons/obj/structures/watercloset.dmi', "[base_icon_state]_overlay") START_PROCESSING(SSobj, src) /obj/structure/toiletbong/update_overlays() diff --git a/code/game/objects/structures/water_structures/sink.dm b/code/game/objects/structures/water_structures/sink.dm index 5961e196ecd..059dbac4993 100644 --- a/code/game/objects/structures/water_structures/sink.dm +++ b/code/game/objects/structures/water_structures/sink.dm @@ -1,6 +1,6 @@ /obj/structure/sink name = "sink" - icon = 'icons/obj/watercloset.dmi' + icon = 'icons/obj/structures/watercloset.dmi' icon_state = "sink" desc = "A sink used for washing one's hands and face. Passively reclaims water over time." anchored = TRUE @@ -248,7 +248,7 @@ SINK_DIRECTIONAL_HELPERS(/obj/structure/sink/kitchen) /obj/structure/sinkframe name = "sink frame" - icon = 'icons/obj/watercloset.dmi' + icon = 'icons/obj/structures/watercloset.dmi' icon_state = "sink_frame" desc = "A sink frame, that needs a water recycler to finish construction." anchored = FALSE diff --git a/code/game/objects/structures/water_structures/toilet.dm b/code/game/objects/structures/water_structures/toilet.dm index de721c54fd4..865eed29022 100644 --- a/code/game/objects/structures/water_structures/toilet.dm +++ b/code/game/objects/structures/water_structures/toilet.dm @@ -2,7 +2,7 @@ SET_BASE_VISUAL_PIXEL(0, DEPTH_OFFSET) name = "toilet" desc = "The HT-451, a torque rotation-based, waste disposal unit for small matter. This one seems remarkably clean." - icon = 'icons/obj/watercloset.dmi' + icon = 'icons/obj/structures/watercloset.dmi' icon_state = "toilet00" //The first number represents if the toilet lid is up, the second is if the cistern is open. base_icon_state = "toilet" density = FALSE diff --git a/code/game/objects/structures/water_structures/urinal.dm b/code/game/objects/structures/water_structures/urinal.dm index 48bc94b0c0b..b36a4b228d0 100644 --- a/code/game/objects/structures/water_structures/urinal.dm +++ b/code/game/objects/structures/water_structures/urinal.dm @@ -1,7 +1,7 @@ /obj/structure/urinal name = "urinal" desc = "The HU-452, an experimental urinal. Comes complete with experimental urinal cake." - icon = 'icons/obj/watercloset.dmi' + icon = 'icons/obj/structures/watercloset.dmi' icon_state = "urinal" density = FALSE anchored = TRUE @@ -92,14 +92,14 @@ WALL_MOUNT_DIRECTIONAL_HELPERS(/obj/structure/urinal) /obj/item/wallframe/urinal name = "urinal frame" desc = "An unmounted urinal. Attach it to a wall to use." - icon = 'icons/obj/watercloset.dmi' + icon = 'icons/obj/structures/watercloset.dmi' icon_state = "urinal" result_path = /obj/structure/urinal /obj/item/food/urinalcake name = "urinal cake" desc = "The noble urinal cake, protecting the station's pipes from the station's pee. Do not eat." - icon = 'icons/obj/watercloset.dmi' + icon = 'icons/obj/maintenance_loot.dmi' icon_state = "urinalcake" w_class = WEIGHT_CLASS_TINY food_reagents = list( diff --git a/code/game/objects/structures/water_structures/water_source.dm b/code/game/objects/structures/water_structures/water_source.dm index 9420156d918..69d4056b8d0 100644 --- a/code/game/objects/structures/water_structures/water_source.dm +++ b/code/game/objects/structures/water_structures/water_source.dm @@ -1,7 +1,7 @@ //Water source, use the type water_source for unlimited water sources like classic sinks. /obj/structure/water_source name = "Water Source" - icon = 'icons/obj/watercloset.dmi' + icon = 'icons/obj/structures/watercloset.dmi' icon_state = "sink" desc = "A sink used for washing one's hands and face. This one seems to be infinite!" anchored = TRUE @@ -133,6 +133,7 @@ /obj/structure/water_source/puddle //splishy splashy ^_^ name = "puddle" desc = "A puddle used for washing one's hands and face." + icon = 'icons/obj/mining_zones/terrain.dmi' icon_state = "puddle" base_icon_state = "puddle" resistance_flags = UNACIDABLE diff --git a/code/game/objects/structures/window_frames.dm b/code/game/objects/structures/window_frames.dm index cc913f8bf3a..48dce958c67 100644 --- a/code/game/objects/structures/window_frames.dm +++ b/code/game/objects/structures/window_frames.dm @@ -1,7 +1,7 @@ /obj/structure/window_frame name = "window frame" desc = "A frame section to place a window on top." - icon = 'icons/obj/smooth_structures/window_frames/window_frame_normal.dmi' + icon = 'icons/obj/structures/smooth/window_frames/window_frame_normal.dmi' icon_state = "window_frame_normal-0" base_icon_state = "window_frame_normal" smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ @@ -20,13 +20,13 @@ ///whether we spawn a window structure with us on mapload var/start_with_window = FALSE ///Icon used by grilles for this window frame - var/grille_icon = 'icons/obj/smooth_structures/window_grille.dmi' + var/grille_icon = 'icons/obj/structures/smooth/window_grille.dmi' - var/grille_black_icon = 'icons/obj/smooth_structures/window_grille_black.dmi' + var/grille_black_icon = 'icons/obj/structures/smooth/window_grille_black.dmi' ///Icon state used by grilles for this window frame. var/grille_icon_state = "window_grille" - var/frame_icon = 'icons/obj/smooth_structures/window_frames/frame_faces/window_frame_normal.dmi' + var/frame_icon = 'icons/obj/structures/smooth/window_frames/frame_faces/window_frame_normal.dmi' ///whether or not this window is reinforced and thus doesnt use the default attackby() behavior var/is_reinforced = FALSE @@ -438,10 +438,10 @@ /obj/structure/window_frame/titanium name = "shuttle window frame" - icon = 'icons/obj/smooth_structures/window_frames/window_frame_shuttle.dmi' + icon = 'icons/obj/structures/smooth/window_frames/window_frame_shuttle.dmi' icon_state = "window_frame_shuttle-0" base_icon_state = "window_frame_shuttle" - frame_icon = 'icons/obj/smooth_structures/window_frames/frame_faces/window_frame_shuttle.dmi' + frame_icon = 'icons/obj/structures/smooth/window_frames/frame_faces/window_frame_shuttle.dmi' sheet_type = /obj/item/stack/sheet/mineral/titanium window_type = /obj/item/stack/sheet/titaniumglass custom_materials = list(/datum/material/titanium = WINDOW_FRAME_BASE_MATERIAL_AMOUNT) @@ -455,10 +455,10 @@ /obj/structure/window_frame/plastitanium name = "plastitanium window frame" - icon = 'icons/obj/smooth_structures/window_frames/window_frame_plastitanium.dmi' + icon = 'icons/obj/structures/smooth/window_frames/window_frame_plastitanium.dmi' icon_state = "window_frame_plastitanium-0" base_icon_state = "window_frame_plastitanium" - frame_icon = 'icons/obj/smooth_structures/window_frames/frame_faces/window_frame_plastitanium.dmi' + frame_icon = 'icons/obj/structures/smooth/window_frames/frame_faces/window_frame_plastitanium.dmi' sheet_type = /obj/item/stack/sheet/mineral/plastitanium window_type = /obj/item/stack/sheet/plastitaniumglass custom_materials = list(/datum/material/alloy/plastitanium = WINDOW_FRAME_BASE_MATERIAL_AMOUNT) @@ -469,7 +469,7 @@ /obj/structure/window_frame/wood name = "wooden platform" - icon = 'icons/obj/smooth_structures/window_frames/window_frame_wood.dmi' + icon = 'icons/obj/structures/smooth/window_frames/window_frame_wood.dmi' icon_state = "window_frame_wood-0" base_icon_state = "window_frame_wood" frame_icon = null //no walls above the center @@ -478,87 +478,87 @@ /obj/structure/window_frame/uranium name = "uranium window frame" - icon = 'icons/obj/smooth_structures/window_frames/window_frame_uranium.dmi' + icon = 'icons/obj/structures/smooth/window_frames/window_frame_uranium.dmi' icon_state = "window_frame_uranium-0" base_icon_state = "window_frame_uranium" - frame_icon = 'icons/obj/smooth_structures/window_frames/frame_faces/window_frame_uranium.dmi' + frame_icon = 'icons/obj/structures/smooth/window_frames/frame_faces/window_frame_uranium.dmi' sheet_type = /obj/item/stack/sheet/mineral/uranium custom_materials = list(/datum/material/uranium = WINDOW_FRAME_BASE_MATERIAL_AMOUNT) /obj/structure/window_frame/iron name = "rough iron window frame" - icon = 'icons/obj/smooth_structures/window_frames/window_frame_iron.dmi' + icon = 'icons/obj/structures/smooth/window_frames/window_frame_iron.dmi' icon_state = "window_frame_iron-0" base_icon_state = "window_frame_iron" - frame_icon = 'icons/obj/smooth_structures/window_frames/frame_faces/window_frame_iron.dmi' + frame_icon = 'icons/obj/structures/smooth/window_frames/frame_faces/window_frame_iron.dmi' sheet_type = /obj/item/stack/sheet/iron custom_materials = list(/datum/material/iron = WINDOW_FRAME_BASE_MATERIAL_AMOUNT) /obj/structure/window_frame/silver name = "silver window frame" - icon = 'icons/obj/smooth_structures/window_frames/window_frame_silver.dmi' + icon = 'icons/obj/structures/smooth/window_frames/window_frame_silver.dmi' icon_state = "window_frame_silver-0" base_icon_state = "window_frame_silver" - frame_icon = 'icons/obj/smooth_structures/window_frames/frame_faces/window_frame_silver.dmi' + frame_icon = 'icons/obj/structures/smooth/window_frames/frame_faces/window_frame_silver.dmi' sheet_type = /obj/item/stack/sheet/mineral/silver custom_materials = list(/datum/material/silver = WINDOW_FRAME_BASE_MATERIAL_AMOUNT) /obj/structure/window_frame/gold name = "gold window frame" - icon = 'icons/obj/smooth_structures/window_frames/window_frame_gold.dmi' + icon = 'icons/obj/structures/smooth/window_frames/window_frame_gold.dmi' icon_state = "window_frame_gold-0" base_icon_state = "window_frame_gold" - frame_icon = 'icons/obj/smooth_structures/window_frames/frame_faces/window_frame_gold.dmi' + frame_icon = 'icons/obj/structures/smooth/window_frames/frame_faces/window_frame_gold.dmi' sheet_type = /obj/item/stack/sheet/mineral/gold custom_materials = list(/datum/material/gold = WINDOW_FRAME_BASE_MATERIAL_AMOUNT) /obj/structure/window_frame/bronze name = "clockwork window mount" - icon = 'icons/obj/smooth_structures/window_frames/window_frame_bronze.dmi' + icon = 'icons/obj/structures/smooth/window_frames/window_frame_bronze.dmi' icon_state = "window_frame_bronze-0" base_icon_state = "window_frame_bronze" - frame_icon = 'icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bronze.dmi' + frame_icon = 'icons/obj/structures/smooth/window_frames/frame_faces/window_frame_bronze.dmi' sheet_type = /obj/item/stack/sheet/bronze custom_materials = list(/datum/material/bronze = WINDOW_FRAME_BASE_MATERIAL_AMOUNT) /obj/structure/window_frame/cult name = "rune-scarred window frame" - icon = 'icons/obj/smooth_structures/window_frames/window_frame_cult.dmi' + icon = 'icons/obj/structures/smooth/window_frames/window_frame_cult.dmi' icon_state = "window_frame_cult-0" base_icon_state = "window_frame_cult" - frame_icon = 'icons/obj/smooth_structures/window_frames/frame_faces/window_frame_cult.dmi' + frame_icon = 'icons/obj/structures/smooth/window_frames/frame_faces/window_frame_cult.dmi' sheet_type = /obj/item/stack/sheet/runed_metal custom_materials = list(/datum/material/runedmetal = WINDOW_FRAME_BASE_MATERIAL_AMOUNT) /obj/structure/window_frame/hotel name = "hotel window frame" - icon = 'icons/obj/smooth_structures/window_frames/window_frame_hotel.dmi' + icon = 'icons/obj/structures/smooth/window_frames/window_frame_hotel.dmi' icon_state = "window_frame_hotel-0" base_icon_state = "window_frame_hotel" - frame_icon = 'icons/obj/smooth_structures/window_frames/frame_faces/window_frame_hotel.dmi' + frame_icon = 'icons/obj/structures/smooth/window_frames/frame_faces/window_frame_hotel.dmi' sheet_type = /obj/item/stack/sheet/mineral/wood custom_materials = list(/datum/material/wood = WINDOW_FRAME_BASE_MATERIAL_AMOUNT) /obj/structure/window_frame/material name = "material window frame" - icon = 'icons/obj/smooth_structures/window_frames/window_frame_material.dmi' + icon = 'icons/obj/structures/smooth/window_frames/window_frame_material.dmi' icon_state = "window_frame_material-0" base_icon_state = "window_frame_material" - frame_icon = 'icons/obj/smooth_structures/window_frames/frame_faces/window_frame_material.dmi' + frame_icon = 'icons/obj/structures/smooth/window_frames/frame_faces/window_frame_material.dmi' material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS /obj/structure/window_frame/rusty name = "rusty window frame" - icon = 'icons/obj/smooth_structures/window_frames/window_frame_rusty.dmi' + icon = 'icons/obj/structures/smooth/window_frames/window_frame_rusty.dmi' icon_state = "window_frame_rusty-0" base_icon_state = "window_frame_rusty" - frame_icon = 'icons/obj/smooth_structures/window_frames/frame_faces/window_frame_rusty.dmi' + frame_icon = 'icons/obj/structures/smooth/window_frames/frame_faces/window_frame_rusty.dmi' sheet_type = /obj/item/stack/sheet/iron custom_materials = list(/datum/material/iron = WINDOW_FRAME_BASE_MATERIAL_AMOUNT) /obj/structure/window_frame/sandstone name = "sandstone plinth" - icon = 'icons/obj/smooth_structures/window_frames/window_frame_sandstone.dmi' + icon = 'icons/obj/structures/smooth/window_frames/window_frame_sandstone.dmi' icon_state = "window_frame_sandstone-0" base_icon_state = "window_frame_sandstone" frame_icon = null //no walls above center @@ -567,19 +567,19 @@ /obj/structure/window_frame/bamboo name = "bamboo platform" - icon = 'icons/obj/smooth_structures/window_frames/window_frame_bamboo.dmi' + icon = 'icons/obj/structures/smooth/window_frames/window_frame_bamboo.dmi' icon_state = "window_frame_bamboo-0" base_icon_state = "window_frame_bamboo" - frame_icon = 'icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bamboo.dmi' + frame_icon = 'icons/obj/structures/smooth/window_frames/frame_faces/window_frame_bamboo.dmi' sheet_type = /obj/item/stack/sheet/mineral/bamboo custom_materials = list(/datum/material/bamboo = WINDOW_FRAME_BASE_MATERIAL_AMOUNT) /obj/structure/window_frame/paperframe name = "japanese window frame" - icon = 'icons/obj/smooth_structures/window_frames/window_frame_paperframe.dmi' + icon = 'icons/obj/structures/smooth/window_frames/window_frame_paperframe.dmi' icon_state = "window_frame_paperframe-0" base_icon_state = "window_frame_paperframe" - frame_icon = 'icons/obj/smooth_structures/window_frames/frame_faces/window_frame_paperframe.dmi' + frame_icon = 'icons/obj/structures/smooth/window_frames/frame_faces/window_frame_paperframe.dmi' sheet_type = /obj/item/stack/sheet/paperframes window_type = /obj/item/stack/sheet/paperframes custom_materials = list(/datum/material/paper = WINDOW_FRAME_BASE_MATERIAL_AMOUNT) diff --git a/code/game/objects/structures/windows/fulltile_windows.dm b/code/game/objects/structures/windows/fulltile_windows.dm index baa4b1b34bc..7dfb1a0d49e 100644 --- a/code/game/objects/structures/windows/fulltile_windows.dm +++ b/code/game/objects/structures/windows/fulltile_windows.dm @@ -1,5 +1,5 @@ /obj/structure/window/fulltile - icon = 'icons/obj/smooth_structures/windows/normal_window.dmi' + icon = 'icons/obj/structures/smooth/windows/normal_window.dmi' icon_state = "0-lower" pixel_y = WINDOW_OFF_FRAME_Y_OFFSET max_integrity = 50 @@ -15,7 +15,7 @@ anchored = FALSE /obj/structure/window/plasma/fulltile - icon = 'icons/obj/smooth_structures/windows/plasma_window.dmi' + icon = 'icons/obj/structures/smooth/windows/plasma_window.dmi' icon_state = "0-lower" pixel_y = WINDOW_OFF_FRAME_Y_OFFSET max_integrity = 300 @@ -30,7 +30,7 @@ anchored = FALSE /obj/structure/window/reinforced/plasma/fulltile - icon = 'icons/obj/smooth_structures/windows/plasma_reinforced_window.dmi' + icon = 'icons/obj/structures/smooth/windows/plasma_reinforced_window.dmi' icon_state = "0-lower" pixel_y = WINDOW_OFF_FRAME_Y_OFFSET state = RWINDOW_SECURE @@ -47,7 +47,7 @@ state = WINDOW_OUT_OF_FRAME /obj/structure/window/reinforced/fulltile - icon = 'icons/obj/smooth_structures/windows/reinforced_window.dmi' + icon = 'icons/obj/structures/smooth/windows/reinforced_window.dmi' icon_state = "0-lower" pixel_y = WINDOW_OFF_FRAME_Y_OFFSET max_integrity = 150 @@ -73,7 +73,7 @@ atom_integrity = rand(max_integrity * integrity_min_factor, max_integrity * integrity_max_factor) /obj/structure/window/reinforced/tinted/fulltile - icon = 'icons/obj/smooth_structures/windows/tinted_window.dmi' + icon = 'icons/obj/structures/smooth/windows/tinted_window.dmi' icon_state = "0-lower" pixel_y = WINDOW_OFF_FRAME_Y_OFFSET fulltile = TRUE @@ -84,7 +84,7 @@ glass_amount = 2 /obj/structure/window/reinforced/fulltile/ice - icon = 'icons/obj/smooth_structures/windows/frosted_window.dmi' + icon = 'icons/obj/structures/smooth/windows/frosted_window.dmi' max_integrity = 150 glass_amount = 2 @@ -92,7 +92,7 @@ /obj/structure/window/reinforced/shuttle//this is called reinforced because it is reinforced w/titanium name = "shuttle window" desc = "A reinforced, air-locked pod window." - icon = 'icons/obj/smooth_structures/windows/titanium_window.dmi' + icon = 'icons/obj/structures/smooth/windows/titanium_window.dmi' icon_state = "0-lower" pixel_y = WINDOW_OFF_FRAME_Y_OFFSET max_integrity = 150 @@ -137,7 +137,7 @@ /obj/structure/window/reinforced/plasma/plastitanium name = "plastitanium window" desc = "A durable looking window made of an alloy of of plasma and titanium." - icon = 'icons/obj/smooth_structures/windows/plastitanium_window.dmi' + icon = 'icons/obj/structures/smooth/windows/plastitanium_window.dmi' icon_state = "0-lower" pixel_y = WINDOW_OFF_FRAME_Y_OFFSET max_integrity = 1200 @@ -168,7 +168,7 @@ /obj/structure/window/paperframe name = "paper frame" desc = "A fragile separator made of thin wood and paper." - icon = 'icons/obj/smooth_structures/windows/paper_window.dmi' + icon = 'icons/obj/structures/smooth/windows/paper_window.dmi' icon_state = null opacity = TRUE max_integrity = 15 @@ -218,9 +218,9 @@ /obj/structure/window/paperframe/update_icon(updates=ALL) if(atom_integrity >= max_integrity) - icon = 'icons/obj/smooth_structures/windows/paper_window.dmi' + icon = 'icons/obj/structures/smooth/windows/paper_window.dmi' else - icon = 'icons/obj/smooth_structures/windows/paper_window_torn.dmi' + icon = 'icons/obj/structures/smooth/windows/paper_window_torn.dmi' . = ..() if((updates & UPDATE_SMOOTHING) && (smoothing_flags & USES_SMOOTHING)) QUEUE_SMOOTH(src) @@ -247,7 +247,7 @@ /obj/structure/window/bronze name = "brass window" desc = "A paper-thin pane of translucent yet reinforced brass. Nevermind, this is just weak bronze!" - icon = 'icons/obj/smooth_structures/structure_variations.dmi' + icon = 'icons/obj/structures/smooth/structure_variations.dmi' icon_state = "clockwork_window-single" glass_type = /obj/item/stack/sheet/bronze @@ -257,7 +257,7 @@ MAPPING_DIRECTIONAL_HELPERS_EMPTY(/obj/structure/window/bronze/spawner) anchored = FALSE /obj/structure/window/bronze/fulltile - icon = 'icons/obj/smooth_structures/clockwork_window.dmi' + icon = 'icons/obj/structures/smooth/clockwork_window.dmi' pixel_y = WINDOW_OFF_FRAME_Y_OFFSET icon_state = "clockwork_window-0" base_icon_state = "clockwork_window" diff --git a/code/game/objects/structures/windows/window.dm b/code/game/objects/structures/windows/window.dm index c48047cf612..37823278634 100644 --- a/code/game/objects/structures/windows/window.dm +++ b/code/game/objects/structures/windows/window.dm @@ -1,7 +1,7 @@ /obj/structure/window name = "window" desc = "A directional window." - icon = 'icons/obj/smooth_structures/windows/normal_thindow.dmi' + icon = 'icons/obj/structures/smooth/windows/normal_thindow.dmi' icon_state = "window" density = TRUE layer = ABOVE_OBJ_LAYER //Just above doors @@ -462,11 +462,11 @@ var/broken_icon = null switch(ratio) if(3) - broken_icon = 'icons/obj/smooth_structures/windows/window_broken_light.dmi' + broken_icon = 'icons/obj/structures/smooth/windows/window_broken_light.dmi' if(2) - broken_icon = 'icons/obj/smooth_structures/windows/window_broken_medium.dmi' + broken_icon = 'icons/obj/structures/smooth/windows/window_broken_medium.dmi' if(1) - broken_icon = 'icons/obj/smooth_structures/windows/window_broken_heavy.dmi' + broken_icon = 'icons/obj/structures/smooth/windows/window_broken_heavy.dmi' if(broken_icon) . += mutable_appearance(broken_icon, "[smoothing_junction]", -(layer+0.1)) @@ -705,7 +705,7 @@ MAPPING_DIRECTIONAL_HELPERS_EMPTY(/obj/structure/window/unanchored/spawner) /obj/structure/window/half can_atmos_pass = ATMOS_PASS_YES - icon = 'icons/obj/smooth_structures/windows/half_thindow.dmi' + icon = 'icons/obj/structures/smooth/windows/half_thindow.dmi' MAPPING_DIRECTIONAL_HELPERS_EMPTY(/obj/structure/window/half) @@ -717,7 +717,7 @@ MAPPING_DIRECTIONAL_HELPERS_EMPTY(/obj/structure/window/half/unanchored) /obj/structure/window/reinforced name = "reinforced window" desc = "A window that is reinforced with metal rods." - icon = 'icons/obj/smooth_structures/windows/reinforced_thindow.dmi' + icon = 'icons/obj/structures/smooth/windows/reinforced_thindow.dmi' reinf = TRUE heat_resistance = 1600 armor_type = /datum/armor/window_reinforced @@ -849,7 +849,7 @@ MAPPING_DIRECTIONAL_HELPERS_EMPTY(/obj/structure/window/reinforced/unanchored/sp /obj/structure/window/reinforced/half can_atmos_pass = ATMOS_PASS_YES - icon = 'icons/obj/smooth_structures/windows/reinforced_half_thindow.dmi' + icon = 'icons/obj/structures/smooth/windows/reinforced_half_thindow.dmi' MAPPING_DIRECTIONAL_HELPERS_EMPTY(/obj/structure/window/reinforced/half) @@ -870,7 +870,7 @@ MAPPING_DIRECTIONAL_HELPERS_EMPTY(/obj/structure/window/reinforced/half/unanchor /obj/structure/window/plasma name = "plasma window" desc = "A window made out of a plasma-silicate alloy. It looks insanely tough to break and burn through." - icon = 'icons/obj/smooth_structures/windows/plasma_thindow.dmi' + icon = 'icons/obj/structures/smooth/windows/plasma_thindow.dmi' reinf = FALSE heat_resistance = 25000 armor_type = /datum/armor/window_plasma @@ -899,7 +899,7 @@ MAPPING_DIRECTIONAL_HELPERS_EMPTY(/obj/structure/window/plasma/spawner) /obj/structure/window/reinforced/plasma name = "reinforced plasma window" desc = "A window made out of a plasma-silicate alloy and a rod matrix. It looks hopelessly tough to break and is most likely nigh fireproof." - icon = 'icons/obj/smooth_structures/windows/plasma_reinforced_thindow.dmi' + icon = 'icons/obj/structures/smooth/windows/plasma_reinforced_thindow.dmi' reinf = TRUE heat_resistance = 50000 armor_type = /datum/armor/reinforced_plasma @@ -928,7 +928,7 @@ MAPPING_DIRECTIONAL_HELPERS_EMPTY(/obj/structure/window/reinforced/plasma/spawne /obj/structure/window/reinforced/tinted name = "tinted window" - icon = 'icons/obj/smooth_structures/windows/tinted_thindow.dmi' + icon = 'icons/obj/structures/smooth/windows/tinted_thindow.dmi' /obj/structure/window/reinforced/tinted/Initialize(mapload, direct) . = ..() @@ -939,6 +939,6 @@ MAPPING_DIRECTIONAL_HELPERS_EMPTY(/obj/structure/window/reinforced/tinted/spawne /obj/structure/window/reinforced/tinted/frosted name = "frosted window" - icon = 'icons/obj/smooth_structures/windows/frosted_thindow.dmi' + icon = 'icons/obj/structures/smooth/windows/frosted_thindow.dmi' MAPPING_DIRECTIONAL_HELPERS_EMPTY(/obj/structure/window/reinforced/tinted/frosted/spawner) diff --git a/code/game/turfs/closed/indestructible.dm b/code/game/turfs/closed/indestructible.dm index 358c0d3ca08..816e2210ff0 100644 --- a/code/game/turfs/closed/indestructible.dm +++ b/code/game/turfs/closed/indestructible.dm @@ -186,7 +186,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen) /turf/closed/indestructible/fakeglass name = "window" - icon = MAP_SWITCH('icons/obj/smooth_structures/windows/reinforced_window.dmi', 'icons/obj/smooth_structures/structure_variations.dmi') + icon = MAP_SWITCH('icons/obj/structures/smooth/windows/reinforced_window.dmi', 'icons/obj/structures/smooth/structure_variations.dmi') icon_state = MAP_SWITCH("0-lower", "plastitanium_window-0") layer = ABOVE_OBJ_LAYER opacity = FALSE @@ -205,13 +205,13 @@ INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen) /turf/closed/indestructible/fakeglass/update_overlays() . = ..() - . += mutable_appearance('icons/obj/smooth_structures/window_grille_black.dmi', "window_grille_black-[smoothing_junction]", BELOW_OBJ_LAYER) - . += mutable_appearance('icons/obj/smooth_structures/window_grille.dmi', "window_grille-[smoothing_junction]", BELOW_OBJ_LAYER) - . += mutable_appearance('icons/obj/smooth_structures/window_frames/frame_faces/window_frame_normal.dmi', "window_frame_normal-[smoothing_junction]", BELOW_OBJ_LAYER, appearance_flags = KEEP_APART) + . += mutable_appearance('icons/obj/structures/smooth/window_grille_black.dmi', "window_grille_black-[smoothing_junction]", BELOW_OBJ_LAYER) + . += mutable_appearance('icons/obj/structures/smooth/window_grille.dmi', "window_grille-[smoothing_junction]", BELOW_OBJ_LAYER) + . += mutable_appearance('icons/obj/structures/smooth/window_frames/frame_faces/window_frame_normal.dmi', "window_frame_normal-[smoothing_junction]", BELOW_OBJ_LAYER, appearance_flags = KEEP_APART) /turf/closed/indestructible/opsglass name = "window" - icon = MAP_SWITCH('icons/obj/smooth_structures/windows/plastitanium_window.dmi', 'icons/obj/smooth_structures/plastitanium_window.dmi') + icon = MAP_SWITCH('icons/obj/structures/smooth/windows/plastitanium_window.dmi', 'icons/obj/structures/smooth/plastitanium_window.dmi') icon_state = MAP_SWITCH("0-lower", "plastitanium_window-0") layer = ABOVE_OBJ_LAYER opacity = FALSE @@ -230,9 +230,9 @@ INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen) /turf/closed/indestructible/opsglass/update_overlays() . = ..() - . += mutable_appearance('icons/obj/smooth_structures/window_grille_black.dmi', "window_grille_black-[smoothing_junction]", BELOW_OBJ_LAYER) - . += mutable_appearance('icons/obj/smooth_structures/window_grille.dmi', "window_grille-[smoothing_junction]", BELOW_OBJ_LAYER) - . += mutable_appearance('icons/obj/smooth_structures/window_frames/frame_faces/window_frame_plastitanium.dmi', "window_frame_plastitanium-[smoothing_junction]", BELOW_OBJ_LAYER, appearance_flags = KEEP_APART) + . += mutable_appearance('icons/obj/structures/smooth/window_grille_black.dmi', "window_grille_black-[smoothing_junction]", BELOW_OBJ_LAYER) + . += mutable_appearance('icons/obj/structures/smooth/window_grille.dmi', "window_grille-[smoothing_junction]", BELOW_OBJ_LAYER) + . += mutable_appearance('icons/obj/structures/smooth/window_frames/frame_faces/window_frame_plastitanium.dmi', "window_frame_plastitanium-[smoothing_junction]", BELOW_OBJ_LAYER, appearance_flags = KEEP_APART) /turf/closed/indestructible/fakedoor name = "airlock" @@ -354,13 +354,13 @@ INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen) /turf/closed/indestructible/resin name = "resin wall" - icon = 'icons/obj/smooth_structures/alien/resin_wall_1.dmi' + icon = 'icons/obj/structures/smooth/alien/resin_wall_1.dmi' smoothing_groups = SMOOTH_GROUP_ALIEN_WALLS + SMOOTH_GROUP_TALL_WALLS canSmoothWith = SMOOTH_GROUP_ALIEN_WALLS /turf/closed/indestructible/resin/membrane name = "resin membrane" - icon = 'icons/obj/smooth_structures/alien/resin_membrane.dmi' + icon = 'icons/obj/structures/smooth/alien/resin_membrane.dmi' icon_state = "resin_membrane-0" base_icon_state = "resin_membrane" opacity = FALSE @@ -375,7 +375,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen) /turf/closed/indestructible/grille name = "grille" desc = "A flimsy framework of iron rods." - icon = 'icons/obj/smooth_structures/grille.dmi' + icon = 'icons/obj/structures/smooth/grille.dmi' icon_state = "grille-0" base_icon_state = "grille" use_splitvis = FALSE diff --git a/code/modules/antagonists/abductor/abductor_structures.dm b/code/modules/antagonists/abductor/abductor_structures.dm index 17c9d3c2202..dba46d73f07 100644 --- a/code/modules/antagonists/abductor/abductor_structures.dm +++ b/code/modules/antagonists/abductor/abductor_structures.dm @@ -50,7 +50,7 @@ /obj/structure/table/abductor name = "alien table" desc = "Advanced flat surface technology at work!" - icon = 'icons/obj/smooth_structures/alien_table.dmi' + icon = 'icons/obj/structures/smooth/alien_table.dmi' icon_state = "alien_table-0" base_icon_state = "alien_table" buildstack = /obj/item/stack/sheet/mineral/abductor diff --git a/code/modules/antagonists/heretic/knowledge/ash_lore.dm b/code/modules/antagonists/heretic/knowledge/ash_lore.dm index 957a78a2726..0f532197b6e 100644 --- a/code/modules/antagonists/heretic/knowledge/ash_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/ash_lore.dm @@ -51,7 +51,7 @@ cost = 1 route = PATH_ASH depth = 3 - research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi' + research_tree_icon_path = 'icons/ui/antags/heretic/knowledge.dmi' research_tree_icon_state = "grasp_ash" /datum/heretic_knowledge/ashen_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic) @@ -161,7 +161,7 @@ His city, the people he swore to watch... and watch he did, as they all burnt to cinders." next_knowledge = list(/datum/heretic_knowledge/spell/flame_birth) route = PATH_ASH - research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi' + research_tree_icon_path = 'icons/ui/antags/heretic/knowledge.dmi' research_tree_icon_state = "blade_upgrade_ash" /datum/heretic_knowledge/blade_upgrade/ash/do_melee_effects(mob/living/source, mob/living/target, obj/item/melee/sickly_blade/blade) diff --git a/code/modules/antagonists/heretic/knowledge/blade_lore.dm b/code/modules/antagonists/heretic/knowledge/blade_lore.dm index de79151739f..96b75f08718 100644 --- a/code/modules/antagonists/heretic/knowledge/blade_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/blade_lore.dm @@ -55,7 +55,7 @@ cost = 1 route = PATH_BLADE depth = 3 - research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi' + research_tree_icon_path = 'icons/ui/antags/heretic/knowledge.dmi' research_tree_icon_state = "grasp_blade" /datum/heretic_knowledge/blade_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic) @@ -323,7 +323,7 @@ a flurry of blades, neither hitting their mark, for the Champion was indomitable." next_knowledge = list(/datum/heretic_knowledge/spell/furious_steel) route = PATH_BLADE - research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi' + research_tree_icon_path = 'icons/ui/antags/heretic/knowledge.dmi' research_tree_icon_state = "blade_upgrade_blade" /// How much force do we apply to the offhand? var/offand_force_decrement = 0 diff --git a/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm b/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm index a3e75761320..f77f6424f12 100644 --- a/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm @@ -51,7 +51,7 @@ cost = 1 route = PATH_COSMIC depth = 3 - research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi' + research_tree_icon_path = 'icons/ui/antags/heretic/knowledge.dmi' research_tree_icon_state = "grasp_cosmos" /datum/heretic_knowledge/cosmic_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic) @@ -143,7 +143,7 @@ The blades now glistened with fragmented power. I fell to the ground and wept at the beast's feet." next_knowledge = list(/datum/heretic_knowledge/spell/cosmic_expansion) route = PATH_COSMIC - research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi' + research_tree_icon_path = 'icons/ui/antags/heretic/knowledge.dmi' research_tree_icon_state = "blade_upgrade_cosmos" /// Storage for the second target. var/datum/weakref/second_target diff --git a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm index a1786189d99..7356db01b12 100644 --- a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm @@ -67,7 +67,7 @@ cost = 1 route = PATH_FLESH depth = 3 - research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi' + research_tree_icon_path = 'icons/ui/antags/heretic/knowledge.dmi' research_tree_icon_state = "grasp_flesh" /datum/heretic_knowledge/limited_amount/flesh_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic) @@ -142,7 +142,7 @@ limit = 2 cost = 1 route = PATH_FLESH - research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi' + research_tree_icon_path = 'icons/ui/antags/heretic/knowledge.dmi' research_tree_icon_state = "ghoul_voiceless" depth = 4 @@ -269,7 +269,7 @@ I finally began to understand. And then, blood rained from the heavens." next_knowledge = list(/datum/heretic_knowledge/summon/stalker) route = PATH_FLESH - research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi' + research_tree_icon_path = 'icons/ui/antags/heretic/knowledge.dmi' research_tree_icon_state = "blade_upgrade_flesh" ///What type of wound do we apply on hit var/wound_type = /datum/wound/slash/flesh/severe diff --git a/code/modules/antagonists/heretic/knowledge/lock_lore.dm b/code/modules/antagonists/heretic/knowledge/lock_lore.dm index 17e73cb162c..e45a9d4d693 100644 --- a/code/modules/antagonists/heretic/knowledge/lock_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/lock_lore.dm @@ -52,7 +52,7 @@ cost = 1 route = PATH_LOCK depth = 3 - research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi' + research_tree_icon_path = 'icons/ui/antags/heretic/knowledge.dmi' research_tree_icon_state = "grasp_lock" /datum/heretic_knowledge/lock_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic) @@ -176,7 +176,7 @@ next_knowledge = list(/datum/heretic_knowledge/spell/caretaker_refuge) route = PATH_LOCK wound_type = /datum/wound/slash/flesh/critical - research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi' + research_tree_icon_path = 'icons/ui/antags/heretic/knowledge.dmi' research_tree_icon_state = "blade_upgrade_lock" var/chance = 35 diff --git a/code/modules/antagonists/heretic/knowledge/moon_lore.dm b/code/modules/antagonists/heretic/knowledge/moon_lore.dm index 3c6b4e2109b..5cc26ee9045 100644 --- a/code/modules/antagonists/heretic/knowledge/moon_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/moon_lore.dm @@ -54,7 +54,7 @@ cost = 1 route = PATH_MOON depth = 3 - research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi' + research_tree_icon_path = 'icons/ui/antags/heretic/knowledge.dmi' research_tree_icon_state = "grasp_moon" /datum/heretic_knowledge/moon_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic) @@ -148,7 +148,7 @@ gain_text = "His wit was sharp as a blade, cutting through the lie to bring us joy." next_knowledge = list(/datum/heretic_knowledge/spell/moon_ringleader) route = PATH_MOON - research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi' + research_tree_icon_path = 'icons/ui/antags/heretic/knowledge.dmi' research_tree_icon_state = "blade_upgrade_moon" /datum/heretic_knowledge/blade_upgrade/moon/do_melee_effects(mob/living/source, mob/living/target, obj/item/melee/sickly_blade/blade) diff --git a/code/modules/antagonists/heretic/knowledge/rust_lore.dm b/code/modules/antagonists/heretic/knowledge/rust_lore.dm index 3a081c8d295..02d0be532eb 100644 --- a/code/modules/antagonists/heretic/knowledge/rust_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/rust_lore.dm @@ -55,7 +55,7 @@ cost = 1 route = PATH_RUST depth = 3 - research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi' + research_tree_icon_path = 'icons/ui/antags/heretic/knowledge.dmi' research_tree_icon_state = "grasp_rust" /datum/heretic_knowledge/rust_fist/on_gain(mob/user, datum/antagonist/heretic/our_heretic) @@ -168,7 +168,7 @@ The heavy rust weights it down. You stare deeply into it. The Rusted Hills call for you, now." next_knowledge = list(/datum/heretic_knowledge/spell/entropic_plume) route = PATH_RUST - research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi' + research_tree_icon_path = 'icons/ui/antags/heretic/knowledge.dmi' research_tree_icon_state = "blade_upgrade_rust" /datum/heretic_knowledge/blade_upgrade/rust/on_gain(mob/user, datum/antagonist/heretic/our_heretic) diff --git a/code/modules/antagonists/heretic/knowledge/side_ash_moon.dm b/code/modules/antagonists/heretic/knowledge/side_ash_moon.dm index 758ee0548d5..f0409615252 100644 --- a/code/modules/antagonists/heretic/knowledge/side_ash_moon.dm +++ b/code/modules/antagonists/heretic/knowledge/side_ash_moon.dm @@ -40,7 +40,7 @@ curse_color = "#f19a9a" cost = 1 route = PATH_SIDE - research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi' + research_tree_icon_path = 'icons/ui/antags/heretic/knowledge.dmi' research_tree_icon_state = "curse_paralysis" depth = 8 diff --git a/code/modules/antagonists/heretic/knowledge/side_rust_cosmos.dm b/code/modules/antagonists/heretic/knowledge/side_rust_cosmos.dm index 11918c66a29..7eeb28d4d2b 100644 --- a/code/modules/antagonists/heretic/knowledge/side_rust_cosmos.dm +++ b/code/modules/antagonists/heretic/knowledge/side_rust_cosmos.dm @@ -67,7 +67,7 @@ curse_color = "#c1ffc9" cost = 1 route = PATH_SIDE - research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi' + research_tree_icon_path = 'icons/ui/antags/heretic/knowledge.dmi' research_tree_icon_state = "curse_corrosion" depth = 8 diff --git a/code/modules/antagonists/heretic/knowledge/side_void_blade.dm b/code/modules/antagonists/heretic/knowledge/side_void_blade.dm index 56945262e3c..8bd4880cc1e 100644 --- a/code/modules/antagonists/heretic/knowledge/side_void_blade.dm +++ b/code/modules/antagonists/heretic/knowledge/side_void_blade.dm @@ -23,7 +23,7 @@ limit = 1 cost = 1 route = PATH_SIDE - research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi' + research_tree_icon_path = 'icons/ui/antags/heretic/knowledge.dmi' research_tree_icon_state = "ghoul_shattered" depth = 4 diff --git a/code/modules/antagonists/heretic/knowledge/void_lore.dm b/code/modules/antagonists/heretic/knowledge/void_lore.dm index 11031a51aca..3533279d67e 100644 --- a/code/modules/antagonists/heretic/knowledge/void_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/void_lore.dm @@ -61,7 +61,7 @@ cost = 1 route = PATH_VOID depth = 3 - research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi' + research_tree_icon_path = 'icons/ui/antags/heretic/knowledge.dmi' research_tree_icon_state = "grasp_void" /datum/heretic_knowledge/void_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic) @@ -153,7 +153,7 @@ gain_text = "Fleeting memories, fleeting feet. I mark my way with frozen blood upon the snow. Covered and forgotten." next_knowledge = list(/datum/heretic_knowledge/spell/void_pull) route = PATH_VOID - research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi' + research_tree_icon_path = 'icons/ui/antags/heretic/knowledge.dmi' research_tree_icon_state = "blade_upgrade_void" /datum/heretic_knowledge/blade_upgrade/void/do_ranged_effects(mob/living/user, mob/living/target, obj/item/melee/sickly_blade/blade) diff --git a/code/modules/antagonists/malf_ai/malf_ai_modules.dm b/code/modules/antagonists/malf_ai/malf_ai_modules.dm index 57e6ec44419..686375ab47f 100644 --- a/code/modules/antagonists/malf_ai/malf_ai_modules.dm +++ b/code/modules/antagonists/malf_ai/malf_ai_modules.dm @@ -777,7 +777,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) /datum/action/innate/ai/emergency_lights name = "Disable Emergency Lights" desc = "Disables all emergency lighting. Note that emergency lights can be restored through reboot at an APC." - button_icon = 'icons/obj/lighting.dmi' + button_icon = 'icons/obj/machines/lighting.dmi' button_icon_state = "floor_emergency" uses = 1 diff --git a/code/modules/asset_cache/assets/crafting.dm b/code/modules/asset_cache/assets/crafting.dm index 99088ed1a70..eea933ebc15 100644 --- a/code/modules/asset_cache/assets/crafting.dm +++ b/code/modules/asset_cache/assets/crafting.dm @@ -55,8 +55,8 @@ TOOL_WRENCH = icon('icons/obj/tools.dmi', "wrench"), TOOL_WELDER = icon('icons/obj/tools.dmi', "welder"), TOOL_ANALYZER = icon('icons/obj/devices/scanner.dmi', "analyzer"), - TOOL_MINING = icon('icons/obj/mining.dmi', "minipick"), - TOOL_SHOVEL = icon('icons/obj/mining.dmi', "spade"), + TOOL_MINING = icon('icons/obj/mining_zones/equipment.dmi', "minipick"), + TOOL_SHOVEL = icon('icons/obj/mining_zones/equipment.dmi', "spade"), TOOL_RETRACTOR = icon('icons/obj/medical/surgery_tools.dmi', "retractor"), TOOL_HEMOSTAT = icon('icons/obj/medical/surgery_tools.dmi', "hemostat"), TOOL_CAUTERY = icon('icons/obj/medical/surgery_tools.dmi', "cautery"), diff --git a/code/modules/asset_cache/assets/mecha.dm b/code/modules/asset_cache/assets/mecha.dm index 3c2403cf1c3..87d3b3ee5c8 100644 --- a/code/modules/asset_cache/assets/mecha.dm +++ b/code/modules/asset_cache/assets/mecha.dm @@ -3,4 +3,4 @@ /datum/asset/spritesheet/mecha_equipment/create_spritesheets() InsertAll("", 'icons/obj/devices/mecha_equipment.dmi') - InsertAll("", 'icons/obj/ore.dmi') + InsertAll("", 'icons/obj/mining_zones/ore.dmi') diff --git a/code/modules/asset_cache/assets/paper.dm b/code/modules/asset_cache/assets/paper.dm index fdd2e748dec..70d808b285b 100644 --- a/code/modules/asset_cache/assets/paper.dm +++ b/code/modules/asset_cache/assets/paper.dm @@ -1,20 +1,20 @@ /datum/asset/spritesheet/simple/paper name = "paper" assets = list( - "stamp-clown" = 'icons/stamp_icons/large_stamp-clown.png', - "stamp-deny" = 'icons/stamp_icons/large_stamp-deny.png', - "stamp-ok" = 'icons/stamp_icons/large_stamp-ok.png', - "stamp-void" = 'icons/stamp_icons/large_stamp-void.png', - "stamp-hop" = 'icons/stamp_icons/large_stamp-hop.png', - "stamp-cmo" = 'icons/stamp_icons/large_stamp-cmo.png', - "stamp-ce" = 'icons/stamp_icons/large_stamp-ce.png', - "stamp-hos" = 'icons/stamp_icons/large_stamp-hos.png', - "stamp-rd" = 'icons/stamp_icons/large_stamp-rd.png', - "stamp-cap" = 'icons/stamp_icons/large_stamp-cap.png', - "stamp-qm" = 'icons/stamp_icons/large_stamp-qm.png', - "stamp-law" = 'icons/stamp_icons/large_stamp-law.png', - "stamp-chap" = 'icons/stamp_icons/large_stamp-chap.png', - "stamp-mime" = 'icons/stamp_icons/large_stamp-mime.png', - "stamp-centcom" = 'icons/stamp_icons/large_stamp-centcom.png', - "stamp-syndicate" = 'icons/stamp_icons/large_stamp-syndicate.png' + "stamp-clown" = 'icons/ui/stamp_icons/large_stamp-clown.png', + "stamp-deny" = 'icons/ui/stamp_icons/large_stamp-deny.png', + "stamp-ok" = 'icons/ui/stamp_icons/large_stamp-ok.png', + "stamp-void" = 'icons/ui/stamp_icons/large_stamp-void.png', + "stamp-hop" = 'icons/ui/stamp_icons/large_stamp-hop.png', + "stamp-cmo" = 'icons/ui/stamp_icons/large_stamp-cmo.png', + "stamp-ce" = 'icons/ui/stamp_icons/large_stamp-ce.png', + "stamp-hos" = 'icons/ui/stamp_icons/large_stamp-hos.png', + "stamp-rd" = 'icons/ui/stamp_icons/large_stamp-rd.png', + "stamp-cap" = 'icons/ui/stamp_icons/large_stamp-cap.png', + "stamp-qm" = 'icons/ui/stamp_icons/large_stamp-qm.png', + "stamp-law" = 'icons/ui/stamp_icons/large_stamp-law.png', + "stamp-chap" = 'icons/ui/stamp_icons/large_stamp-chap.png', + "stamp-mime" = 'icons/ui/stamp_icons/large_stamp-mime.png', + "stamp-centcom" = 'icons/ui/stamp_icons/large_stamp-centcom.png', + "stamp-syndicate" = 'icons/ui/stamp_icons/large_stamp-syndicate.png' ) diff --git a/code/modules/asset_cache/assets/rcd.dm b/code/modules/asset_cache/assets/rcd.dm index 6577d6b1be5..41521e196f6 100644 --- a/code/modules/asset_cache/assets/rcd.dm +++ b/code/modules/asset_cache/assets/rcd.dm @@ -23,7 +23,7 @@ if(ispath(path, /obj/structure/window)) var/obj/structure/window/window_path = path if(initial(window_path.fulltile)) - sprite_icon = icon(icon = 'icons/obj/smooth_structures/window_frames/window_frame_normal.dmi', icon_state = "window_frame_normal-0", dir = SOUTH) + sprite_icon = icon(icon = 'icons/obj/structures/smooth/window_frames/window_frame_normal.dmi', icon_state = "window_frame_normal-0", dir = SOUTH) var/obj/structure/window_frame/frame_path = /obj/structure/window_frame diff --git a/code/modules/awaymissions/away_props.dm b/code/modules/awaymissions/away_props.dm index 843e55b963f..0ab3cd7e8e3 100644 --- a/code/modules/awaymissions/away_props.dm +++ b/code/modules/awaymissions/away_props.dm @@ -54,7 +54,7 @@ /obj/structure/pitgrate name = "pit grate" - icon = 'icons/obj/smooth_structures/lattice.dmi' + icon = 'icons/obj/structures/smooth/lattice.dmi' icon_state = "lattice-255" layer = ABOVE_OPEN_TURF_LAYER plane = FLOOR_PLANE diff --git a/code/modules/awaymissions/mission_code/murderdome.dm b/code/modules/awaymissions/mission_code/murderdome.dm index a59a491d492..4ff5b03ba3d 100644 --- a/code/modules/awaymissions/mission_code/murderdome.dm +++ b/code/modules/awaymissions/mission_code/murderdome.dm @@ -38,7 +38,7 @@ /obj/effect/murderdome/dead_barricade name = "dead barrier" desc = "It provided cover in fire fights. And now it's gone." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/structures/tall.dmi' icon_state = "barrier0" alpha = 100 diff --git a/code/modules/awaymissions/super_secret_room.dm b/code/modules/awaymissions/super_secret_room.dm index da36d9167f6..9f8be686fef 100644 --- a/code/modules/awaymissions/super_secret_room.dm +++ b/code/modules/awaymissions/super_secret_room.dm @@ -2,7 +2,7 @@ name = "strange tile" desc = "A weird tile that beckons you towards it. Maybe it can help you get out of this mess..." verb_say = "intones" - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/fluff/general.dmi' icon_state = "speaking_tile" layer = FLY_LAYER resistance_flags = INDESTRUCTIBLE diff --git a/code/modules/bitrunning/objects/hololadder.dm b/code/modules/bitrunning/objects/hololadder.dm index 3df41a403e7..feb1847a84c 100644 --- a/code/modules/bitrunning/objects/hololadder.dm +++ b/code/modules/bitrunning/objects/hololadder.dm @@ -3,7 +3,7 @@ anchored = TRUE desc = "An abstract representation of the means to disconnect from the virtual domain." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/fluff/general.dmi' icon_state = "ladder11" obj_flags = BLOCK_Z_OUT_DOWN /// Time req to disconnect properly diff --git a/code/modules/capture_the_flag/ctf_game.dm b/code/modules/capture_the_flag/ctf_game.dm index 38a7318b554..1279bbedc71 100644 --- a/code/modules/capture_the_flag/ctf_game.dm +++ b/code/modules/capture_the_flag/ctf_game.dm @@ -442,7 +442,7 @@ /obj/effect/ctf/dead_barricade name = "dead barrier" desc = "It provided cover in fire fights. And now it's gone." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/structures/tall.dmi' icon_state = "barrier0" var/game_id = CTF_GHOST_CTF_GAME_ID var/datum/ctf_controller/ctf_game diff --git a/code/modules/fishing/aquarium/aquarium.dm b/code/modules/fishing/aquarium/aquarium.dm index 5afbf4b72d9..7245f5a08e3 100644 --- a/code/modules/fishing/aquarium/aquarium.dm +++ b/code/modules/fishing/aquarium/aquarium.dm @@ -15,7 +15,7 @@ density = TRUE anchored = FALSE - icon = 'icons/obj/aquarium/tanks.dmi' + icon = 'icons/obj/structures/aquarium/tanks.dmi' icon_state = "aquarium_map" integrity_failure = 0.3 diff --git a/code/modules/fishing/aquarium/aquarium_kit.dm b/code/modules/fishing/aquarium/aquarium_kit.dm index 1161648f7d1..9dd83963a29 100644 --- a/code/modules/fishing/aquarium/aquarium_kit.dm +++ b/code/modules/fishing/aquarium/aquarium_kit.dm @@ -2,7 +2,7 @@ /obj/item/fish_feed name = "fish feed can" desc = "A refillable can that dispenses nutritious fish feed." - icon = 'icons/obj/aquarium/supplies.dmi' + icon = 'icons/obj/structures/aquarium/supplies.dmi' icon_state = "fish_feed" w_class = WEIGHT_CLASS_TINY @@ -94,7 +94,7 @@ /obj/item/aquarium_kit name = "DIY Aquarium Construction Kit" desc = "Everything you need to build your own aquarium. Raw materials sold separately." - icon = 'icons/obj/aquarium/supplies.dmi' + icon = 'icons/obj/structures/aquarium/supplies.dmi' icon_state = "construction_kit" w_class = WEIGHT_CLASS_TINY @@ -106,7 +106,7 @@ /obj/item/aquarium_prop name = "generic aquarium prop" desc = "very boring" - icon = 'icons/obj/aquarium/supplies.dmi' + icon = 'icons/obj/structures/aquarium/supplies.dmi' w_class = WEIGHT_CLASS_TINY var/layer_mode = AQUARIUM_LAYER_MODE_BOTTOM diff --git a/code/modules/fishing/aquarium/aquarium_upgrades.dm b/code/modules/fishing/aquarium/aquarium_upgrades.dm index c73e6e9d230..df3f961ceed 100644 --- a/code/modules/fishing/aquarium/aquarium_upgrades.dm +++ b/code/modules/fishing/aquarium/aquarium_upgrades.dm @@ -4,7 +4,7 @@ name = "Aquarium Upgrade" desc = "An upgrade." - icon = 'icons/obj/aquarium/supplies.dmi' + icon = 'icons/obj/structures/aquarium/supplies.dmi' icon_state = "construction_kit" /// What kind of aquarium can accept this upgrade. Strict type check, no subtypes. var/upgrade_from_type = /obj/structure/aquarium diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm index 19a20a40a81..24098f0406b 100644 --- a/code/modules/fishing/fish/_fish.dm +++ b/code/modules/fishing/fish/_fish.dm @@ -2,7 +2,7 @@ /obj/item/fish name = "generic looking aquarium fish" desc = "very bland" - icon = 'icons/obj/aquarium/fish.dmi' + icon = 'icons/obj/structures/aquarium/fish.dmi' icon_state = "bugfish" lefthand_file = 'icons/mob/inhands/fish_lefthand.dmi' righthand_file = 'icons/mob/inhands/fish_righthand.dmi' diff --git a/code/modules/fishing/fish/fish_types.dm b/code/modules/fishing/fish/fish_types.dm index ce9f36f0553..aa36c80696e 100644 --- a/code/modules/fishing/fish/fish_types.dm +++ b/code/modules/fishing/fish/fish_types.dm @@ -553,9 +553,9 @@ /obj/item/fish/mastodon name = "unmarine mastodon" desc = "A monster of exposed muscles and innards, wrapped in a fish-like skeleton. You don't remember ever seeing it on the catalog." - icon = 'icons/obj/aquarium/wide.dmi' + icon = 'icons/obj/structures/aquarium/wide.dmi' icon_state = "mastodon" - dedicated_in_aquarium_icon = 'icons/obj/aquarium/fish.dmi' + dedicated_in_aquarium_icon = 'icons/obj/structures/aquarium/fish.dmi' dedicated_in_aquarium_icon_state = "mastodon_small" base_pixel_x = -16 pixel_x = -16 diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm index 49b7056c9e7..51594698929 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/structures.dmi' + icon = 'icons/obj/service/hydroponics/equipment.dmi' icon_state = "barrel" base_icon_state = "barrel" resistance_flags = FLAMMABLE diff --git a/code/modules/hydroponics/grown/hedges.dm b/code/modules/hydroponics/grown/hedges.dm index d02949bfd98..1f8f792b326 100644 --- a/code/modules/hydroponics/grown/hedges.dm +++ b/code/modules/hydroponics/grown/hedges.dm @@ -34,7 +34,7 @@ /obj/structure/hedge name = "hedge" desc = "A large bushy hedge." - icon = 'icons/obj/smooth_structures/hedge.dmi' + icon = 'icons/obj/structures/smooth/hedge.dmi' icon_state = "hedge-0" base_icon_state = "hedge" smoothing_flags = SMOOTH_BITMASK diff --git a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm index 4cdb0bc8fe3..a0ba7311f29 100644 --- a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm +++ b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm @@ -85,7 +85,7 @@ /obj/structure/sink/oil_well //You're not going to enjoy bathing in this... name = "oil well" desc = "A bubbling pool of oil. This would probably be valuable, had bluespace technology not destroyed the need for fossil fuels 200 years ago." - icon = 'icons/obj/watercloset.dmi' + icon = 'icons/obj/mining_zones/terrain.dmi' icon_state = "puddle-oil" dispensedreagent = /datum/reagent/fuel/oil diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/museum.dm b/code/modules/mapfluff/ruins/objects_and_mobs/museum.dm index 57a00d85172..fb9d78a009b 100644 --- a/code/modules/mapfluff/ruins/objects_and_mobs/museum.dm +++ b/code/modules/mapfluff/ruins/objects_and_mobs/museum.dm @@ -51,7 +51,7 @@ /obj/structure/fluff/preserved_borer name = "preserved borer exhibit" desc = "A preserved cortical borer. Probably been there long enough to not last long outside the exhibit." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/fluff/general.dmi' icon_state = "preservedborer" density = TRUE diff --git a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm index 8ae99123e9b..649dec65c7c 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/structures.dmi' + icon = 'icons/obj/fluff/general.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/meatderelict.dm b/code/modules/mapfluff/ruins/spaceruin_code/meatderelict.dm index 0db718e399b..5350e836dae 100644 --- a/code/modules/mapfluff/ruins/spaceruin_code/meatderelict.dm +++ b/code/modules/mapfluff/ruins/spaceruin_code/meatderelict.dm @@ -89,7 +89,7 @@ /obj/structure/puzzle_blockade/meat name = "mass of meat and teeth" desc = "A horrible mass of meat and teeth. Can it see you? You hope not. Virtually indestructible, must be a way around." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/structures/tall.dmi' icon_state = "meatblockade" opacity = TRUE diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index 0902c170997..8582bf9d21c 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -335,7 +335,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/auxiliary_base, 32) anchored = FALSE density = FALSE var/shuttle_ID = "landing_zone_dock" - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.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/boulder_processing/boulder.dm b/code/modules/mining/boulder_processing/boulder.dm index 555ea50dff3..08544b0958f 100644 --- a/code/modules/mining/boulder_processing/boulder.dm +++ b/code/modules/mining/boulder_processing/boulder.dm @@ -7,7 +7,7 @@ name = "boulder" desc = "This rocks." icon_state = "ore" - icon = 'icons/obj/ore.dmi' + icon = 'icons/obj/mining_zones/ore.dmi' item_flags = NO_MAT_REDEMPTION | SLOWS_WHILE_IN_HAND throw_range = 2 throw_speed = 0.5 diff --git a/code/modules/mining/equipment/grapple_gun.dm b/code/modules/mining/equipment/grapple_gun.dm index 76da071ec6e..2e1baed0512 100644 --- a/code/modules/mining/equipment/grapple_gun.dm +++ b/code/modules/mining/equipment/grapple_gun.dm @@ -3,14 +3,14 @@ /obj/item/grapple_gun name = "grapple gun" desc = "A small specialised airgun capable of launching a climbing hook into a distant rock face and pulling the user toward it via motorised zip-line. A handy tool for traversing the craggy landscape of lavaland!" - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "grapple_gun" lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi' inhand_icon_state = "gun" item_flags = NOBLUDGEON ///overlay when the hook is retracted - var/static/mutable_appearance/hook_overlay = new(icon = 'icons/obj/mining.dmi', icon_state = "grapple_gun_hooked") + var/static/mutable_appearance/hook_overlay = new(icon = 'icons/obj/mining_zones/equipment.dmi', icon_state = "grapple_gun_hooked") ///is the hook retracted var/hooked = TRUE ///addtimer id for launching the user diff --git a/code/modules/mining/equipment/kheiral_cuffs.dm b/code/modules/mining/equipment/kheiral_cuffs.dm index eaaf11616cc..3a35429928e 100644 --- a/code/modules/mining/equipment/kheiral_cuffs.dm +++ b/code/modules/mining/equipment/kheiral_cuffs.dm @@ -3,7 +3,7 @@ /obj/item/kheiral_cuffs name = "\improper Kheiral cuffs" desc = "A prototype wrist communicator powered by Kheiral Matter. When both ends are clamped to one wrist, acts as a signal range booster for your suit sensors.\nA small engraving on the inside reads, \"NOT HANDCUFFS\"" - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "strand" worn_icon_state = "strandcuff" slot_flags = ITEM_SLOT_GLOVES diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 6a276e83072..e9634bb250b 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -6,7 +6,7 @@ * a good tradeoff and a decent playstyle. */ /obj/item/kinetic_crusher - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "crusher" inhand_icon_state = "crusher0" lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi' diff --git a/code/modules/mining/equipment/marker_beacons.dm b/code/modules/mining/equipment/marker_beacons.dm index c33181dd806..f82aab6c5f0 100644 --- a/code/modules/mining/equipment/marker_beacons.dm +++ b/code/modules/mining/equipment/marker_beacons.dm @@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sort_list(list( name = "marker beacon" singular_name = "marker beacon" desc = "Prism-brand path illumination devices. Used by miners to mark paths and warn of danger." - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "marker" merge_type = /obj/item/stack/marker_beacon max_amount = 100 @@ -72,7 +72,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sort_list(list( /obj/structure/marker_beacon name = "marker beacon" desc = "A Prism-brand path illumination device. It is anchored in place and glowing steadily." - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "marker" layer = BELOW_OPEN_DOOR_LAYER armor_type = /datum/armor/structure_marker_beacon diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index abf5ca77e18..8684ea64d0d 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -1,7 +1,7 @@ /*****************Pickaxes & Drills & Shovels****************/ /obj/item/pickaxe name = "pickaxe" - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "pickaxe" inhand_icon_state = "pickaxe" obj_flags = CONDUCTS_ELECTRICITY @@ -118,7 +118,7 @@ /obj/item/shovel name = "shovel" desc = "A large tool for digging and moving dirt." - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "shovel" inhand_icon_state = "shovel" lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi' @@ -202,7 +202,7 @@ /obj/item/trench_tool name = "entrenching tool" desc = "The multi-purpose tool you always needed." - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "trench_tool" inhand_icon_state = "trench_tool" lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi' diff --git a/code/modules/mining/equipment/resonator.dm b/code/modules/mining/equipment/resonator.dm index e4f69357dcb..65c79a06083 100644 --- a/code/modules/mining/equipment/resonator.dm +++ b/code/modules/mining/equipment/resonator.dm @@ -2,7 +2,7 @@ /obj/item/resonator name = "resonator" - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "resonator" inhand_icon_state = "resonator" lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi' diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index bca9d98e7d8..13b163baaa1 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -13,7 +13,7 @@ name = "bluespace shelter capsule" desc = "An emergency shelter stored within a pocket of bluespace." icon_state = "capsule" - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' w_class = WEIGHT_CLASS_TINY var/template_id = "shelter_alpha" var/datum/map_template/shelter/template @@ -137,14 +137,14 @@ //Window /obj/structure/window/reinforced/shuttle/survival_pod name = "pod window" - icon = 'icons/obj/smooth_structures/windows/pod_window.dmi' + icon = 'icons/obj/structures/smooth/windows/pod_window.dmi' smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_SURVIVAL_TITANIUM_POD canSmoothWith = SMOOTH_GROUP_SURVIVAL_TITANIUM_POD /obj/structure/window/reinforced/survival_pod name = "pod window" - icon = 'icons/obj/smooth_structures/windows/pod_thindow.dmi' + icon = 'icons/obj/structures/smooth/windows/pod_thindow.dmi' MAPPING_DIRECTIONAL_HELPERS_EMPTY(/obj/structure/window/reinforced/survival_pod/spawner) diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm index eb94f68a1f9..8dbdd53e68e 100644 --- a/code/modules/mining/equipment/wormhole_jaunter.dm +++ b/code/modules/mining/equipment/wormhole_jaunter.dm @@ -2,7 +2,7 @@ /obj/item/wormhole_jaunter name = "wormhole jaunter" desc = "A single use device harnessing outdated wormhole technology, Nanotrasen has since turned its eyes to bluespace for more accurate teleportation. The wormholes it creates are unpleasant to travel through, to say the least.\nThanks to modifications provided by the Free Golems, this jaunter can be worn on the belt to provide protection from chasms." - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "Jaunter" inhand_icon_state = "electronic" worn_icon_state = "electronic" diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm index 582426167d2..da069bb5a8c 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -3,7 +3,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) /obj/item/extraction_pack name = "fulton extraction pack" desc = "A balloon that can be used to extract equipment or personnel to a Fulton Recovery Beacon. Anything not bolted down can be moved. Link the pack to a beacon by using the pack in hand." - icon = 'icons/obj/fulton.dmi' + icon = 'icons/obj/mining_zones/fulton.dmi' icon_state = "extraction_pack" w_class = WEIGHT_CLASS_NORMAL /// Beacon weakref @@ -187,7 +187,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) /obj/item/fulton_core name = "extraction beacon assembly kit" desc = "When built, emits a signal which fulton recovery devices can lock onto. Activate in hand to unfold into a beacon." - icon = 'icons/obj/fulton.dmi' + icon = 'icons/obj/mining_zones/fulton.dmi' icon_state = "folded_extraction" /obj/item/fulton_core/attack_self(mob/user) @@ -199,7 +199,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) /obj/structure/extraction_point name = "fulton recovery beacon" desc = "A beacon for the fulton recovery system. Activate a pack in your hand to link it to a beacon." - icon = 'icons/obj/fulton.dmi' + icon = 'icons/obj/mining_zones/fulton.dmi' icon_state = "extraction_point" anchored = TRUE density = FALSE diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm index b62470157ff..20f6b022828 100644 --- a/code/modules/mining/lavaland/tendril_loot.dm +++ b/code/modules/mining/lavaland/tendril_loot.dm @@ -226,7 +226,7 @@ /obj/item/wisp_lantern name = "spooky lantern" desc = "This lantern gives off no light, but is home to a friendly wisp." - icon = 'icons/obj/lighting.dmi' + icon = 'icons/obj/mining_zones/artefacts.dmi' icon_state = "lantern-blue-on" inhand_icon_state = "lantern-blue-on" lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi' @@ -269,7 +269,7 @@ /obj/effect/wisp name = "friendly wisp" desc = "Happy to light your way." - icon = 'icons/obj/lighting.dmi' + icon = 'icons/obj/mining_zones/artefacts.dmi' icon_state = "orb" light_system = OVERLAY_LIGHT light_range = 6 @@ -588,7 +588,7 @@ /obj/item/jacobs_ladder name = "jacob's ladder" desc = "A celestial ladder that violates the laws of physics." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/fluff/general.dmi' icon_state = "ladder00" /obj/item/jacobs_ladder/attack_self(mob/user) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 53fd78cf94d..9f6a30b9bd8 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -521,7 +521,7 @@ /obj/structure/minecart_rail name = "cart rail" desc = "Carries carts along the track." - icon = 'icons/obj/track.dmi' + icon = 'icons/obj/structures/track.dmi' icon_state = "track" layer = TRAM_RAIL_LAYER plane = FLOOR_PLANE diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index e9e8b3a7c3d..4e4894a734c 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -9,7 +9,7 @@ /obj/item/stack/ore name = "rock" - icon = 'icons/obj/ore.dmi' + icon = 'icons/obj/mining_zones/ore.dmi' icon_state = "ore" inhand_icon_state = null full_w_class = WEIGHT_CLASS_BULKY @@ -237,7 +237,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ /obj/item/gibtonite name = "gibtonite ore" desc = "Extremely explosive if struck with mining equipment, Gibtonite is often used by miners to speed up their work by using it as a mining charge. This material is illegal to possess by unauthorized personnel under space law." - icon = 'icons/obj/ore.dmi' + icon = 'icons/obj/mining_zones/ore.dmi' icon_state = "gibtonite" inhand_icon_state = "Gibtonite ore" w_class = WEIGHT_CLASS_BULKY diff --git a/code/modules/mining/satchel_ore_box.dm b/code/modules/mining/satchel_ore_box.dm index b94796b1614..7f0c51ea94e 100644 --- a/code/modules/mining/satchel_ore_box.dm +++ b/code/modules/mining/satchel_ore_box.dm @@ -2,7 +2,7 @@ /**********************Ore box**************************/ /obj/structure/ore_box - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "orebox" name = "ore box" desc = "A heavy wooden box, which can be filled with a lot of ores or boulders" diff --git a/code/modules/mining/voucher_sets.dm b/code/modules/mining/voucher_sets.dm index 071a8f11536..1a5ce875c27 100644 --- a/code/modules/mining/voucher_sets.dm +++ b/code/modules/mining/voucher_sets.dm @@ -19,7 +19,7 @@ /datum/voucher_set/crusher_kit name = "Crusher Kit" description = "Contains a kinetic crusher and a pocket fire extinguisher. Kinetic crusher is a versatile melee mining tool capable both of mining and fighting local fauna, however it is difficult to use effectively for anyone but most skilled and/or suicidal miners." - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "crusher" set_items = list( /obj/item/extinguisher/mini, @@ -29,7 +29,7 @@ /datum/voucher_set/extraction_kit name = "Extraction and Rescue Kit" description = "Contains a fulton extraction pack and a beacon signaller, which allows you to send back home minerals, items and dead bodies without having to use the mining shuttle. And as a bonus, you get 30 marker beacons to help you better mark your path." - icon = 'icons/obj/fulton.dmi' + icon = 'icons/obj/mining_zones/fulton.dmi' icon_state = "extraction_pack" set_items = list( /obj/item/extraction_pack, @@ -40,7 +40,7 @@ /datum/voucher_set/resonator_kit name = "Resonator Kit" description = "Contains a resonator and a pocket fire extinguisher. Resonator is a handheld device that creates small fields of energy that resonate until they detonate, crushing rock. It does increased damage in low pressure." - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "resonator" set_items = list( /obj/item/extinguisher/mini, diff --git a/code/modules/mob/living/basic/drone/drone_tools.dm b/code/modules/mob/living/basic/drone/drone_tools.dm index 7effefcd7f9..91f61a11c2a 100644 --- a/code/modules/mob/living/basic/drone/drone_tools.dm +++ b/code/modules/mob/living/basic/drone/drone_tools.dm @@ -48,7 +48,7 @@ /obj/item/crowbar/drone name = "built-in crowbar" desc = "A crowbar built into your chassis." - icon = 'icons/obj/items_cyborg.dmi' + icon = 'icons/mob/silicon/robot_items.dmi' icon_state = "toolkit_engiborg_crowbar" inhand_icon_state = "crowbar" item_flags = NO_MAT_REDEMPTION @@ -56,7 +56,7 @@ /obj/item/screwdriver/drone name = "built-in screwdriver" desc = "A screwdriver built into your chassis." - icon = 'icons/obj/items_cyborg.dmi' + icon = 'icons/mob/silicon/robot_items.dmi' icon_state = "toolkit_engiborg_screwdriver" inhand_icon_state = "screwdriver" item_flags = NO_MAT_REDEMPTION @@ -75,7 +75,7 @@ /obj/item/wrench/drone name = "built-in wrench" desc = "A wrench built into your chassis." - icon = 'icons/obj/items_cyborg.dmi' + icon = 'icons/mob/silicon/robot_items.dmi' icon_state = "toolkit_engiborg_wrench" inhand_icon_state = "wrench" item_flags = NO_MAT_REDEMPTION @@ -83,14 +83,14 @@ /obj/item/weldingtool/drone name = "built-in welding tool" desc = "A welding tool built into your chassis." - icon = 'icons/obj/items_cyborg.dmi' + icon = 'icons/mob/silicon/robot_items.dmi' icon_state = "indwelder_cyborg" item_flags = NO_MAT_REDEMPTION /obj/item/wirecutters/drone name = "built-in wirecutters" desc = "Wirecutters built into your chassis." - icon = 'icons/obj/items_cyborg.dmi' + icon = 'icons/mob/silicon/robot_items.dmi' icon_state = "toolkit_engiborg_cutters" inhand_icon_state = "cutters" item_flags = NO_MAT_REDEMPTION @@ -99,7 +99,7 @@ /obj/item/multitool/drone name = "built-in multitool" desc = "A multitool built into your chassis." - icon = 'icons/obj/items_cyborg.dmi' + icon = 'icons/mob/silicon/robot_items.dmi' icon_state = "toolkit_engiborg_multitool" item_flags = NO_MAT_REDEMPTION toolspeed = 0.5 diff --git a/code/modules/mob/living/basic/icemoon/ice_demon/ice_demon_abilities.dm b/code/modules/mob/living/basic/icemoon/ice_demon/ice_demon_abilities.dm index af17fc0cb01..50b98930d48 100644 --- a/code/modules/mob/living/basic/icemoon/ice_demon/ice_demon_abilities.dm +++ b/code/modules/mob/living/basic/icemoon/ice_demon/ice_demon_abilities.dm @@ -11,7 +11,7 @@ /datum/action/cooldown/mob_cooldown/ice_demon_teleport name = "Bluespace Teleport" desc = "Teleport towards a destination target!" - button_icon = 'icons/obj/ore.dmi' + button_icon = 'icons/obj/mining_zones/ore.dmi' button_icon_state = "bluespace_crystal" cooldown_time = 3 SECONDS melee_cooldown_time = 0 SECONDS diff --git a/code/modules/mob/living/basic/jungle/venus_human_trap.dm b/code/modules/mob/living/basic/jungle/venus_human_trap.dm index f2f41a4d744..95722ea55e1 100644 --- a/code/modules/mob/living/basic/jungle/venus_human_trap.dm +++ b/code/modules/mob/living/basic/jungle/venus_human_trap.dm @@ -58,7 +58,7 @@ return /obj/structure/alien/resin/flower_bud/get_icon() - return 'icons/obj/smooth_structures/alien/resin_membrane.dmi' + return 'icons/obj/structures/smooth/alien/resin_membrane.dmi' /obj/structure/alien/resin/flower_bud/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) if((trait_flags & SPACEVINE_HEAT_RESISTANT) && damage_type == BURN) diff --git a/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_loot.dm b/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_loot.dm index 11fd7b6aa26..c3a1576a6c0 100644 --- a/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_loot.dm +++ b/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_loot.dm @@ -19,7 +19,7 @@ name = "brimdust" desc = "Dust from a brimdemon. It is considered valuable for its' botanical abilities." icon_state = "brimdust" - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' layer = FLOOR_CLEAN_LAYER mergeable_decal = FALSE @@ -32,7 +32,7 @@ name = "ore sensor" desc = "Using demonic frequencies, this ear-mounted tool detects ores in the nearby terrain." icon_state = "oresensor" - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' slot_flags = ITEM_SLOT_EARS var/range = 5 var/cooldown = 4 SECONDS //between the standard and the advanced ore scanner in strength diff --git a/code/modules/mob/living/basic/lavaland/goliath/goliath.dm b/code/modules/mob/living/basic/lavaland/goliath/goliath.dm index 7dd4afceac5..aa4d3295b93 100644 --- a/code/modules/mob/living/basic/lavaland/goliath/goliath.dm +++ b/code/modules/mob/living/basic/lavaland/goliath/goliath.dm @@ -228,5 +228,5 @@ /obj/item/goliath_saddle name = "goliath saddle" desc = "This rough saddle will give you a serviceable seat upon a goliath! Provided you can get one to stand still." - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "goliath_saddle" diff --git a/code/modules/mob/living/basic/lavaland/gutlunchers/gutluncher_foodtrough.dm b/code/modules/mob/living/basic/lavaland/gutlunchers/gutluncher_foodtrough.dm index 0180c4f1797..22aaec631b0 100644 --- a/code/modules/mob/living/basic/lavaland/gutlunchers/gutluncher_foodtrough.dm +++ b/code/modules/mob/living/basic/lavaland/gutlunchers/gutluncher_foodtrough.dm @@ -39,7 +39,7 @@ /obj/structure/ore_container/food_trough/gutlunch_trough name = "gutlunch trough" desc = "The gutlunches will eat out of it!" - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/fluff/general.dmi' icon_state = "gutlunch_trough" x_offsets = list(-5, 8) y_offsets = list(-2, -7) diff --git a/code/modules/mob/living/basic/lavaland/node_drone/node_drone.dm b/code/modules/mob/living/basic/lavaland/node_drone/node_drone.dm index 362fe665cb7..259f24f0465 100644 --- a/code/modules/mob/living/basic/lavaland/node_drone/node_drone.dm +++ b/code/modules/mob/living/basic/lavaland/node_drone/node_drone.dm @@ -13,7 +13,7 @@ SET_BASE_VISUAL_PIXEL(0, 6) name = "NODE drone" desc = "Standard in-atmosphere drone, used by Nanotrasen to operate and excavate valuable ore vents." - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "mining_node_active" icon_living = "mining_node_active" icon_dead = "mining_node_active" diff --git a/code/modules/mob/living/basic/lavaland/raptor/raptor_food_trough.dm b/code/modules/mob/living/basic/lavaland/raptor/raptor_food_trough.dm index 03289f2d0fe..4aa1d39ade3 100644 --- a/code/modules/mob/living/basic/lavaland/raptor/raptor_food_trough.dm +++ b/code/modules/mob/living/basic/lavaland/raptor/raptor_food_trough.dm @@ -1,7 +1,7 @@ /obj/structure/ore_container/food_trough/raptor_trough name = "raptor trough" desc = "The raptors will eat out of it!" - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/fluff/general.dmi' icon_state = "raptor_trough" x_offsets = list(-5, 5) y_offsets = list(-4, 5) diff --git a/code/modules/mob/living/basic/minebots/minebot_ai.dm b/code/modules/mob/living/basic/minebots/minebot_ai.dm index 31fed0ec1f3..ccba30e5e20 100644 --- a/code/modules/mob/living/basic/minebots/minebot_ai.dm +++ b/code/modules/mob/living/basic/minebots/minebot_ai.dm @@ -281,7 +281,7 @@ /datum/pet_command/automate_mining command_name = "Automate mining" command_desc = "Make your minebot automatically mine!" - radial_icon = 'icons/obj/mining.dmi' + radial_icon = 'icons/obj/mining_zones/equipment.dmi' radial_icon_state = "pickaxe" speech_commands = list("mine") callout_type = /datum/callout_option/mine diff --git a/code/modules/mob/living/basic/minebots/minebot_remote_control.dm b/code/modules/mob/living/basic/minebots/minebot_remote_control.dm index 36019409123..d2eed9912c3 100644 --- a/code/modules/mob/living/basic/minebots/minebot_remote_control.dm +++ b/code/modules/mob/living/basic/minebots/minebot_remote_control.dm @@ -2,7 +2,7 @@ /obj/item/minebot_remote_control name = "Remote Control" desc = "Requesting stratagem!" - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "minebot_bomb_control" item_flags = NOBLUDGEON ///are we currently primed to drop a bomb? 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 06fea35b105..85a0ec089be 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 @@ -239,7 +239,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/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "demonic_crystal" /obj/item/resurrection_crystal/attack_self(mob/living/user) diff --git a/code/modules/mod/mod_ai.dm b/code/modules/mod/mod_ai.dm index 4f855fa8bc9..bea297461c5 100644 --- a/code/modules/mod/mod_ai.dm +++ b/code/modules/mod/mod_ai.dm @@ -165,7 +165,7 @@ /obj/item/mod/ai_minicard name = "AI mini-card" desc = "A small card designed to eject dead AIs. You could use an intellicard to recover it." - icon = 'icons/obj/aicards.dmi' + icon = 'icons/obj/devices/aicards.dmi' icon_state = "minicard" var/datum/weakref/stored_ai diff --git a/code/modules/pai/card.dm b/code/modules/pai/card.dm index ccf0bae5f04..08f7dd5d22c 100644 --- a/code/modules/pai/card.dm +++ b/code/modules/pai/card.dm @@ -1,7 +1,7 @@ /obj/item/pai_card custom_premium_price = PAYCHECK_COMMAND * 1.25 desc = "Downloads personal AI assistants to accompany its owner or others." - icon = 'icons/obj/aicards.dmi' + icon = 'icons/obj/devices/aicards.dmi' icon_state = "pai" inhand_icon_state = "electronic" lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' @@ -237,7 +237,7 @@ request_spam = TRUE playsound(src, 'sound/machines/ping.ogg', 20, TRUE) balloon_alert(user, "pAI assistance requested") - var/mutable_appearance/alert_overlay = mutable_appearance('icons/obj/aicards.dmi', "pai") + var/mutable_appearance/alert_overlay = mutable_appearance('icons/obj/devices/aicards.dmi', "pai") notify_ghosts( "[user] is requesting a pAI companion! Use the pAI button to submit yourself as one.", diff --git a/code/modules/power/apc/apc_main.dm b/code/modules/power/apc/apc_main.dm index 6cefc840a67..0587feef921 100644 --- a/code/modules/power/apc/apc_main.dm +++ b/code/modules/power/apc/apc_main.dm @@ -18,7 +18,7 @@ name = "area power controller" desc = "A control terminal for the area's electrical systems." - icon = 'icons/obj/APC.dmi' + icon = 'icons/obj/machines/APC.dmi' icon_state = "frame" use_power = NO_POWER_USE req_access = null diff --git a/code/modules/power/floodlight.dm b/code/modules/power/floodlight.dm index f2d9a2c1a5f..dbf9be816b4 100644 --- a/code/modules/power/floodlight.dm +++ b/code/modules/power/floodlight.dm @@ -8,7 +8,7 @@ name = "floodlight frame" desc = "A metal frame that requires wiring and a light tube to become a flood light." max_integrity = 100 - icon = 'icons/obj/lighting.dmi' + icon = 'icons/obj/machines/lighting.dmi' icon_state = "floodlight_c1" density = TRUE @@ -130,7 +130,7 @@ SET_BASE_VISUAL_PIXEL(0, DEPTH_OFFSET) name = "floodlight" desc = "A pole with powerful mounted lights on it. Due to its high power draw, it must be powered by a direct connection to a wire node." - icon = 'icons/obj/lighting.dmi' + icon = 'icons/obj/machines/lighting.dmi' icon_state = "floodlight" density = TRUE max_integrity = 100 diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm index c1b0586ea4b..8620eba3a76 100644 --- a/code/modules/power/lighting/light.dm +++ b/code/modules/power/lighting/light.dm @@ -1,7 +1,7 @@ // the standard tube light fixture /obj/machinery/light name = "light fixture" - icon = 'icons/obj/lighting.dmi' + icon = 'icons/obj/machines/lighting.dmi' icon_state = "tube" desc = "A lighting fixture." layer = WALL_OBJ_LAYER @@ -14,7 +14,7 @@ light_angle = 170 light_flags = LIGHT_IGNORE_OFFSET ///What overlay the light should use - var/overlay_icon = 'icons/obj/lighting_overlay.dmi' + var/overlay_icon = 'icons/obj/machines/lighting.dmi' ///base description and icon_state var/base_state = "tube" ///Is the light on? @@ -180,12 +180,12 @@ if(!on || status != LIGHT_OK) return - . += emissive_appearance(overlay_icon, "[base_state]", src, alpha = src.alpha) + . += emissive_appearance(overlay_icon, "[base_state]_overlay", src, alpha = src.alpha) var/area/local_area = get_room_area() if(low_power_mode || major_emergency || (local_area?.fire)) - . += mutable_appearance(overlay_icon, "[base_state]_emergency") + . += mutable_appearance(overlay_icon, "[base_state]_overlay_emergency") return if(nightshift_enabled) . += mutable_appearance(overlay_icon, "[base_state]_nightshift") @@ -724,7 +724,7 @@ /obj/machinery/light/floor name = "floor light" desc = "A lightbulb you can walk on without breaking it, amazing." - icon = 'icons/obj/lighting.dmi' + icon = 'icons/obj/machines/lighting.dmi' base_state = "floor" // base description and icon_state icon_state = "floor" brightness = 4 diff --git a/code/modules/power/lighting/light_construct.dm b/code/modules/power/lighting/light_construct.dm index f71382f050c..abaaed36869 100644 --- a/code/modules/power/lighting/light_construct.dm +++ b/code/modules/power/lighting/light_construct.dm @@ -1,7 +1,7 @@ /obj/structure/light_construct name = "light fixture frame" desc = "A light fixture under construction." - icon = 'icons/obj/lighting.dmi' + icon = 'icons/obj/machines/lighting.dmi' icon_state = "tube-construct-stage1" anchored = TRUE layer = WALL_OBJ_LAYER diff --git a/code/modules/power/lighting/light_items.dm b/code/modules/power/lighting/light_items.dm index 5e9df6ee432..20c13656875 100644 --- a/code/modules/power/lighting/light_items.dm +++ b/code/modules/power/lighting/light_items.dm @@ -3,7 +3,7 @@ // will fit into empty /obj/machinery/light of the corresponding type /obj/item/light - icon = 'icons/obj/lighting.dmi' + icon = 'icons/obj/service/janitor.dmi' force = 2 throwforce = 5 w_class = WEIGHT_CLASS_TINY @@ -52,8 +52,8 @@ /obj/item/light/tube name = "light tube" desc = "A replacement light tube." - icon_state = "ltube" - base_state = "ltube" + icon_state = "tube" + base_state = "tube" inhand_icon_state = "ltube" brightness = 8 custom_price = PAYCHECK_CREW * 0.5 @@ -73,8 +73,8 @@ /obj/item/light/bulb name = "light bulb" desc = "A replacement light bulb." - icon_state = "lbulb" - base_state = "lbulb" + icon_state = "bulb" + base_state = "bulb" inhand_icon_state = "contvapour" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' diff --git a/code/modules/power/lighting/light_wallframes.dm b/code/modules/power/lighting/light_wallframes.dm index af650232cca..c0749ca5e89 100644 --- a/code/modules/power/lighting/light_wallframes.dm +++ b/code/modules/power/lighting/light_wallframes.dm @@ -1,7 +1,7 @@ /obj/item/wallframe/light_fixture name = "light fixture frame" desc = "Used for building lights." - icon = 'icons/obj/lighting.dmi' + icon = 'icons/obj/machines/lighting.dmi' icon_state = "tube-construct-item" result_path = /obj/structure/light_construct wall_external = TRUE diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 53cbe825085..5dc19e797bd 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -262,7 +262,7 @@ /obj/item/borg/upgrade/modkit name = "kinetic accelerator modification kit" desc = "An upgrade for kinetic accelerators." - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_zones/equipment.dmi' icon_state = "modkit" w_class = WEIGHT_CLASS_SMALL require_model = TRUE diff --git a/code/modules/projectiles/guns/energy/mounted.dm b/code/modules/projectiles/guns/energy/mounted.dm index 7e33567aa0e..9df536a13cb 100644 --- a/code/modules/projectiles/guns/energy/mounted.dm +++ b/code/modules/projectiles/guns/energy/mounted.dm @@ -1,7 +1,7 @@ /obj/item/gun/energy/e_gun/advtaser/mounted name = "mounted taser" desc = "An arm mounted dual-mode weapon that fires electrodes and disabler shots." - icon = 'icons/obj/items_cyborg.dmi' + icon = 'icons/mob/silicon/robot_items.dmi' icon_state = "taser" inhand_icon_state = "armcannonstun4" display_empty = FALSE @@ -15,7 +15,7 @@ /obj/item/gun/energy/laser/mounted name = "mounted laser" desc = "An arm mounted cannon that fires lethal lasers." - icon = 'icons/obj/items_cyborg.dmi' + icon = 'icons/mob/silicon/robot_items.dmi' icon_state = "laser_cyborg" inhand_icon_state = "armcannonlase" force = 5 diff --git a/code/modules/surgery/organs/internal/eyes/_eyes.dm b/code/modules/surgery/organs/internal/eyes/_eyes.dm index bffdf1ae44d..9c6b10d26d6 100644 --- a/code/modules/surgery/organs/internal/eyes/_eyes.dm +++ b/code/modules/surgery/organs/internal/eyes/_eyes.dm @@ -351,7 +351,7 @@ desc = "It's two flashlights rigged together with some wire. Why would you put these in someone's head?" eye_color_left ="fee5a3" eye_color_right ="fee5a3" - icon = 'icons/obj/lighting.dmi' + icon = 'icons/obj/devices/lighting.dmi' icon_state = "flashlight_eyes" flash_protect = FLASH_PROTECTION_WELDER tint = INFINITY diff --git a/code/modules/transport/elevator/elev_panel.dm b/code/modules/transport/elevator/elev_panel.dm index 0b5e99bdbb0..3cafa269fde 100644 --- a/code/modules/transport/elevator/elev_panel.dm +++ b/code/modules/transport/elevator/elev_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/wallmounts.dmi' + icon = 'icons/obj/structures/wallmounts.dmi' icon_state = "elevpanel0" base_icon_state = "elevpanel" diff --git a/code/modules/transport/tram/tram_controller.dm b/code/modules/transport/tram/tram_controller.dm index 754dc2465d6..39b6a60ce76 100644 --- a/code/modules/transport/tram/tram_controller.dm +++ b/code/modules/transport/tram/tram_controller.dm @@ -749,7 +749,7 @@ /obj/machinery/transport/tram_controller name = "tram controller" desc = "Makes the tram go, or something. Holds the tram's electronics, controls, and maintenance panel. A sticker above the card reader says 'Engineering access only.'" - icon = 'icons/obj/tram/tram_controllers.dmi' + icon = 'icons/obj/structures/tram/tram_controllers.dmi' icon_state = "tram-controller" base_icon_state = "tram" anchored = TRUE @@ -1188,7 +1188,7 @@ /obj/item/wallframe/tram/controller name = "tram controller cabinet" desc = "A box that contains the equipment to control a tram. Just secure to the tram wall." - icon = 'icons/obj/tram/tram_controllers.dmi' + icon = 'icons/obj/structures/tram/tram_controllers.dmi' icon_state = "tram-controller" custom_materials = list(/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 4, /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2) result_path = /obj/machinery/transport/tram_controller diff --git a/code/modules/transport/tram/tram_displays.dm b/code/modules/transport/tram/tram_displays.dm index 74d570ec602..dae821b6663 100644 --- a/code/modules/transport/tram/tram_displays.dm +++ b/code/modules/transport/tram/tram_displays.dm @@ -1,7 +1,7 @@ /obj/machinery/transport/destination_sign name = "destination sign" desc = "A display to show you what direction the tram is travelling." - icon = 'icons/obj/tram/tram_display.dmi' + icon = 'icons/obj/structures/tram/tram_display.dmi' icon_state = "desto_blank" base_icon_state = "desto" use_power = NO_POWER_USE @@ -24,7 +24,7 @@ pixel_x = 8 /obj/machinery/transport/destination_sign/indicator - icon = 'icons/obj/tram/tram_indicator.dmi' + icon = 'icons/obj/structures/tram/tram_indicator.dmi' icon_state = "indi_blank" base_icon_state = "indi" use_power = IDLE_POWER_USE @@ -38,7 +38,7 @@ name = "indicator display frame" desc = "Used to build tram indicator displays, just secure to the wall." icon_state = "indi_blank" - icon = 'icons/obj/tram/tram_indicator.dmi' + icon = 'icons/obj/structures/tram/tram_indicator.dmi' custom_materials = list(/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 4, /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2) result_path = /obj/machinery/transport/destination_sign/indicator diff --git a/code/modules/transport/tram/tram_power.dm b/code/modules/transport/tram/tram_power.dm index 45c48766db8..df8132ccb45 100644 --- a/code/modules/transport/tram/tram_power.dm +++ b/code/modules/transport/tram/tram_power.dm @@ -1,7 +1,7 @@ /obj/machinery/transport/power_rectifier name = "tram power rectifier" desc = "An electrical device that converts alternating current (AC) to direct current (DC) for powering the tram." - icon = 'icons/obj/tram/tram_controllers.dmi' + icon = 'icons/obj/structures/tram/tram_controllers.dmi' icon_state = "rectifier" idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION * 11.4 active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 114 diff --git a/code/modules/transport/tram/tram_signals.dm b/code/modules/transport/tram/tram_signals.dm index faf4a46e11e..a868620a80c 100644 --- a/code/modules/transport/tram/tram_signals.dm +++ b/code/modules/transport/tram/tram_signals.dm @@ -2,7 +2,7 @@ /obj/machinery/transport/crossing_signal name = "crossing signal" desc = "Indicates to pedestrians if it's safe to cross the tracks. Connects to sensors down the track." - icon = 'icons/obj/tram/crossing_signal.dmi' + icon = 'icons/obj/structures/tram/crossing_signal.dmi' icon_state = "crossing-inbound" base_icon_state = "crossing-inbound" layer = TRAM_SIGNAL_LAYER @@ -70,7 +70,7 @@ /obj/machinery/static_signal name = "crossing signal" desc = "Indicates to pedestrians if it's safe to cross the tracks." - icon = 'icons/obj/tram/crossing_signal.dmi' + icon = 'icons/obj/structures/tram/crossing_signal.dmi' icon_state = "crossing-inbound" layer = TRAM_SIGNAL_LAYER max_integrity = 250 @@ -469,7 +469,7 @@ /obj/machinery/transport/guideway_sensor name = "guideway sensor" - icon = 'icons/obj/tram/tram_sensor.dmi' + icon = 'icons/obj/structures/tram/tram_sensor.dmi' icon_state = "sensor-base" desc = "Uses an infrared beam to detect passing trams. Works when paired with a sensor on the other side of the track." layer = TRAM_RAIL_LAYER diff --git a/code/modules/transport/tram/tram_structures.dm b/code/modules/transport/tram/tram_structures.dm index 25996191cec..7a3962984e8 100644 --- a/code/modules/transport/tram/tram_structures.dm +++ b/code/modules/transport/tram/tram_structures.dm @@ -22,7 +22,7 @@ /obj/structure/tram name = "tram wall" desc = "A lightweight titanium composite structure with titanium silicate panels." - icon = 'icons/obj/tram/tram_structure.dmi' + icon = 'icons/obj/structures/tram/tram_structure.dmi' icon_state = "tram-part-0" base_icon_state = "tram-part" max_integrity = 150 @@ -109,7 +109,7 @@ if(ratio > 75) return - damage_overlay = mutable_appearance('icons/obj/structures.dmi', "damage[ratio]", -(layer + 0.1)) + damage_overlay = mutable_appearance('icons/turf/damaged.dmi', "damage[ratio]", -(layer + 0.1)) . += damage_overlay /obj/structure/tram/attack_hand(mob/living/user, list/modifiers) @@ -431,7 +431,7 @@ /obj/structure/tram/spoiler name = "tram spoiler" - icon = 'icons/obj/tram/tram_structure.dmi' + icon = 'icons/obj/structures/tram/tram_structure.dmi' desc = "Nanotrasen bought the luxury package under the impression titanium spoilers make the tram go faster. They're just for looks, or potentially stabbing anybody who gets in the way." icon_state = "tram-spoiler-retracted" max_integrity = 400 diff --git a/code/modules/transport/transport_module.dm b/code/modules/transport/transport_module.dm index af8f4199438..a985a1c9748 100644 --- a/code/modules/transport/transport_module.dm +++ b/code/modules/transport/transport_module.dm @@ -5,7 +5,7 @@ /obj/structure/transport/linear name = "linear transport module" desc = "A lightweight lift platform. It moves." - icon = 'icons/obj/smooth_structures/catwalk.dmi' + icon = 'icons/obj/structures/smooth/catwalk.dmi' icon_state = "catwalk-0" base_icon_state = "catwalk" density = FALSE @@ -854,7 +854,7 @@ /obj/structure/transport/linear/tram name = "tram subfloor" desc = "The subfloor lattice of the tram. You can build a tram wall frame by using titanium sheets, or place down thermoplastic tram floor tiles." - icon = 'icons/obj/tram/tram_structure.dmi' + icon = 'icons/obj/structures/tram/tram_structure.dmi' icon_state = "subfloor" base_icon_state = null density = FALSE diff --git a/icons/mob/rideables/vehicles.dmi b/icons/mob/rideables/vehicles.dmi index 08923668d26..4a88f9b8e85 100644 Binary files a/icons/mob/rideables/vehicles.dmi and b/icons/mob/rideables/vehicles.dmi differ diff --git a/icons/mob/silicon/robot_items.dmi b/icons/mob/silicon/robot_items.dmi index 2cb809fe272..0e93ff582d4 100644 Binary files a/icons/mob/silicon/robot_items.dmi and b/icons/mob/silicon/robot_items.dmi differ diff --git a/icons/obj/art/cardboard_cutout.dmi b/icons/obj/art/cardboard_cutout.dmi index 93df896126d..efe85e7cc48 100644 Binary files a/icons/obj/art/cardboard_cutout.dmi and b/icons/obj/art/cardboard_cutout.dmi differ diff --git a/icons/obj/canisters.dmi b/icons/obj/canisters.dmi index 1555cf0a478..e7d646c0a95 100644 Binary files a/icons/obj/canisters.dmi and b/icons/obj/canisters.dmi differ diff --git a/icons/obj/cosmetic.dmi b/icons/obj/cosmetic.dmi index e9f831fbc96..de42107ab19 100644 Binary files a/icons/obj/cosmetic.dmi and b/icons/obj/cosmetic.dmi differ diff --git a/icons/obj/aicards.dmi b/icons/obj/devices/aicards.dmi similarity index 100% rename from icons/obj/aicards.dmi rename to icons/obj/devices/aicards.dmi diff --git a/icons/obj/devices/lighting.dmi b/icons/obj/devices/lighting.dmi new file mode 100644 index 00000000000..6870b090246 Binary files /dev/null and b/icons/obj/devices/lighting.dmi differ diff --git a/icons/obj/fluff/general.dmi b/icons/obj/fluff/general.dmi index f99cbaabc9a..8be58d63069 100644 Binary files a/icons/obj/fluff/general.dmi and b/icons/obj/fluff/general.dmi differ diff --git a/icons/obj/fluff/gym_equipment.dmi b/icons/obj/fluff/gym_equipment.dmi index f9f6cdf4ca2..c28d4b8ff88 100644 Binary files a/icons/obj/fluff/gym_equipment.dmi and b/icons/obj/fluff/gym_equipment.dmi differ diff --git a/icons/obj/items_cyborg.dmi b/icons/obj/items_cyborg.dmi deleted file mode 100644 index 39624fce676..00000000000 Binary files a/icons/obj/items_cyborg.dmi and /dev/null differ diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi deleted file mode 100644 index a8d6020cb16..00000000000 Binary files a/icons/obj/lighting.dmi and /dev/null differ diff --git a/icons/obj/lighting_overlay.dmi b/icons/obj/lighting_overlay.dmi deleted file mode 100644 index c40b334f857..00000000000 Binary files a/icons/obj/lighting_overlay.dmi and /dev/null differ diff --git a/icons/obj/machine_tall.dmi b/icons/obj/machine_tall.dmi deleted file mode 100644 index 75ad190549d..00000000000 Binary files a/icons/obj/machine_tall.dmi and /dev/null differ diff --git a/icons/obj/APC.dmi b/icons/obj/machines/APC.dmi similarity index 100% rename from icons/obj/APC.dmi rename to icons/obj/machines/APC.dmi diff --git a/icons/obj/digital_clock.dmi b/icons/obj/machines/digital_clock.dmi similarity index 100% rename from icons/obj/digital_clock.dmi rename to icons/obj/machines/digital_clock.dmi diff --git a/icons/obj/machines/engine/reflector.dmi b/icons/obj/machines/engine/reflector.dmi new file mode 100644 index 00000000000..92a55783fb4 Binary files /dev/null and b/icons/obj/machines/engine/reflector.dmi differ diff --git a/icons/obj/flash.dmi b/icons/obj/machines/flash.dmi similarity index 100% rename from icons/obj/flash.dmi rename to icons/obj/machines/flash.dmi diff --git a/icons/obj/igniter.dmi b/icons/obj/machines/igniter.dmi similarity index 100% rename from icons/obj/igniter.dmi rename to icons/obj/machines/igniter.dmi diff --git a/icons/obj/machines/lighting.dmi b/icons/obj/machines/lighting.dmi new file mode 100644 index 00000000000..94496bc15d1 Binary files /dev/null and b/icons/obj/machines/lighting.dmi differ diff --git a/icons/obj/maintenance_loot.dmi b/icons/obj/maintenance_loot.dmi index c75cb583c19..400e24419f2 100644 Binary files a/icons/obj/maintenance_loot.dmi and b/icons/obj/maintenance_loot.dmi differ diff --git a/icons/obj/mining_zones/artefacts.dmi b/icons/obj/mining_zones/artefacts.dmi index 968bbe5b621..c515bd0ea51 100644 Binary files a/icons/obj/mining_zones/artefacts.dmi and b/icons/obj/mining_zones/artefacts.dmi differ diff --git a/icons/obj/mining.dmi b/icons/obj/mining_zones/equipment.dmi similarity index 100% rename from icons/obj/mining.dmi rename to icons/obj/mining_zones/equipment.dmi diff --git a/icons/obj/fulton.dmi b/icons/obj/mining_zones/fulton.dmi similarity index 100% rename from icons/obj/fulton.dmi rename to icons/obj/mining_zones/fulton.dmi diff --git a/icons/obj/ore.dmi b/icons/obj/mining_zones/ore.dmi similarity index 100% rename from icons/obj/ore.dmi rename to icons/obj/mining_zones/ore.dmi diff --git a/icons/obj/mining_zones/terrain.dmi b/icons/obj/mining_zones/terrain.dmi index fd930fe709d..c7daf12ed30 100644 Binary files a/icons/obj/mining_zones/terrain.dmi and b/icons/obj/mining_zones/terrain.dmi differ diff --git a/icons/obj/noticeboard.dmi b/icons/obj/noticeboard.dmi deleted file mode 100644 index 24a2f233f52..00000000000 Binary files a/icons/obj/noticeboard.dmi and /dev/null differ diff --git a/icons/obj/railings.dmi b/icons/obj/railings.dmi deleted file mode 100644 index 49b560d2c87..00000000000 Binary files a/icons/obj/railings.dmi and /dev/null differ diff --git a/icons/obj/science/slimecrossing.dmi b/icons/obj/science/slimecrossing.dmi index 5edb59c58a4..3699c5b7c3d 100644 Binary files a/icons/obj/science/slimecrossing.dmi and b/icons/obj/science/slimecrossing.dmi differ diff --git a/icons/obj/service/bureaucracy.dmi b/icons/obj/service/bureaucracy.dmi index 5142a940ba5..166e50addd7 100644 Binary files a/icons/obj/service/bureaucracy.dmi and b/icons/obj/service/bureaucracy.dmi differ diff --git a/icons/obj/service/hydroponics/equipment.dmi b/icons/obj/service/hydroponics/equipment.dmi index be9d9d4eeaf..2f9ef196f4c 100644 Binary files a/icons/obj/service/hydroponics/equipment.dmi and b/icons/obj/service/hydroponics/equipment.dmi differ diff --git a/icons/obj/service/janitor.dmi b/icons/obj/service/janitor.dmi index 0e301808323..a8f4d4a1aa2 100644 Binary files a/icons/obj/service/janitor.dmi and b/icons/obj/service/janitor.dmi differ diff --git a/icons/obj/pet_carrier.dmi b/icons/obj/storage/pet_carrier.dmi similarity index 100% rename from icons/obj/pet_carrier.dmi rename to icons/obj/storage/pet_carrier.dmi diff --git a/icons/obj/storage/storage.dmi b/icons/obj/storage/storage.dmi index d921840ee64..0d31f8163e5 100644 Binary files a/icons/obj/storage/storage.dmi and b/icons/obj/storage/storage.dmi differ diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi deleted file mode 100644 index 46a225c6d38..00000000000 Binary files a/icons/obj/structures.dmi and /dev/null differ diff --git a/icons/obj/aquarium/fish.dmi b/icons/obj/structures/aquarium/fish.dmi similarity index 100% rename from icons/obj/aquarium/fish.dmi rename to icons/obj/structures/aquarium/fish.dmi diff --git a/icons/obj/aquarium/supplies.dmi b/icons/obj/structures/aquarium/supplies.dmi similarity index 100% rename from icons/obj/aquarium/supplies.dmi rename to icons/obj/structures/aquarium/supplies.dmi diff --git a/icons/obj/aquarium/tanks.dmi b/icons/obj/structures/aquarium/tanks.dmi similarity index 100% rename from icons/obj/aquarium/tanks.dmi rename to icons/obj/structures/aquarium/tanks.dmi diff --git a/icons/obj/aquarium/wide.dmi b/icons/obj/structures/aquarium/wide.dmi similarity index 100% rename from icons/obj/aquarium/wide.dmi rename to icons/obj/structures/aquarium/wide.dmi diff --git a/icons/obj/bed.dmi b/icons/obj/structures/bed.dmi similarity index 100% rename from icons/obj/bed.dmi rename to icons/obj/structures/bed.dmi diff --git a/icons/obj/extinguisher.dmi b/icons/obj/structures/cabinet.dmi similarity index 100% rename from icons/obj/extinguisher.dmi rename to icons/obj/structures/cabinet.dmi diff --git a/icons/obj/chairs.dmi b/icons/obj/structures/chairs.dmi similarity index 100% rename from icons/obj/chairs.dmi rename to icons/obj/structures/chairs.dmi diff --git a/icons/obj/chairs_wide.dmi b/icons/obj/structures/chairs_wide.dmi similarity index 100% rename from icons/obj/chairs_wide.dmi rename to icons/obj/structures/chairs_wide.dmi diff --git a/icons/obj/departmental_signs.dmi b/icons/obj/structures/departmental_signs.dmi similarity index 100% rename from icons/obj/departmental_signs.dmi rename to icons/obj/structures/departmental_signs.dmi diff --git a/icons/obj/directional_signs.dmi b/icons/obj/structures/directional_signs.dmi similarity index 100% rename from icons/obj/directional_signs.dmi rename to icons/obj/structures/directional_signs.dmi diff --git a/icons/obj/fence.dmi b/icons/obj/structures/fence.dmi similarity index 100% rename from icons/obj/fence.dmi rename to icons/obj/structures/fence.dmi diff --git a/icons/obj/guillotine.dmi b/icons/obj/structures/guillotine.dmi similarity index 100% rename from icons/obj/guillotine.dmi rename to icons/obj/structures/guillotine.dmi diff --git a/icons/obj/structures/railings.dmi b/icons/obj/structures/railings.dmi new file mode 100644 index 00000000000..171ee42964f Binary files /dev/null and b/icons/obj/structures/railings.dmi differ diff --git a/icons/obj/smooth_structures/alien/nest.dmi b/icons/obj/structures/smooth/alien/nest.dmi similarity index 100% rename from icons/obj/smooth_structures/alien/nest.dmi rename to icons/obj/structures/smooth/alien/nest.dmi diff --git a/icons/obj/smooth_structures/alien/nest.png b/icons/obj/structures/smooth/alien/nest.png similarity index 100% rename from icons/obj/smooth_structures/alien/nest.png rename to icons/obj/structures/smooth/alien/nest.png diff --git a/icons/obj/smooth_structures/alien/nest.png.toml b/icons/obj/structures/smooth/alien/nest.png.toml similarity index 100% rename from icons/obj/smooth_structures/alien/nest.png.toml rename to icons/obj/structures/smooth/alien/nest.png.toml diff --git a/icons/obj/smooth_structures/alien/resin_membrane.dmi b/icons/obj/structures/smooth/alien/resin_membrane.dmi similarity index 100% rename from icons/obj/smooth_structures/alien/resin_membrane.dmi rename to icons/obj/structures/smooth/alien/resin_membrane.dmi diff --git a/icons/obj/smooth_structures/alien/resin_membrane.png b/icons/obj/structures/smooth/alien/resin_membrane.png similarity index 100% rename from icons/obj/smooth_structures/alien/resin_membrane.png rename to icons/obj/structures/smooth/alien/resin_membrane.png diff --git a/icons/obj/smooth_structures/alien/resin_membrane.png.toml b/icons/obj/structures/smooth/alien/resin_membrane.png.toml similarity index 100% rename from icons/obj/smooth_structures/alien/resin_membrane.png.toml rename to icons/obj/structures/smooth/alien/resin_membrane.png.toml diff --git a/icons/obj/smooth_structures/alien/resin_wall_1.dmi b/icons/obj/structures/smooth/alien/resin_wall_1.dmi similarity index 100% rename from icons/obj/smooth_structures/alien/resin_wall_1.dmi rename to icons/obj/structures/smooth/alien/resin_wall_1.dmi diff --git a/icons/obj/smooth_structures/alien/resin_wall_1.png b/icons/obj/structures/smooth/alien/resin_wall_1.png similarity index 100% rename from icons/obj/smooth_structures/alien/resin_wall_1.png rename to icons/obj/structures/smooth/alien/resin_wall_1.png diff --git a/icons/obj/smooth_structures/alien/resin_wall_1.png.toml b/icons/obj/structures/smooth/alien/resin_wall_1.png.toml similarity index 100% rename from icons/obj/smooth_structures/alien/resin_wall_1.png.toml rename to icons/obj/structures/smooth/alien/resin_wall_1.png.toml diff --git a/icons/obj/smooth_structures/alien/resin_wall_2.dmi b/icons/obj/structures/smooth/alien/resin_wall_2.dmi similarity index 100% rename from icons/obj/smooth_structures/alien/resin_wall_2.dmi rename to icons/obj/structures/smooth/alien/resin_wall_2.dmi diff --git a/icons/obj/smooth_structures/alien/resin_wall_2.png b/icons/obj/structures/smooth/alien/resin_wall_2.png similarity index 100% rename from icons/obj/smooth_structures/alien/resin_wall_2.png rename to icons/obj/structures/smooth/alien/resin_wall_2.png diff --git a/icons/obj/smooth_structures/alien/resin_wall_2.png.toml b/icons/obj/structures/smooth/alien/resin_wall_2.png.toml similarity index 100% rename from icons/obj/smooth_structures/alien/resin_wall_2.png.toml rename to icons/obj/structures/smooth/alien/resin_wall_2.png.toml diff --git a/icons/obj/smooth_structures/alien/weednode.dmi b/icons/obj/structures/smooth/alien/weednode.dmi similarity index 100% rename from icons/obj/smooth_structures/alien/weednode.dmi rename to icons/obj/structures/smooth/alien/weednode.dmi diff --git a/icons/obj/smooth_structures/alien/weednode.png b/icons/obj/structures/smooth/alien/weednode.png similarity index 100% rename from icons/obj/smooth_structures/alien/weednode.png rename to icons/obj/structures/smooth/alien/weednode.png diff --git a/icons/obj/smooth_structures/alien/weednode.png.toml b/icons/obj/structures/smooth/alien/weednode.png.toml similarity index 100% rename from icons/obj/smooth_structures/alien/weednode.png.toml rename to icons/obj/structures/smooth/alien/weednode.png.toml diff --git a/icons/obj/smooth_structures/alien/weeds1.dmi b/icons/obj/structures/smooth/alien/weeds1.dmi similarity index 100% rename from icons/obj/smooth_structures/alien/weeds1.dmi rename to icons/obj/structures/smooth/alien/weeds1.dmi diff --git a/icons/obj/smooth_structures/alien/weeds1.png b/icons/obj/structures/smooth/alien/weeds1.png similarity index 100% rename from icons/obj/smooth_structures/alien/weeds1.png rename to icons/obj/structures/smooth/alien/weeds1.png diff --git a/icons/obj/smooth_structures/alien/weeds1.png.toml b/icons/obj/structures/smooth/alien/weeds1.png.toml similarity index 100% rename from icons/obj/smooth_structures/alien/weeds1.png.toml rename to icons/obj/structures/smooth/alien/weeds1.png.toml diff --git a/icons/obj/smooth_structures/alien/weeds2.dmi b/icons/obj/structures/smooth/alien/weeds2.dmi similarity index 100% rename from icons/obj/smooth_structures/alien/weeds2.dmi rename to icons/obj/structures/smooth/alien/weeds2.dmi diff --git a/icons/obj/smooth_structures/alien/weeds2.png b/icons/obj/structures/smooth/alien/weeds2.png similarity index 100% rename from icons/obj/smooth_structures/alien/weeds2.png rename to icons/obj/structures/smooth/alien/weeds2.png diff --git a/icons/obj/smooth_structures/alien/weeds2.png.toml b/icons/obj/structures/smooth/alien/weeds2.png.toml similarity index 100% rename from icons/obj/smooth_structures/alien/weeds2.png.toml rename to icons/obj/structures/smooth/alien/weeds2.png.toml diff --git a/icons/obj/smooth_structures/alien/weeds3.dmi b/icons/obj/structures/smooth/alien/weeds3.dmi similarity index 100% rename from icons/obj/smooth_structures/alien/weeds3.dmi rename to icons/obj/structures/smooth/alien/weeds3.dmi diff --git a/icons/obj/smooth_structures/alien/weeds3.png b/icons/obj/structures/smooth/alien/weeds3.png similarity index 100% rename from icons/obj/smooth_structures/alien/weeds3.png rename to icons/obj/structures/smooth/alien/weeds3.png diff --git a/icons/obj/smooth_structures/alien/weeds3.png.toml b/icons/obj/structures/smooth/alien/weeds3.png.toml similarity index 100% rename from icons/obj/smooth_structures/alien/weeds3.png.toml rename to icons/obj/structures/smooth/alien/weeds3.png.toml diff --git a/icons/obj/smooth_structures/alien_table.dmi b/icons/obj/structures/smooth/alien_table.dmi similarity index 100% rename from icons/obj/smooth_structures/alien_table.dmi rename to icons/obj/structures/smooth/alien_table.dmi diff --git a/icons/obj/smooth_structures/alien_table.png b/icons/obj/structures/smooth/alien_table.png similarity index 100% rename from icons/obj/smooth_structures/alien_table.png rename to icons/obj/structures/smooth/alien_table.png diff --git a/icons/obj/smooth_structures/alien_table.png.toml b/icons/obj/structures/smooth/alien_table.png.toml similarity index 100% rename from icons/obj/smooth_structures/alien_table.png.toml rename to icons/obj/structures/smooth/alien_table.png.toml diff --git a/icons/obj/smooth_structures/brass_table.dmi b/icons/obj/structures/smooth/brass_table.dmi similarity index 100% rename from icons/obj/smooth_structures/brass_table.dmi rename to icons/obj/structures/smooth/brass_table.dmi diff --git a/icons/obj/smooth_structures/brass_table.png b/icons/obj/structures/smooth/brass_table.png similarity index 100% rename from icons/obj/smooth_structures/brass_table.png rename to icons/obj/structures/smooth/brass_table.png diff --git a/icons/obj/smooth_structures/brass_table.png.toml b/icons/obj/structures/smooth/brass_table.png.toml similarity index 100% rename from icons/obj/smooth_structures/brass_table.png.toml rename to icons/obj/structures/smooth/brass_table.png.toml diff --git a/icons/obj/smooth_structures/catwalk.dmi b/icons/obj/structures/smooth/catwalk.dmi similarity index 100% rename from icons/obj/smooth_structures/catwalk.dmi rename to icons/obj/structures/smooth/catwalk.dmi diff --git a/icons/obj/smooth_structures/catwalk.png b/icons/obj/structures/smooth/catwalk.png similarity index 100% rename from icons/obj/smooth_structures/catwalk.png rename to icons/obj/structures/smooth/catwalk.png diff --git a/icons/obj/smooth_structures/catwalk.png.toml b/icons/obj/structures/smooth/catwalk.png.toml similarity index 100% rename from icons/obj/smooth_structures/catwalk.png.toml rename to icons/obj/structures/smooth/catwalk.png.toml diff --git a/icons/obj/smooth_structures/clockwork_window.dmi b/icons/obj/structures/smooth/clockwork_window.dmi similarity index 100% rename from icons/obj/smooth_structures/clockwork_window.dmi rename to icons/obj/structures/smooth/clockwork_window.dmi diff --git a/icons/obj/smooth_structures/clockwork_window.png b/icons/obj/structures/smooth/clockwork_window.png similarity index 100% rename from icons/obj/smooth_structures/clockwork_window.png rename to icons/obj/structures/smooth/clockwork_window.png diff --git a/icons/obj/smooth_structures/clockwork_window.png.toml b/icons/obj/structures/smooth/clockwork_window.png.toml similarity index 100% rename from icons/obj/smooth_structures/clockwork_window.png.toml rename to icons/obj/structures/smooth/clockwork_window.png.toml diff --git a/icons/obj/smooth_structures/fancy_table.dmi b/icons/obj/structures/smooth/fancy_table.dmi similarity index 100% rename from icons/obj/smooth_structures/fancy_table.dmi rename to icons/obj/structures/smooth/fancy_table.dmi diff --git a/icons/obj/smooth_structures/fancy_table.png b/icons/obj/structures/smooth/fancy_table.png similarity index 100% rename from icons/obj/smooth_structures/fancy_table.png rename to icons/obj/structures/smooth/fancy_table.png diff --git a/icons/obj/smooth_structures/fancy_table.png.toml b/icons/obj/structures/smooth/fancy_table.png.toml similarity index 100% rename from icons/obj/smooth_structures/fancy_table.png.toml rename to icons/obj/structures/smooth/fancy_table.png.toml diff --git a/icons/obj/smooth_structures/fancy_table_black.dmi b/icons/obj/structures/smooth/fancy_table_black.dmi similarity index 100% rename from icons/obj/smooth_structures/fancy_table_black.dmi rename to icons/obj/structures/smooth/fancy_table_black.dmi diff --git a/icons/obj/smooth_structures/fancy_table_black.png b/icons/obj/structures/smooth/fancy_table_black.png similarity index 100% rename from icons/obj/smooth_structures/fancy_table_black.png rename to icons/obj/structures/smooth/fancy_table_black.png diff --git a/icons/obj/smooth_structures/fancy_table_black.png.toml b/icons/obj/structures/smooth/fancy_table_black.png.toml similarity index 100% rename from icons/obj/smooth_structures/fancy_table_black.png.toml rename to icons/obj/structures/smooth/fancy_table_black.png.toml diff --git a/icons/obj/smooth_structures/fancy_table_blue.dmi b/icons/obj/structures/smooth/fancy_table_blue.dmi similarity index 100% rename from icons/obj/smooth_structures/fancy_table_blue.dmi rename to icons/obj/structures/smooth/fancy_table_blue.dmi diff --git a/icons/obj/smooth_structures/fancy_table_blue.png b/icons/obj/structures/smooth/fancy_table_blue.png similarity index 100% rename from icons/obj/smooth_structures/fancy_table_blue.png rename to icons/obj/structures/smooth/fancy_table_blue.png diff --git a/icons/obj/smooth_structures/fancy_table_blue.png.toml b/icons/obj/structures/smooth/fancy_table_blue.png.toml similarity index 100% rename from icons/obj/smooth_structures/fancy_table_blue.png.toml rename to icons/obj/structures/smooth/fancy_table_blue.png.toml diff --git a/icons/obj/smooth_structures/fancy_table_cyan.dmi b/icons/obj/structures/smooth/fancy_table_cyan.dmi similarity index 100% rename from icons/obj/smooth_structures/fancy_table_cyan.dmi rename to icons/obj/structures/smooth/fancy_table_cyan.dmi diff --git a/icons/obj/smooth_structures/fancy_table_cyan.png b/icons/obj/structures/smooth/fancy_table_cyan.png similarity index 100% rename from icons/obj/smooth_structures/fancy_table_cyan.png rename to icons/obj/structures/smooth/fancy_table_cyan.png diff --git a/icons/obj/smooth_structures/fancy_table_cyan.png.toml b/icons/obj/structures/smooth/fancy_table_cyan.png.toml similarity index 100% rename from icons/obj/smooth_structures/fancy_table_cyan.png.toml rename to icons/obj/structures/smooth/fancy_table_cyan.png.toml diff --git a/icons/obj/smooth_structures/fancy_table_green.dmi b/icons/obj/structures/smooth/fancy_table_green.dmi similarity index 100% rename from icons/obj/smooth_structures/fancy_table_green.dmi rename to icons/obj/structures/smooth/fancy_table_green.dmi diff --git a/icons/obj/smooth_structures/fancy_table_green.png b/icons/obj/structures/smooth/fancy_table_green.png similarity index 100% rename from icons/obj/smooth_structures/fancy_table_green.png rename to icons/obj/structures/smooth/fancy_table_green.png diff --git a/icons/obj/smooth_structures/fancy_table_green.png.toml b/icons/obj/structures/smooth/fancy_table_green.png.toml similarity index 100% rename from icons/obj/smooth_structures/fancy_table_green.png.toml rename to icons/obj/structures/smooth/fancy_table_green.png.toml diff --git a/icons/obj/smooth_structures/fancy_table_orange.dmi b/icons/obj/structures/smooth/fancy_table_orange.dmi similarity index 100% rename from icons/obj/smooth_structures/fancy_table_orange.dmi rename to icons/obj/structures/smooth/fancy_table_orange.dmi diff --git a/icons/obj/smooth_structures/fancy_table_orange.png b/icons/obj/structures/smooth/fancy_table_orange.png similarity index 100% rename from icons/obj/smooth_structures/fancy_table_orange.png rename to icons/obj/structures/smooth/fancy_table_orange.png diff --git a/icons/obj/smooth_structures/fancy_table_orange.png.toml b/icons/obj/structures/smooth/fancy_table_orange.png.toml similarity index 100% rename from icons/obj/smooth_structures/fancy_table_orange.png.toml rename to icons/obj/structures/smooth/fancy_table_orange.png.toml diff --git a/icons/obj/smooth_structures/fancy_table_purple.dmi b/icons/obj/structures/smooth/fancy_table_purple.dmi similarity index 100% rename from icons/obj/smooth_structures/fancy_table_purple.dmi rename to icons/obj/structures/smooth/fancy_table_purple.dmi diff --git a/icons/obj/smooth_structures/fancy_table_purple.png b/icons/obj/structures/smooth/fancy_table_purple.png similarity index 100% rename from icons/obj/smooth_structures/fancy_table_purple.png rename to icons/obj/structures/smooth/fancy_table_purple.png diff --git a/icons/obj/smooth_structures/fancy_table_purple.png.toml b/icons/obj/structures/smooth/fancy_table_purple.png.toml similarity index 100% rename from icons/obj/smooth_structures/fancy_table_purple.png.toml rename to icons/obj/structures/smooth/fancy_table_purple.png.toml diff --git a/icons/obj/smooth_structures/fancy_table_red.dmi b/icons/obj/structures/smooth/fancy_table_red.dmi similarity index 100% rename from icons/obj/smooth_structures/fancy_table_red.dmi rename to icons/obj/structures/smooth/fancy_table_red.dmi diff --git a/icons/obj/smooth_structures/fancy_table_red.png b/icons/obj/structures/smooth/fancy_table_red.png similarity index 100% rename from icons/obj/smooth_structures/fancy_table_red.png rename to icons/obj/structures/smooth/fancy_table_red.png diff --git a/icons/obj/smooth_structures/fancy_table_red.png.toml b/icons/obj/structures/smooth/fancy_table_red.png.toml similarity index 100% rename from icons/obj/smooth_structures/fancy_table_red.png.toml rename to icons/obj/structures/smooth/fancy_table_red.png.toml diff --git a/icons/obj/smooth_structures/fancy_table_royalblack.dmi b/icons/obj/structures/smooth/fancy_table_royalblack.dmi similarity index 100% rename from icons/obj/smooth_structures/fancy_table_royalblack.dmi rename to icons/obj/structures/smooth/fancy_table_royalblack.dmi diff --git a/icons/obj/smooth_structures/fancy_table_royalblack.png b/icons/obj/structures/smooth/fancy_table_royalblack.png similarity index 100% rename from icons/obj/smooth_structures/fancy_table_royalblack.png rename to icons/obj/structures/smooth/fancy_table_royalblack.png diff --git a/icons/obj/smooth_structures/fancy_table_royalblack.png.toml b/icons/obj/structures/smooth/fancy_table_royalblack.png.toml similarity index 100% rename from icons/obj/smooth_structures/fancy_table_royalblack.png.toml rename to icons/obj/structures/smooth/fancy_table_royalblack.png.toml diff --git a/icons/obj/smooth_structures/fancy_table_royalblue.dmi b/icons/obj/structures/smooth/fancy_table_royalblue.dmi similarity index 100% rename from icons/obj/smooth_structures/fancy_table_royalblue.dmi rename to icons/obj/structures/smooth/fancy_table_royalblue.dmi diff --git a/icons/obj/smooth_structures/fancy_table_royalblue.png b/icons/obj/structures/smooth/fancy_table_royalblue.png similarity index 100% rename from icons/obj/smooth_structures/fancy_table_royalblue.png rename to icons/obj/structures/smooth/fancy_table_royalblue.png diff --git a/icons/obj/smooth_structures/fancy_table_royalblue.png.toml b/icons/obj/structures/smooth/fancy_table_royalblue.png.toml similarity index 100% rename from icons/obj/smooth_structures/fancy_table_royalblue.png.toml rename to icons/obj/structures/smooth/fancy_table_royalblue.png.toml diff --git a/icons/obj/smooth_structures/glass_table.dmi b/icons/obj/structures/smooth/glass_table.dmi similarity index 100% rename from icons/obj/smooth_structures/glass_table.dmi rename to icons/obj/structures/smooth/glass_table.dmi diff --git a/icons/obj/smooth_structures/glass_table.png b/icons/obj/structures/smooth/glass_table.png similarity index 100% rename from icons/obj/smooth_structures/glass_table.png rename to icons/obj/structures/smooth/glass_table.png diff --git a/icons/obj/smooth_structures/glass_table.png.toml b/icons/obj/structures/smooth/glass_table.png.toml similarity index 100% rename from icons/obj/smooth_structures/glass_table.png.toml rename to icons/obj/structures/smooth/glass_table.png.toml diff --git a/icons/obj/smooth_structures/grille.dmi b/icons/obj/structures/smooth/grille.dmi similarity index 100% rename from icons/obj/smooth_structures/grille.dmi rename to icons/obj/structures/smooth/grille.dmi diff --git a/icons/obj/smooth_structures/grille.png b/icons/obj/structures/smooth/grille.png similarity index 100% rename from icons/obj/smooth_structures/grille.png rename to icons/obj/structures/smooth/grille.png diff --git a/icons/obj/smooth_structures/grille.png.toml b/icons/obj/structures/smooth/grille.png.toml similarity index 100% rename from icons/obj/smooth_structures/grille.png.toml rename to icons/obj/structures/smooth/grille.png.toml diff --git a/icons/obj/smooth_structures/grille_damaged.dmi b/icons/obj/structures/smooth/grille_damaged.dmi similarity index 100% rename from icons/obj/smooth_structures/grille_damaged.dmi rename to icons/obj/structures/smooth/grille_damaged.dmi diff --git a/icons/obj/smooth_structures/grille_damaged.png b/icons/obj/structures/smooth/grille_damaged.png similarity index 100% rename from icons/obj/smooth_structures/grille_damaged.png rename to icons/obj/structures/smooth/grille_damaged.png diff --git a/icons/obj/smooth_structures/grille_damaged.png.toml b/icons/obj/structures/smooth/grille_damaged.png.toml similarity index 100% rename from icons/obj/smooth_structures/grille_damaged.png.toml rename to icons/obj/structures/smooth/grille_damaged.png.toml diff --git a/icons/obj/smooth_structures/hedge.dmi b/icons/obj/structures/smooth/hedge.dmi similarity index 100% rename from icons/obj/smooth_structures/hedge.dmi rename to icons/obj/structures/smooth/hedge.dmi diff --git a/icons/obj/smooth_structures/hedge.png b/icons/obj/structures/smooth/hedge.png similarity index 100% rename from icons/obj/smooth_structures/hedge.png rename to icons/obj/structures/smooth/hedge.png diff --git a/icons/obj/smooth_structures/hedge.png.toml b/icons/obj/structures/smooth/hedge.png.toml similarity index 100% rename from icons/obj/smooth_structures/hedge.png.toml rename to icons/obj/structures/smooth/hedge.png.toml diff --git a/icons/obj/smooth_structures/lattice.dmi b/icons/obj/structures/smooth/lattice.dmi similarity index 100% rename from icons/obj/smooth_structures/lattice.dmi rename to icons/obj/structures/smooth/lattice.dmi diff --git a/icons/obj/smooth_structures/lattice.png b/icons/obj/structures/smooth/lattice.png similarity index 100% rename from icons/obj/smooth_structures/lattice.png rename to icons/obj/structures/smooth/lattice.png diff --git a/icons/obj/smooth_structures/lattice.png.toml b/icons/obj/structures/smooth/lattice.png.toml similarity index 100% rename from icons/obj/smooth_structures/lattice.png.toml rename to icons/obj/structures/smooth/lattice.png.toml diff --git a/icons/obj/smooth_structures/paperframes.dmi b/icons/obj/structures/smooth/paperframes.dmi similarity index 100% rename from icons/obj/smooth_structures/paperframes.dmi rename to icons/obj/structures/smooth/paperframes.dmi diff --git a/icons/obj/smooth_structures/paperframes.png b/icons/obj/structures/smooth/paperframes.png similarity index 100% rename from icons/obj/smooth_structures/paperframes.png rename to icons/obj/structures/smooth/paperframes.png diff --git a/icons/obj/smooth_structures/paperframes.png.toml b/icons/obj/structures/smooth/paperframes.png.toml similarity index 100% rename from icons/obj/smooth_structures/paperframes.png.toml rename to icons/obj/structures/smooth/paperframes.png.toml diff --git a/icons/obj/smooth_structures/plasma_window.dmi b/icons/obj/structures/smooth/plasma_window.dmi similarity index 100% rename from icons/obj/smooth_structures/plasma_window.dmi rename to icons/obj/structures/smooth/plasma_window.dmi diff --git a/icons/obj/smooth_structures/plasma_window.png b/icons/obj/structures/smooth/plasma_window.png similarity index 100% rename from icons/obj/smooth_structures/plasma_window.png rename to icons/obj/structures/smooth/plasma_window.png diff --git a/icons/obj/smooth_structures/plasma_window.png.toml b/icons/obj/structures/smooth/plasma_window.png.toml similarity index 100% rename from icons/obj/smooth_structures/plasma_window.png.toml rename to icons/obj/structures/smooth/plasma_window.png.toml diff --git a/icons/obj/smooth_structures/plasmaglass_table.dmi b/icons/obj/structures/smooth/plasmaglass_table.dmi similarity index 100% rename from icons/obj/smooth_structures/plasmaglass_table.dmi rename to icons/obj/structures/smooth/plasmaglass_table.dmi diff --git a/icons/obj/smooth_structures/plasmaglass_table.png b/icons/obj/structures/smooth/plasmaglass_table.png similarity index 100% rename from icons/obj/smooth_structures/plasmaglass_table.png rename to icons/obj/structures/smooth/plasmaglass_table.png diff --git a/icons/obj/smooth_structures/plasmaglass_table.png.toml b/icons/obj/structures/smooth/plasmaglass_table.png.toml similarity index 100% rename from icons/obj/smooth_structures/plasmaglass_table.png.toml rename to icons/obj/structures/smooth/plasmaglass_table.png.toml diff --git a/icons/obj/smooth_structures/plastitanium_window.dmi b/icons/obj/structures/smooth/plastitanium_window.dmi similarity index 100% rename from icons/obj/smooth_structures/plastitanium_window.dmi rename to icons/obj/structures/smooth/plastitanium_window.dmi diff --git a/icons/obj/smooth_structures/plastitanium_window.png b/icons/obj/structures/smooth/plastitanium_window.png similarity index 100% rename from icons/obj/smooth_structures/plastitanium_window.png rename to icons/obj/structures/smooth/plastitanium_window.png diff --git a/icons/obj/smooth_structures/plastitanium_window.png.toml b/icons/obj/structures/smooth/plastitanium_window.png.toml similarity index 100% rename from icons/obj/smooth_structures/plastitanium_window.png.toml rename to icons/obj/structures/smooth/plastitanium_window.png.toml diff --git a/icons/obj/smooth_structures/plastitaniumglass_table.dmi b/icons/obj/structures/smooth/plastitaniumglass_table.dmi similarity index 100% rename from icons/obj/smooth_structures/plastitaniumglass_table.dmi rename to icons/obj/structures/smooth/plastitaniumglass_table.dmi diff --git a/icons/obj/smooth_structures/plastitaniumglass_table.png b/icons/obj/structures/smooth/plastitaniumglass_table.png similarity index 100% rename from icons/obj/smooth_structures/plastitaniumglass_table.png rename to icons/obj/structures/smooth/plastitaniumglass_table.png diff --git a/icons/obj/smooth_structures/plastitaniumglass_table.png.toml b/icons/obj/structures/smooth/plastitaniumglass_table.png.toml similarity index 100% rename from icons/obj/smooth_structures/plastitaniumglass_table.png.toml rename to icons/obj/structures/smooth/plastitaniumglass_table.png.toml diff --git a/icons/obj/smooth_structures/pod_window.dmi b/icons/obj/structures/smooth/pod_window.dmi similarity index 100% rename from icons/obj/smooth_structures/pod_window.dmi rename to icons/obj/structures/smooth/pod_window.dmi diff --git a/icons/obj/smooth_structures/pod_window.png b/icons/obj/structures/smooth/pod_window.png similarity index 100% rename from icons/obj/smooth_structures/pod_window.png rename to icons/obj/structures/smooth/pod_window.png diff --git a/icons/obj/smooth_structures/pod_window.png.toml b/icons/obj/structures/smooth/pod_window.png.toml similarity index 100% rename from icons/obj/smooth_structures/pod_window.png.toml rename to icons/obj/structures/smooth/pod_window.png.toml diff --git a/icons/obj/smooth_structures/poker_table.dmi b/icons/obj/structures/smooth/poker_table.dmi similarity index 100% rename from icons/obj/smooth_structures/poker_table.dmi rename to icons/obj/structures/smooth/poker_table.dmi diff --git a/icons/obj/smooth_structures/poker_table.png b/icons/obj/structures/smooth/poker_table.png similarity index 100% rename from icons/obj/smooth_structures/poker_table.png rename to icons/obj/structures/smooth/poker_table.png diff --git a/icons/obj/smooth_structures/poker_table.png.toml b/icons/obj/structures/smooth/poker_table.png.toml similarity index 100% rename from icons/obj/smooth_structures/poker_table.png.toml rename to icons/obj/structures/smooth/poker_table.png.toml diff --git a/icons/obj/smooth_structures/reinforced_table.dmi b/icons/obj/structures/smooth/reinforced_table.dmi similarity index 100% rename from icons/obj/smooth_structures/reinforced_table.dmi rename to icons/obj/structures/smooth/reinforced_table.dmi diff --git a/icons/obj/smooth_structures/reinforced_table.png b/icons/obj/structures/smooth/reinforced_table.png similarity index 100% rename from icons/obj/smooth_structures/reinforced_table.png rename to icons/obj/structures/smooth/reinforced_table.png diff --git a/icons/obj/smooth_structures/reinforced_table.png.toml b/icons/obj/structures/smooth/reinforced_table.png.toml similarity index 100% rename from icons/obj/smooth_structures/reinforced_table.png.toml rename to icons/obj/structures/smooth/reinforced_table.png.toml diff --git a/icons/obj/smooth_structures/reinforced_window.dmi b/icons/obj/structures/smooth/reinforced_window.dmi similarity index 100% rename from icons/obj/smooth_structures/reinforced_window.dmi rename to icons/obj/structures/smooth/reinforced_window.dmi diff --git a/icons/obj/smooth_structures/reinforced_window.png b/icons/obj/structures/smooth/reinforced_window.png similarity index 100% rename from icons/obj/smooth_structures/reinforced_window.png rename to icons/obj/structures/smooth/reinforced_window.png diff --git a/icons/obj/smooth_structures/reinforced_window.png.toml b/icons/obj/structures/smooth/reinforced_window.png.toml similarity index 100% rename from icons/obj/smooth_structures/reinforced_window.png.toml rename to icons/obj/structures/smooth/reinforced_window.png.toml diff --git a/icons/obj/smooth_structures/rglass_table.dmi b/icons/obj/structures/smooth/rglass_table.dmi similarity index 100% rename from icons/obj/smooth_structures/rglass_table.dmi rename to icons/obj/structures/smooth/rglass_table.dmi diff --git a/icons/obj/smooth_structures/rglass_table.png b/icons/obj/structures/smooth/rglass_table.png similarity index 100% rename from icons/obj/smooth_structures/rglass_table.png rename to icons/obj/structures/smooth/rglass_table.png diff --git a/icons/obj/smooth_structures/rglass_table.png.toml b/icons/obj/structures/smooth/rglass_table.png.toml similarity index 100% rename from icons/obj/smooth_structures/rglass_table.png.toml rename to icons/obj/structures/smooth/rglass_table.png.toml diff --git a/icons/obj/smooth_structures/rice_window.dmi b/icons/obj/structures/smooth/rice_window.dmi similarity index 100% rename from icons/obj/smooth_structures/rice_window.dmi rename to icons/obj/structures/smooth/rice_window.dmi diff --git a/icons/obj/smooth_structures/rice_window.png b/icons/obj/structures/smooth/rice_window.png similarity index 100% rename from icons/obj/smooth_structures/rice_window.png rename to icons/obj/structures/smooth/rice_window.png diff --git a/icons/obj/smooth_structures/rice_window.png.toml b/icons/obj/structures/smooth/rice_window.png.toml similarity index 100% rename from icons/obj/smooth_structures/rice_window.png.toml rename to icons/obj/structures/smooth/rice_window.png.toml diff --git a/icons/obj/smooth_structures/rollingtable.dmi b/icons/obj/structures/smooth/rollingtable.dmi similarity index 100% rename from icons/obj/smooth_structures/rollingtable.dmi rename to icons/obj/structures/smooth/rollingtable.dmi diff --git a/icons/obj/smooth_structures/rplasma_window.dmi b/icons/obj/structures/smooth/rplasma_window.dmi similarity index 100% rename from icons/obj/smooth_structures/rplasma_window.dmi rename to icons/obj/structures/smooth/rplasma_window.dmi diff --git a/icons/obj/smooth_structures/rplasma_window.png b/icons/obj/structures/smooth/rplasma_window.png similarity index 100% rename from icons/obj/smooth_structures/rplasma_window.png rename to icons/obj/structures/smooth/rplasma_window.png diff --git a/icons/obj/smooth_structures/rplasma_window.png.toml b/icons/obj/structures/smooth/rplasma_window.png.toml similarity index 100% rename from icons/obj/smooth_structures/rplasma_window.png.toml rename to icons/obj/structures/smooth/rplasma_window.png.toml diff --git a/icons/obj/smooth_structures/rplasmaglass_table.dmi b/icons/obj/structures/smooth/rplasmaglass_table.dmi similarity index 100% rename from icons/obj/smooth_structures/rplasmaglass_table.dmi rename to icons/obj/structures/smooth/rplasmaglass_table.dmi diff --git a/icons/obj/smooth_structures/rplasmaglass_table.png b/icons/obj/structures/smooth/rplasmaglass_table.png similarity index 100% rename from icons/obj/smooth_structures/rplasmaglass_table.png rename to icons/obj/structures/smooth/rplasmaglass_table.png diff --git a/icons/obj/smooth_structures/rplasmaglass_table.png.toml b/icons/obj/structures/smooth/rplasmaglass_table.png.toml similarity index 100% rename from icons/obj/smooth_structures/rplasmaglass_table.png.toml rename to icons/obj/structures/smooth/rplasmaglass_table.png.toml diff --git a/icons/obj/smooth_structures/sandbags.dmi b/icons/obj/structures/smooth/sandbags.dmi similarity index 100% rename from icons/obj/smooth_structures/sandbags.dmi rename to icons/obj/structures/smooth/sandbags.dmi diff --git a/icons/obj/smooth_structures/sandbags.png b/icons/obj/structures/smooth/sandbags.png similarity index 100% rename from icons/obj/smooth_structures/sandbags.png rename to icons/obj/structures/smooth/sandbags.png diff --git a/icons/obj/smooth_structures/sandbags.png.toml b/icons/obj/structures/smooth/sandbags.png.toml similarity index 100% rename from icons/obj/smooth_structures/sandbags.png.toml rename to icons/obj/structures/smooth/sandbags.png.toml diff --git a/icons/obj/smooth_structures/shuttle_window.dmi b/icons/obj/structures/smooth/shuttle_window.dmi similarity index 100% rename from icons/obj/smooth_structures/shuttle_window.dmi rename to icons/obj/structures/smooth/shuttle_window.dmi diff --git a/icons/obj/smooth_structures/shuttle_window.png b/icons/obj/structures/smooth/shuttle_window.png similarity index 100% rename from icons/obj/smooth_structures/shuttle_window.png rename to icons/obj/structures/smooth/shuttle_window.png diff --git a/icons/obj/smooth_structures/shuttle_window.png.toml b/icons/obj/structures/smooth/shuttle_window.png.toml similarity index 100% rename from icons/obj/smooth_structures/shuttle_window.png.toml rename to icons/obj/structures/smooth/shuttle_window.png.toml diff --git a/icons/obj/smooth_structures/stickyweb.dmi b/icons/obj/structures/smooth/stickyweb.dmi similarity index 100% rename from icons/obj/smooth_structures/stickyweb.dmi rename to icons/obj/structures/smooth/stickyweb.dmi diff --git a/icons/obj/smooth_structures/stickyweb.png b/icons/obj/structures/smooth/stickyweb.png similarity index 100% rename from icons/obj/smooth_structures/stickyweb.png rename to icons/obj/structures/smooth/stickyweb.png diff --git a/icons/obj/smooth_structures/stickyweb.png.toml b/icons/obj/structures/smooth/stickyweb.png.toml similarity index 100% rename from icons/obj/smooth_structures/stickyweb.png.toml rename to icons/obj/structures/smooth/stickyweb.png.toml diff --git a/icons/obj/smooth_structures/stickyweb_rotated.dmi b/icons/obj/structures/smooth/stickyweb_rotated.dmi similarity index 100% rename from icons/obj/smooth_structures/stickyweb_rotated.dmi rename to icons/obj/structures/smooth/stickyweb_rotated.dmi diff --git a/icons/obj/smooth_structures/stickyweb_rotated.png b/icons/obj/structures/smooth/stickyweb_rotated.png similarity index 100% rename from icons/obj/smooth_structures/stickyweb_rotated.png rename to icons/obj/structures/smooth/stickyweb_rotated.png diff --git a/icons/obj/smooth_structures/stickyweb_rotated.png.toml b/icons/obj/structures/smooth/stickyweb_rotated.png.toml similarity index 100% rename from icons/obj/smooth_structures/stickyweb_rotated.png.toml rename to icons/obj/structures/smooth/stickyweb_rotated.png.toml diff --git a/icons/obj/smooth_structures/stickyweb_spikes.dmi b/icons/obj/structures/smooth/stickyweb_spikes.dmi similarity index 100% rename from icons/obj/smooth_structures/stickyweb_spikes.dmi rename to icons/obj/structures/smooth/stickyweb_spikes.dmi diff --git a/icons/obj/smooth_structures/stickyweb_spikes.png b/icons/obj/structures/smooth/stickyweb_spikes.png similarity index 100% rename from icons/obj/smooth_structures/stickyweb_spikes.png rename to icons/obj/structures/smooth/stickyweb_spikes.png diff --git a/icons/obj/smooth_structures/stickyweb_spikes.png.toml b/icons/obj/structures/smooth/stickyweb_spikes.png.toml similarity index 100% rename from icons/obj/smooth_structures/stickyweb_spikes.png.toml rename to icons/obj/structures/smooth/stickyweb_spikes.png.toml diff --git a/icons/obj/smooth_structures/structure_variations.dmi b/icons/obj/structures/smooth/structure_variations.dmi similarity index 100% rename from icons/obj/smooth_structures/structure_variations.dmi rename to icons/obj/structures/smooth/structure_variations.dmi diff --git a/icons/obj/smooth_structures/table.dmi b/icons/obj/structures/smooth/table.dmi similarity index 100% rename from icons/obj/smooth_structures/table.dmi rename to icons/obj/structures/smooth/table.dmi diff --git a/icons/obj/smooth_structures/table.png b/icons/obj/structures/smooth/table.png similarity index 100% rename from icons/obj/smooth_structures/table.png rename to icons/obj/structures/smooth/table.png diff --git a/icons/obj/smooth_structures/table.png.toml b/icons/obj/structures/smooth/table.png.toml similarity index 100% rename from icons/obj/smooth_structures/table.png.toml rename to icons/obj/structures/smooth/table.png.toml diff --git a/icons/obj/smooth_structures/table_greyscale.dmi b/icons/obj/structures/smooth/table_greyscale.dmi similarity index 100% rename from icons/obj/smooth_structures/table_greyscale.dmi rename to icons/obj/structures/smooth/table_greyscale.dmi diff --git a/icons/obj/smooth_structures/table_greyscale.png b/icons/obj/structures/smooth/table_greyscale.png similarity index 100% rename from icons/obj/smooth_structures/table_greyscale.png rename to icons/obj/structures/smooth/table_greyscale.png diff --git a/icons/obj/smooth_structures/table_greyscale.png.toml b/icons/obj/structures/smooth/table_greyscale.png.toml similarity index 100% rename from icons/obj/smooth_structures/table_greyscale.png.toml rename to icons/obj/structures/smooth/table_greyscale.png.toml diff --git a/icons/obj/structures/smooth/table_singles.dmi b/icons/obj/structures/smooth/table_singles.dmi new file mode 100644 index 00000000000..7dfd2db096b Binary files /dev/null and b/icons/obj/structures/smooth/table_singles.dmi differ diff --git a/icons/obj/smooth_structures/tall_structure_variations.dmi b/icons/obj/structures/smooth/tall_structure_variations.dmi similarity index 100% rename from icons/obj/smooth_structures/tall_structure_variations.dmi rename to icons/obj/structures/smooth/tall_structure_variations.dmi diff --git a/icons/obj/smooth_structures/tinted_window.dmi b/icons/obj/structures/smooth/tinted_window.dmi similarity index 100% rename from icons/obj/smooth_structures/tinted_window.dmi rename to icons/obj/structures/smooth/tinted_window.dmi diff --git a/icons/obj/smooth_structures/tinted_window.png b/icons/obj/structures/smooth/tinted_window.png similarity index 100% rename from icons/obj/smooth_structures/tinted_window.png rename to icons/obj/structures/smooth/tinted_window.png diff --git a/icons/obj/smooth_structures/tinted_window.png.toml b/icons/obj/structures/smooth/tinted_window.png.toml similarity index 100% rename from icons/obj/smooth_structures/tinted_window.png.toml rename to icons/obj/structures/smooth/tinted_window.png.toml diff --git a/icons/obj/smooth_structures/titaniumglass_table.dmi b/icons/obj/structures/smooth/titaniumglass_table.dmi similarity index 100% rename from icons/obj/smooth_structures/titaniumglass_table.dmi rename to icons/obj/structures/smooth/titaniumglass_table.dmi diff --git a/icons/obj/smooth_structures/titaniumglass_table.png b/icons/obj/structures/smooth/titaniumglass_table.png similarity index 100% rename from icons/obj/smooth_structures/titaniumglass_table.png rename to icons/obj/structures/smooth/titaniumglass_table.png diff --git a/icons/obj/smooth_structures/titaniumglass_table.png.toml b/icons/obj/structures/smooth/titaniumglass_table.png.toml similarity index 100% rename from icons/obj/smooth_structures/titaniumglass_table.png.toml rename to icons/obj/structures/smooth/titaniumglass_table.png.toml diff --git a/icons/obj/smooth_structures/webwall.dmi b/icons/obj/structures/smooth/webwall.dmi similarity index 100% rename from icons/obj/smooth_structures/webwall.dmi rename to icons/obj/structures/smooth/webwall.dmi diff --git a/icons/obj/smooth_structures/webwall.png b/icons/obj/structures/smooth/webwall.png similarity index 100% rename from icons/obj/smooth_structures/webwall.png rename to icons/obj/structures/smooth/webwall.png diff --git a/icons/obj/smooth_structures/webwall.png.toml b/icons/obj/structures/smooth/webwall.png.toml similarity index 100% rename from icons/obj/smooth_structures/webwall.png.toml rename to icons/obj/structures/smooth/webwall.png.toml diff --git a/icons/obj/smooth_structures/webwall_dark.dmi b/icons/obj/structures/smooth/webwall_dark.dmi similarity index 100% rename from icons/obj/smooth_structures/webwall_dark.dmi rename to icons/obj/structures/smooth/webwall_dark.dmi diff --git a/icons/obj/smooth_structures/webwall_dark.png b/icons/obj/structures/smooth/webwall_dark.png similarity index 100% rename from icons/obj/smooth_structures/webwall_dark.png rename to icons/obj/structures/smooth/webwall_dark.png diff --git a/icons/obj/smooth_structures/webwall_dark.png.toml b/icons/obj/structures/smooth/webwall_dark.png.toml similarity index 100% rename from icons/obj/smooth_structures/webwall_dark.png.toml rename to icons/obj/structures/smooth/webwall_dark.png.toml diff --git a/icons/obj/smooth_structures/webwall_reflector.dmi b/icons/obj/structures/smooth/webwall_reflector.dmi similarity index 100% rename from icons/obj/smooth_structures/webwall_reflector.dmi rename to icons/obj/structures/smooth/webwall_reflector.dmi diff --git a/icons/obj/smooth_structures/webwall_reflector.png b/icons/obj/structures/smooth/webwall_reflector.png similarity index 100% rename from icons/obj/smooth_structures/webwall_reflector.png rename to icons/obj/structures/smooth/webwall_reflector.png diff --git a/icons/obj/smooth_structures/webwall_reflector.png.toml b/icons/obj/structures/smooth/webwall_reflector.png.toml similarity index 100% rename from icons/obj/smooth_structures/webwall_reflector.png.toml rename to icons/obj/structures/smooth/webwall_reflector.png.toml diff --git a/icons/obj/smooth_structures/window.dmi b/icons/obj/structures/smooth/window.dmi similarity index 100% rename from icons/obj/smooth_structures/window.dmi rename to icons/obj/structures/smooth/window.dmi diff --git a/icons/obj/smooth_structures/window.png b/icons/obj/structures/smooth/window.png similarity index 100% rename from icons/obj/smooth_structures/window.png rename to icons/obj/structures/smooth/window.png diff --git a/icons/obj/smooth_structures/window.png.toml b/icons/obj/structures/smooth/window.png.toml similarity index 100% rename from icons/obj/smooth_structures/window.png.toml rename to icons/obj/structures/smooth/window.png.toml diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bamboo.dmi b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_bamboo.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bamboo.dmi rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_bamboo.dmi diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bamboo.png b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_bamboo.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bamboo.png rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_bamboo.png diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bamboo.png.toml b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_bamboo.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bamboo.png.toml rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_bamboo.png.toml diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bronze.dmi b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_bronze.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bronze.dmi rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_bronze.dmi diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bronze.png b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_bronze.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bronze.png rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_bronze.png diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bronze.png.toml b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_bronze.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_bronze.png.toml rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_bronze.png.toml diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_cult.dmi b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_cult.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_cult.dmi rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_cult.dmi diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_cult.png b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_cult.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_cult.png rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_cult.png diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_cult.png.toml b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_cult.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_cult.png.toml rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_cult.png.toml diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_gold.dmi b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_gold.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_gold.dmi rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_gold.dmi diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_gold.png b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_gold.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_gold.png rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_gold.png diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_gold.png.toml b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_gold.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_gold.png.toml rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_gold.png.toml diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_hotel.dmi b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_hotel.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_hotel.dmi rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_hotel.dmi diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_hotel.png b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_hotel.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_hotel.png rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_hotel.png diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_hotel.png.toml b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_hotel.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_hotel.png.toml rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_hotel.png.toml diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_iron.dmi b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_iron.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_iron.dmi rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_iron.dmi diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_iron.png b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_iron.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_iron.png rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_iron.png diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_iron.png.toml b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_iron.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_iron.png.toml rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_iron.png.toml diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_material.dmi b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_material.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_material.dmi rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_material.dmi diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_material.png b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_material.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_material.png rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_material.png diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_material.png.toml b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_material.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_material.png.toml rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_material.png.toml diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_normal.dmi b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_normal.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_normal.dmi rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_normal.dmi diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_normal.png b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_normal.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_normal.png rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_normal.png diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_normal.png.toml b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_normal.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_normal.png.toml rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_normal.png.toml diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_paperframe.dmi b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_paperframe.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_paperframe.dmi rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_paperframe.dmi diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_paperframe.png b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_paperframe.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_paperframe.png rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_paperframe.png diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_paperframe.png.toml b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_paperframe.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_paperframe.png.toml rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_paperframe.png.toml diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_pizza.dmi b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_pizza.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_pizza.dmi rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_pizza.dmi diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_pizza.png b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_pizza.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_pizza.png rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_pizza.png diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_pizza.png.toml b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_pizza.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_pizza.png.toml rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_pizza.png.toml diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_plastitanium.dmi b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_plastitanium.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_plastitanium.dmi rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_plastitanium.dmi diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_plastitanium.png b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_plastitanium.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_plastitanium.png rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_plastitanium.png diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_plastitanium.png.toml b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_plastitanium.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_plastitanium.png.toml rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_plastitanium.png.toml diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_rusty.dmi b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_rusty.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_rusty.dmi rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_rusty.dmi diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_rusty.png b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_rusty.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_rusty.png rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_rusty.png diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_rusty.png.toml b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_rusty.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_rusty.png.toml rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_rusty.png.toml diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_sandstone.dmi b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_sandstone.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_sandstone.dmi rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_sandstone.dmi diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_sandstone.png b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_sandstone.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_sandstone.png rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_sandstone.png diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_sandstone.png.toml b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_sandstone.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_sandstone.png.toml rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_sandstone.png.toml diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_shuttle.dmi b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_shuttle.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_shuttle.dmi rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_shuttle.dmi diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_shuttle.png b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_shuttle.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_shuttle.png rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_shuttle.png diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_shuttle.png.toml b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_shuttle.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_shuttle.png.toml rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_shuttle.png.toml diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_silver.dmi b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_silver.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_silver.dmi rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_silver.dmi diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_silver.png b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_silver.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_silver.png rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_silver.png diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_silver.png.toml b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_silver.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_silver.png.toml rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_silver.png.toml diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_uranium.dmi b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_uranium.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_uranium.dmi rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_uranium.dmi diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_uranium.png b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_uranium.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_uranium.png rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_uranium.png diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_uranium.png.toml b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_uranium.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_uranium.png.toml rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_uranium.png.toml diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_wood.dmi b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_wood.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_wood.dmi rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_wood.dmi diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_wood.png b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_wood.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_wood.png rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_wood.png diff --git a/icons/obj/smooth_structures/window_frames/frame_faces/window_frame_wood.png.toml b/icons/obj/structures/smooth/window_frames/frame_faces/window_frame_wood.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/frame_faces/window_frame_wood.png.toml rename to icons/obj/structures/smooth/window_frames/frame_faces/window_frame_wood.png.toml diff --git a/icons/obj/smooth_structures/window_frames/window_frame_bamboo.dmi b/icons/obj/structures/smooth/window_frames/window_frame_bamboo.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_bamboo.dmi rename to icons/obj/structures/smooth/window_frames/window_frame_bamboo.dmi diff --git a/icons/obj/smooth_structures/window_frames/window_frame_bamboo.png b/icons/obj/structures/smooth/window_frames/window_frame_bamboo.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_bamboo.png rename to icons/obj/structures/smooth/window_frames/window_frame_bamboo.png diff --git a/icons/obj/smooth_structures/window_frames/window_frame_bamboo.png.toml b/icons/obj/structures/smooth/window_frames/window_frame_bamboo.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_bamboo.png.toml rename to icons/obj/structures/smooth/window_frames/window_frame_bamboo.png.toml diff --git a/icons/obj/smooth_structures/window_frames/window_frame_bronze.dmi b/icons/obj/structures/smooth/window_frames/window_frame_bronze.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_bronze.dmi rename to icons/obj/structures/smooth/window_frames/window_frame_bronze.dmi diff --git a/icons/obj/smooth_structures/window_frames/window_frame_bronze.png b/icons/obj/structures/smooth/window_frames/window_frame_bronze.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_bronze.png rename to icons/obj/structures/smooth/window_frames/window_frame_bronze.png diff --git a/icons/obj/smooth_structures/window_frames/window_frame_bronze.png.toml b/icons/obj/structures/smooth/window_frames/window_frame_bronze.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_bronze.png.toml rename to icons/obj/structures/smooth/window_frames/window_frame_bronze.png.toml diff --git a/icons/obj/smooth_structures/window_frames/window_frame_cult.dmi b/icons/obj/structures/smooth/window_frames/window_frame_cult.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_cult.dmi rename to icons/obj/structures/smooth/window_frames/window_frame_cult.dmi diff --git a/icons/obj/smooth_structures/window_frames/window_frame_cult.png b/icons/obj/structures/smooth/window_frames/window_frame_cult.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_cult.png rename to icons/obj/structures/smooth/window_frames/window_frame_cult.png diff --git a/icons/obj/smooth_structures/window_frames/window_frame_cult.png.toml b/icons/obj/structures/smooth/window_frames/window_frame_cult.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_cult.png.toml rename to icons/obj/structures/smooth/window_frames/window_frame_cult.png.toml diff --git a/icons/obj/smooth_structures/window_frames/window_frame_gold.dmi b/icons/obj/structures/smooth/window_frames/window_frame_gold.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_gold.dmi rename to icons/obj/structures/smooth/window_frames/window_frame_gold.dmi diff --git a/icons/obj/smooth_structures/window_frames/window_frame_gold.png b/icons/obj/structures/smooth/window_frames/window_frame_gold.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_gold.png rename to icons/obj/structures/smooth/window_frames/window_frame_gold.png diff --git a/icons/obj/smooth_structures/window_frames/window_frame_gold.png.toml b/icons/obj/structures/smooth/window_frames/window_frame_gold.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_gold.png.toml rename to icons/obj/structures/smooth/window_frames/window_frame_gold.png.toml diff --git a/icons/obj/smooth_structures/window_frames/window_frame_hotel.dmi b/icons/obj/structures/smooth/window_frames/window_frame_hotel.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_hotel.dmi rename to icons/obj/structures/smooth/window_frames/window_frame_hotel.dmi diff --git a/icons/obj/smooth_structures/window_frames/window_frame_hotel.png b/icons/obj/structures/smooth/window_frames/window_frame_hotel.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_hotel.png rename to icons/obj/structures/smooth/window_frames/window_frame_hotel.png diff --git a/icons/obj/smooth_structures/window_frames/window_frame_hotel.png.toml b/icons/obj/structures/smooth/window_frames/window_frame_hotel.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_hotel.png.toml rename to icons/obj/structures/smooth/window_frames/window_frame_hotel.png.toml diff --git a/icons/obj/smooth_structures/window_frames/window_frame_iron.dmi b/icons/obj/structures/smooth/window_frames/window_frame_iron.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_iron.dmi rename to icons/obj/structures/smooth/window_frames/window_frame_iron.dmi diff --git a/icons/obj/smooth_structures/window_frames/window_frame_iron.png b/icons/obj/structures/smooth/window_frames/window_frame_iron.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_iron.png rename to icons/obj/structures/smooth/window_frames/window_frame_iron.png diff --git a/icons/obj/smooth_structures/window_frames/window_frame_iron.png.toml b/icons/obj/structures/smooth/window_frames/window_frame_iron.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_iron.png.toml rename to icons/obj/structures/smooth/window_frames/window_frame_iron.png.toml diff --git a/icons/obj/smooth_structures/window_frames/window_frame_material.dmi b/icons/obj/structures/smooth/window_frames/window_frame_material.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_material.dmi rename to icons/obj/structures/smooth/window_frames/window_frame_material.dmi diff --git a/icons/obj/smooth_structures/window_frames/window_frame_material.png b/icons/obj/structures/smooth/window_frames/window_frame_material.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_material.png rename to icons/obj/structures/smooth/window_frames/window_frame_material.png diff --git a/icons/obj/smooth_structures/window_frames/window_frame_material.png.toml b/icons/obj/structures/smooth/window_frames/window_frame_material.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_material.png.toml rename to icons/obj/structures/smooth/window_frames/window_frame_material.png.toml diff --git a/icons/obj/smooth_structures/window_frames/window_frame_normal.dmi b/icons/obj/structures/smooth/window_frames/window_frame_normal.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_normal.dmi rename to icons/obj/structures/smooth/window_frames/window_frame_normal.dmi diff --git a/icons/obj/smooth_structures/window_frames/window_frame_normal.png b/icons/obj/structures/smooth/window_frames/window_frame_normal.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_normal.png rename to icons/obj/structures/smooth/window_frames/window_frame_normal.png diff --git a/icons/obj/smooth_structures/window_frames/window_frame_normal.png.toml b/icons/obj/structures/smooth/window_frames/window_frame_normal.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_normal.png.toml rename to icons/obj/structures/smooth/window_frames/window_frame_normal.png.toml diff --git a/icons/obj/smooth_structures/window_frames/window_frame_paperframe.dmi b/icons/obj/structures/smooth/window_frames/window_frame_paperframe.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_paperframe.dmi rename to icons/obj/structures/smooth/window_frames/window_frame_paperframe.dmi diff --git a/icons/obj/smooth_structures/window_frames/window_frame_paperframe.png b/icons/obj/structures/smooth/window_frames/window_frame_paperframe.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_paperframe.png rename to icons/obj/structures/smooth/window_frames/window_frame_paperframe.png diff --git a/icons/obj/smooth_structures/window_frames/window_frame_paperframe.png.toml b/icons/obj/structures/smooth/window_frames/window_frame_paperframe.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_paperframe.png.toml rename to icons/obj/structures/smooth/window_frames/window_frame_paperframe.png.toml diff --git a/icons/obj/smooth_structures/window_frames/window_frame_pizza.dmi b/icons/obj/structures/smooth/window_frames/window_frame_pizza.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_pizza.dmi rename to icons/obj/structures/smooth/window_frames/window_frame_pizza.dmi diff --git a/icons/obj/smooth_structures/window_frames/window_frame_pizza.png b/icons/obj/structures/smooth/window_frames/window_frame_pizza.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_pizza.png rename to icons/obj/structures/smooth/window_frames/window_frame_pizza.png diff --git a/icons/obj/smooth_structures/window_frames/window_frame_pizza.png.toml b/icons/obj/structures/smooth/window_frames/window_frame_pizza.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_pizza.png.toml rename to icons/obj/structures/smooth/window_frames/window_frame_pizza.png.toml diff --git a/icons/obj/smooth_structures/window_frames/window_frame_plastitanium.dmi b/icons/obj/structures/smooth/window_frames/window_frame_plastitanium.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_plastitanium.dmi rename to icons/obj/structures/smooth/window_frames/window_frame_plastitanium.dmi diff --git a/icons/obj/smooth_structures/window_frames/window_frame_plastitanium.png b/icons/obj/structures/smooth/window_frames/window_frame_plastitanium.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_plastitanium.png rename to icons/obj/structures/smooth/window_frames/window_frame_plastitanium.png diff --git a/icons/obj/smooth_structures/window_frames/window_frame_plastitanium.png.toml b/icons/obj/structures/smooth/window_frames/window_frame_plastitanium.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_plastitanium.png.toml rename to icons/obj/structures/smooth/window_frames/window_frame_plastitanium.png.toml diff --git a/icons/obj/smooth_structures/window_frames/window_frame_rusty.dmi b/icons/obj/structures/smooth/window_frames/window_frame_rusty.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_rusty.dmi rename to icons/obj/structures/smooth/window_frames/window_frame_rusty.dmi diff --git a/icons/obj/smooth_structures/window_frames/window_frame_rusty.png b/icons/obj/structures/smooth/window_frames/window_frame_rusty.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_rusty.png rename to icons/obj/structures/smooth/window_frames/window_frame_rusty.png diff --git a/icons/obj/smooth_structures/window_frames/window_frame_rusty.png.toml b/icons/obj/structures/smooth/window_frames/window_frame_rusty.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_rusty.png.toml rename to icons/obj/structures/smooth/window_frames/window_frame_rusty.png.toml diff --git a/icons/obj/smooth_structures/window_frames/window_frame_sandstone.dmi b/icons/obj/structures/smooth/window_frames/window_frame_sandstone.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_sandstone.dmi rename to icons/obj/structures/smooth/window_frames/window_frame_sandstone.dmi diff --git a/icons/obj/smooth_structures/window_frames/window_frame_sandstone.png b/icons/obj/structures/smooth/window_frames/window_frame_sandstone.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_sandstone.png rename to icons/obj/structures/smooth/window_frames/window_frame_sandstone.png diff --git a/icons/obj/smooth_structures/window_frames/window_frame_sandstone.png.toml b/icons/obj/structures/smooth/window_frames/window_frame_sandstone.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_sandstone.png.toml rename to icons/obj/structures/smooth/window_frames/window_frame_sandstone.png.toml diff --git a/icons/obj/smooth_structures/window_frames/window_frame_shuttle.dmi b/icons/obj/structures/smooth/window_frames/window_frame_shuttle.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_shuttle.dmi rename to icons/obj/structures/smooth/window_frames/window_frame_shuttle.dmi diff --git a/icons/obj/smooth_structures/window_frames/window_frame_shuttle.png b/icons/obj/structures/smooth/window_frames/window_frame_shuttle.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_shuttle.png rename to icons/obj/structures/smooth/window_frames/window_frame_shuttle.png diff --git a/icons/obj/smooth_structures/window_frames/window_frame_shuttle.png.toml b/icons/obj/structures/smooth/window_frames/window_frame_shuttle.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_shuttle.png.toml rename to icons/obj/structures/smooth/window_frames/window_frame_shuttle.png.toml diff --git a/icons/obj/smooth_structures/window_frames/window_frame_silver.dmi b/icons/obj/structures/smooth/window_frames/window_frame_silver.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_silver.dmi rename to icons/obj/structures/smooth/window_frames/window_frame_silver.dmi diff --git a/icons/obj/smooth_structures/window_frames/window_frame_silver.png b/icons/obj/structures/smooth/window_frames/window_frame_silver.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_silver.png rename to icons/obj/structures/smooth/window_frames/window_frame_silver.png diff --git a/icons/obj/smooth_structures/window_frames/window_frame_silver.png.toml b/icons/obj/structures/smooth/window_frames/window_frame_silver.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_silver.png.toml rename to icons/obj/structures/smooth/window_frames/window_frame_silver.png.toml diff --git a/icons/obj/smooth_structures/window_frames/window_frame_uranium.dmi b/icons/obj/structures/smooth/window_frames/window_frame_uranium.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_uranium.dmi rename to icons/obj/structures/smooth/window_frames/window_frame_uranium.dmi diff --git a/icons/obj/smooth_structures/window_frames/window_frame_uranium.png b/icons/obj/structures/smooth/window_frames/window_frame_uranium.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_uranium.png rename to icons/obj/structures/smooth/window_frames/window_frame_uranium.png diff --git a/icons/obj/smooth_structures/window_frames/window_frame_uranium.png.toml b/icons/obj/structures/smooth/window_frames/window_frame_uranium.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_uranium.png.toml rename to icons/obj/structures/smooth/window_frames/window_frame_uranium.png.toml diff --git a/icons/obj/smooth_structures/window_frames/window_frame_wood.dmi b/icons/obj/structures/smooth/window_frames/window_frame_wood.dmi similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_wood.dmi rename to icons/obj/structures/smooth/window_frames/window_frame_wood.dmi diff --git a/icons/obj/smooth_structures/window_frames/window_frame_wood.png b/icons/obj/structures/smooth/window_frames/window_frame_wood.png similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_wood.png rename to icons/obj/structures/smooth/window_frames/window_frame_wood.png diff --git a/icons/obj/smooth_structures/window_frames/window_frame_wood.png.toml b/icons/obj/structures/smooth/window_frames/window_frame_wood.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_frames/window_frame_wood.png.toml rename to icons/obj/structures/smooth/window_frames/window_frame_wood.png.toml diff --git a/icons/obj/smooth_structures/window_grille.dmi b/icons/obj/structures/smooth/window_grille.dmi similarity index 100% rename from icons/obj/smooth_structures/window_grille.dmi rename to icons/obj/structures/smooth/window_grille.dmi diff --git a/icons/obj/smooth_structures/window_grille.png b/icons/obj/structures/smooth/window_grille.png similarity index 100% rename from icons/obj/smooth_structures/window_grille.png rename to icons/obj/structures/smooth/window_grille.png diff --git a/icons/obj/smooth_structures/window_grille.png.toml b/icons/obj/structures/smooth/window_grille.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_grille.png.toml rename to icons/obj/structures/smooth/window_grille.png.toml diff --git a/icons/obj/smooth_structures/window_grille_black.dmi b/icons/obj/structures/smooth/window_grille_black.dmi similarity index 100% rename from icons/obj/smooth_structures/window_grille_black.dmi rename to icons/obj/structures/smooth/window_grille_black.dmi diff --git a/icons/obj/smooth_structures/window_grille_black.png b/icons/obj/structures/smooth/window_grille_black.png similarity index 100% rename from icons/obj/smooth_structures/window_grille_black.png rename to icons/obj/structures/smooth/window_grille_black.png diff --git a/icons/obj/smooth_structures/window_grille_black.png.toml b/icons/obj/structures/smooth/window_grille_black.png.toml similarity index 100% rename from icons/obj/smooth_structures/window_grille_black.png.toml rename to icons/obj/structures/smooth/window_grille_black.png.toml diff --git a/icons/obj/smooth_structures/windows/bronze_window.dmi b/icons/obj/structures/smooth/windows/bronze_window.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/bronze_window.dmi rename to icons/obj/structures/smooth/windows/bronze_window.dmi diff --git a/icons/obj/smooth_structures/windows/bronze_window.png b/icons/obj/structures/smooth/windows/bronze_window.png similarity index 100% rename from icons/obj/smooth_structures/windows/bronze_window.png rename to icons/obj/structures/smooth/windows/bronze_window.png diff --git a/icons/obj/smooth_structures/windows/bronze_window.png.toml b/icons/obj/structures/smooth/windows/bronze_window.png.toml similarity index 100% rename from icons/obj/smooth_structures/windows/bronze_window.png.toml rename to icons/obj/structures/smooth/windows/bronze_window.png.toml diff --git a/icons/obj/smooth_structures/windows/frosted_thindow.dmi b/icons/obj/structures/smooth/windows/frosted_thindow.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/frosted_thindow.dmi rename to icons/obj/structures/smooth/windows/frosted_thindow.dmi diff --git a/icons/obj/smooth_structures/windows/frosted_window.dmi b/icons/obj/structures/smooth/windows/frosted_window.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/frosted_window.dmi rename to icons/obj/structures/smooth/windows/frosted_window.dmi diff --git a/icons/obj/smooth_structures/windows/frosted_window.png b/icons/obj/structures/smooth/windows/frosted_window.png similarity index 100% rename from icons/obj/smooth_structures/windows/frosted_window.png rename to icons/obj/structures/smooth/windows/frosted_window.png diff --git a/icons/obj/smooth_structures/windows/half_thindow.dmi b/icons/obj/structures/smooth/windows/half_thindow.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/half_thindow.dmi rename to icons/obj/structures/smooth/windows/half_thindow.dmi diff --git a/icons/obj/smooth_structures/windows/normal_thindow.dmi b/icons/obj/structures/smooth/windows/normal_thindow.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/normal_thindow.dmi rename to icons/obj/structures/smooth/windows/normal_thindow.dmi diff --git a/icons/obj/smooth_structures/windows/normal_window.dmi b/icons/obj/structures/smooth/windows/normal_window.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/normal_window.dmi rename to icons/obj/structures/smooth/windows/normal_window.dmi diff --git a/icons/obj/smooth_structures/windows/normal_window.png b/icons/obj/structures/smooth/windows/normal_window.png similarity index 100% rename from icons/obj/smooth_structures/windows/normal_window.png rename to icons/obj/structures/smooth/windows/normal_window.png diff --git a/icons/obj/smooth_structures/windows/normal_window.png.toml b/icons/obj/structures/smooth/windows/normal_window.png.toml similarity index 100% rename from icons/obj/smooth_structures/windows/normal_window.png.toml rename to icons/obj/structures/smooth/windows/normal_window.png.toml diff --git a/icons/obj/smooth_structures/windows/paper_window.dmi b/icons/obj/structures/smooth/windows/paper_window.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/paper_window.dmi rename to icons/obj/structures/smooth/windows/paper_window.dmi diff --git a/icons/obj/smooth_structures/windows/paper_window.png b/icons/obj/structures/smooth/windows/paper_window.png similarity index 100% rename from icons/obj/smooth_structures/windows/paper_window.png rename to icons/obj/structures/smooth/windows/paper_window.png diff --git a/icons/obj/smooth_structures/windows/paper_window.png.toml b/icons/obj/structures/smooth/windows/paper_window.png.toml similarity index 100% rename from icons/obj/smooth_structures/windows/paper_window.png.toml rename to icons/obj/structures/smooth/windows/paper_window.png.toml diff --git a/icons/obj/smooth_structures/windows/paper_window_fixing.png b/icons/obj/structures/smooth/windows/paper_window_fixing.png similarity index 100% rename from icons/obj/smooth_structures/windows/paper_window_fixing.png rename to icons/obj/structures/smooth/windows/paper_window_fixing.png diff --git a/icons/obj/smooth_structures/windows/paper_window_torn.dmi b/icons/obj/structures/smooth/windows/paper_window_torn.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/paper_window_torn.dmi rename to icons/obj/structures/smooth/windows/paper_window_torn.dmi diff --git a/icons/obj/smooth_structures/windows/paper_window_torn.png b/icons/obj/structures/smooth/windows/paper_window_torn.png similarity index 100% rename from icons/obj/smooth_structures/windows/paper_window_torn.png rename to icons/obj/structures/smooth/windows/paper_window_torn.png diff --git a/icons/obj/smooth_structures/windows/paper_window_torn.png.toml b/icons/obj/structures/smooth/windows/paper_window_torn.png.toml similarity index 100% rename from icons/obj/smooth_structures/windows/paper_window_torn.png.toml rename to icons/obj/structures/smooth/windows/paper_window_torn.png.toml diff --git a/icons/obj/smooth_structures/windows/paper_window_torn_fixing.png b/icons/obj/structures/smooth/windows/paper_window_torn_fixing.png similarity index 100% rename from icons/obj/smooth_structures/windows/paper_window_torn_fixing.png rename to icons/obj/structures/smooth/windows/paper_window_torn_fixing.png diff --git a/icons/obj/smooth_structures/windows/plasma_reinforced_thindow.dmi b/icons/obj/structures/smooth/windows/plasma_reinforced_thindow.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/plasma_reinforced_thindow.dmi rename to icons/obj/structures/smooth/windows/plasma_reinforced_thindow.dmi diff --git a/icons/obj/smooth_structures/windows/plasma_reinforced_window.dmi b/icons/obj/structures/smooth/windows/plasma_reinforced_window.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/plasma_reinforced_window.dmi rename to icons/obj/structures/smooth/windows/plasma_reinforced_window.dmi diff --git a/icons/obj/smooth_structures/windows/plasma_reinforced_window.png b/icons/obj/structures/smooth/windows/plasma_reinforced_window.png similarity index 100% rename from icons/obj/smooth_structures/windows/plasma_reinforced_window.png rename to icons/obj/structures/smooth/windows/plasma_reinforced_window.png diff --git a/icons/obj/smooth_structures/windows/plasma_reinforced_window.png.toml b/icons/obj/structures/smooth/windows/plasma_reinforced_window.png.toml similarity index 100% rename from icons/obj/smooth_structures/windows/plasma_reinforced_window.png.toml rename to icons/obj/structures/smooth/windows/plasma_reinforced_window.png.toml diff --git a/icons/obj/smooth_structures/windows/plasma_thindow.dmi b/icons/obj/structures/smooth/windows/plasma_thindow.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/plasma_thindow.dmi rename to icons/obj/structures/smooth/windows/plasma_thindow.dmi diff --git a/icons/obj/smooth_structures/windows/plasma_window.dmi b/icons/obj/structures/smooth/windows/plasma_window.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/plasma_window.dmi rename to icons/obj/structures/smooth/windows/plasma_window.dmi diff --git a/icons/obj/smooth_structures/windows/plasma_window.png b/icons/obj/structures/smooth/windows/plasma_window.png similarity index 100% rename from icons/obj/smooth_structures/windows/plasma_window.png rename to icons/obj/structures/smooth/windows/plasma_window.png diff --git a/icons/obj/smooth_structures/windows/plasma_window.png.toml b/icons/obj/structures/smooth/windows/plasma_window.png.toml similarity index 100% rename from icons/obj/smooth_structures/windows/plasma_window.png.toml rename to icons/obj/structures/smooth/windows/plasma_window.png.toml diff --git a/icons/obj/smooth_structures/windows/plastitanium_window.dmi b/icons/obj/structures/smooth/windows/plastitanium_window.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/plastitanium_window.dmi rename to icons/obj/structures/smooth/windows/plastitanium_window.dmi diff --git a/icons/obj/smooth_structures/windows/plastitanium_window.png b/icons/obj/structures/smooth/windows/plastitanium_window.png similarity index 100% rename from icons/obj/smooth_structures/windows/plastitanium_window.png rename to icons/obj/structures/smooth/windows/plastitanium_window.png diff --git a/icons/obj/smooth_structures/windows/plastitanium_window.png.toml b/icons/obj/structures/smooth/windows/plastitanium_window.png.toml similarity index 100% rename from icons/obj/smooth_structures/windows/plastitanium_window.png.toml rename to icons/obj/structures/smooth/windows/plastitanium_window.png.toml diff --git a/icons/obj/smooth_structures/windows/pod_thindow.dmi b/icons/obj/structures/smooth/windows/pod_thindow.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/pod_thindow.dmi rename to icons/obj/structures/smooth/windows/pod_thindow.dmi diff --git a/icons/obj/smooth_structures/windows/pod_window.dmi b/icons/obj/structures/smooth/windows/pod_window.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/pod_window.dmi rename to icons/obj/structures/smooth/windows/pod_window.dmi diff --git a/icons/obj/smooth_structures/windows/pod_window.png b/icons/obj/structures/smooth/windows/pod_window.png similarity index 100% rename from icons/obj/smooth_structures/windows/pod_window.png rename to icons/obj/structures/smooth/windows/pod_window.png diff --git a/icons/obj/smooth_structures/windows/pod_window.png.toml b/icons/obj/structures/smooth/windows/pod_window.png.toml similarity index 100% rename from icons/obj/smooth_structures/windows/pod_window.png.toml rename to icons/obj/structures/smooth/windows/pod_window.png.toml diff --git a/icons/obj/smooth_structures/windows/reinforced_half_thindow.dmi b/icons/obj/structures/smooth/windows/reinforced_half_thindow.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/reinforced_half_thindow.dmi rename to icons/obj/structures/smooth/windows/reinforced_half_thindow.dmi diff --git a/icons/obj/smooth_structures/windows/reinforced_thindow.dmi b/icons/obj/structures/smooth/windows/reinforced_thindow.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/reinforced_thindow.dmi rename to icons/obj/structures/smooth/windows/reinforced_thindow.dmi diff --git a/icons/obj/smooth_structures/windows/reinforced_window.dmi b/icons/obj/structures/smooth/windows/reinforced_window.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/reinforced_window.dmi rename to icons/obj/structures/smooth/windows/reinforced_window.dmi diff --git a/icons/obj/smooth_structures/windows/reinforced_window.png b/icons/obj/structures/smooth/windows/reinforced_window.png similarity index 100% rename from icons/obj/smooth_structures/windows/reinforced_window.png rename to icons/obj/structures/smooth/windows/reinforced_window.png diff --git a/icons/obj/smooth_structures/windows/reinforced_window.png.toml b/icons/obj/structures/smooth/windows/reinforced_window.png.toml similarity index 100% rename from icons/obj/smooth_structures/windows/reinforced_window.png.toml rename to icons/obj/structures/smooth/windows/reinforced_window.png.toml diff --git a/icons/obj/smooth_structures/windows/tinted_thindow.dmi b/icons/obj/structures/smooth/windows/tinted_thindow.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/tinted_thindow.dmi rename to icons/obj/structures/smooth/windows/tinted_thindow.dmi diff --git a/icons/obj/smooth_structures/windows/tinted_window.dmi b/icons/obj/structures/smooth/windows/tinted_window.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/tinted_window.dmi rename to icons/obj/structures/smooth/windows/tinted_window.dmi diff --git a/icons/obj/smooth_structures/windows/tinted_window.png b/icons/obj/structures/smooth/windows/tinted_window.png similarity index 100% rename from icons/obj/smooth_structures/windows/tinted_window.png rename to icons/obj/structures/smooth/windows/tinted_window.png diff --git a/icons/obj/smooth_structures/windows/tinted_window.png.toml b/icons/obj/structures/smooth/windows/tinted_window.png.toml similarity index 100% rename from icons/obj/smooth_structures/windows/tinted_window.png.toml rename to icons/obj/structures/smooth/windows/tinted_window.png.toml diff --git a/icons/obj/smooth_structures/windows/titanium_window.dmi b/icons/obj/structures/smooth/windows/titanium_window.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/titanium_window.dmi rename to icons/obj/structures/smooth/windows/titanium_window.dmi diff --git a/icons/obj/smooth_structures/windows/titanium_window.png b/icons/obj/structures/smooth/windows/titanium_window.png similarity index 100% rename from icons/obj/smooth_structures/windows/titanium_window.png rename to icons/obj/structures/smooth/windows/titanium_window.png diff --git a/icons/obj/smooth_structures/windows/titanium_window.png.toml b/icons/obj/structures/smooth/windows/titanium_window.png.toml similarity index 100% rename from icons/obj/smooth_structures/windows/titanium_window.png.toml rename to icons/obj/structures/smooth/windows/titanium_window.png.toml diff --git a/icons/obj/smooth_structures/windows/tram_thindow.dmi b/icons/obj/structures/smooth/windows/tram_thindow.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/tram_thindow.dmi rename to icons/obj/structures/smooth/windows/tram_thindow.dmi diff --git a/icons/obj/smooth_structures/windows/window_broken_heavy.dmi b/icons/obj/structures/smooth/windows/window_broken_heavy.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/window_broken_heavy.dmi rename to icons/obj/structures/smooth/windows/window_broken_heavy.dmi diff --git a/icons/obj/smooth_structures/windows/window_broken_heavy.png b/icons/obj/structures/smooth/windows/window_broken_heavy.png similarity index 100% rename from icons/obj/smooth_structures/windows/window_broken_heavy.png rename to icons/obj/structures/smooth/windows/window_broken_heavy.png diff --git a/icons/obj/smooth_structures/windows/window_broken_heavy.png.toml b/icons/obj/structures/smooth/windows/window_broken_heavy.png.toml similarity index 100% rename from icons/obj/smooth_structures/windows/window_broken_heavy.png.toml rename to icons/obj/structures/smooth/windows/window_broken_heavy.png.toml diff --git a/icons/obj/smooth_structures/windows/window_broken_light.dmi b/icons/obj/structures/smooth/windows/window_broken_light.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/window_broken_light.dmi rename to icons/obj/structures/smooth/windows/window_broken_light.dmi diff --git a/icons/obj/smooth_structures/windows/window_broken_light.png b/icons/obj/structures/smooth/windows/window_broken_light.png similarity index 100% rename from icons/obj/smooth_structures/windows/window_broken_light.png rename to icons/obj/structures/smooth/windows/window_broken_light.png diff --git a/icons/obj/smooth_structures/windows/window_broken_light.png.toml b/icons/obj/structures/smooth/windows/window_broken_light.png.toml similarity index 100% rename from icons/obj/smooth_structures/windows/window_broken_light.png.toml rename to icons/obj/structures/smooth/windows/window_broken_light.png.toml diff --git a/icons/obj/smooth_structures/windows/window_broken_medium.dmi b/icons/obj/structures/smooth/windows/window_broken_medium.dmi similarity index 100% rename from icons/obj/smooth_structures/windows/window_broken_medium.dmi rename to icons/obj/structures/smooth/windows/window_broken_medium.dmi diff --git a/icons/obj/smooth_structures/windows/window_broken_medium.png b/icons/obj/structures/smooth/windows/window_broken_medium.png similarity index 100% rename from icons/obj/smooth_structures/windows/window_broken_medium.png rename to icons/obj/structures/smooth/windows/window_broken_medium.png diff --git a/icons/obj/smooth_structures/windows/window_broken_medium.png.toml b/icons/obj/structures/smooth/windows/window_broken_medium.png.toml similarity index 100% rename from icons/obj/smooth_structures/windows/window_broken_medium.png.toml rename to icons/obj/structures/smooth/windows/window_broken_medium.png.toml diff --git a/icons/obj/smooth_structures/wood_table.dmi b/icons/obj/structures/smooth/wood_table.dmi similarity index 100% rename from icons/obj/smooth_structures/wood_table.dmi rename to icons/obj/structures/smooth/wood_table.dmi diff --git a/icons/obj/smooth_structures/wood_table.png b/icons/obj/structures/smooth/wood_table.png similarity index 100% rename from icons/obj/smooth_structures/wood_table.png rename to icons/obj/structures/smooth/wood_table.png diff --git a/icons/obj/smooth_structures/wood_table.png.toml b/icons/obj/structures/smooth/wood_table.png.toml similarity index 100% rename from icons/obj/smooth_structures/wood_table.png.toml rename to icons/obj/structures/smooth/wood_table.png.toml diff --git a/icons/obj/stairs.dmi b/icons/obj/structures/stairs.dmi similarity index 100% rename from icons/obj/stairs.dmi rename to icons/obj/structures/stairs.dmi diff --git a/icons/obj/structures/tall.dmi b/icons/obj/structures/tall.dmi new file mode 100644 index 00000000000..8128ee5bfbf Binary files /dev/null and b/icons/obj/structures/tall.dmi differ diff --git a/icons/obj/track.dmi b/icons/obj/structures/track.dmi similarity index 100% rename from icons/obj/track.dmi rename to icons/obj/structures/track.dmi diff --git a/icons/obj/tram/crossing_signal.dmi b/icons/obj/structures/tram/crossing_signal.dmi similarity index 100% rename from icons/obj/tram/crossing_signal.dmi rename to icons/obj/structures/tram/crossing_signal.dmi diff --git a/icons/obj/tram/tram_controllers.dmi b/icons/obj/structures/tram/tram_controllers.dmi similarity index 100% rename from icons/obj/tram/tram_controllers.dmi rename to icons/obj/structures/tram/tram_controllers.dmi diff --git a/icons/obj/tram/tram_display.dmi b/icons/obj/structures/tram/tram_display.dmi similarity index 100% rename from icons/obj/tram/tram_display.dmi rename to icons/obj/structures/tram/tram_display.dmi diff --git a/icons/obj/tram/tram_indicator.dmi b/icons/obj/structures/tram/tram_indicator.dmi similarity index 100% rename from icons/obj/tram/tram_indicator.dmi rename to icons/obj/structures/tram/tram_indicator.dmi diff --git a/icons/obj/tram/tram_rails.dmi b/icons/obj/structures/tram/tram_rails.dmi similarity index 100% rename from icons/obj/tram/tram_rails.dmi rename to icons/obj/structures/tram/tram_rails.dmi diff --git a/icons/obj/tram/tram_sensor.dmi b/icons/obj/structures/tram/tram_sensor.dmi similarity index 100% rename from icons/obj/tram/tram_sensor.dmi rename to icons/obj/structures/tram/tram_sensor.dmi diff --git a/icons/obj/tram/tram_structure.dmi b/icons/obj/structures/tram/tram_structure.dmi similarity index 100% rename from icons/obj/tram/tram_structure.dmi rename to icons/obj/structures/tram/tram_structure.dmi diff --git a/icons/obj/wallmounts.dmi b/icons/obj/structures/wallmounts.dmi similarity index 100% rename from icons/obj/wallmounts.dmi rename to icons/obj/structures/wallmounts.dmi diff --git a/icons/obj/structures/watercloset.dmi b/icons/obj/structures/watercloset.dmi new file mode 100644 index 00000000000..b58d6cb1308 Binary files /dev/null and b/icons/obj/structures/watercloset.dmi differ diff --git a/icons/obj/structures_tall.dmi b/icons/obj/structures_tall.dmi deleted file mode 100644 index 9205429941d..00000000000 Binary files a/icons/obj/structures_tall.dmi and /dev/null differ diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi index ec8216ccc3e..e083c64a46e 100644 Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ diff --git a/icons/obj/toys/toy.dmi b/icons/obj/toys/toy.dmi index 8d77fd0c757..972612e7a2c 100644 Binary files a/icons/obj/toys/toy.dmi and b/icons/obj/toys/toy.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi deleted file mode 100644 index 24592df5a2a..00000000000 Binary files a/icons/obj/vending.dmi and /dev/null differ diff --git a/icons/obj/watercloset.dmi b/icons/obj/watercloset.dmi deleted file mode 100644 index 0489251d74a..00000000000 Binary files a/icons/obj/watercloset.dmi and /dev/null differ diff --git a/icons/obj/weapons/spear.dmi b/icons/obj/weapons/spear.dmi index 7c044d362a7..8f8ceb1d9ee 100644 Binary files a/icons/obj/weapons/spear.dmi and b/icons/obj/weapons/spear.dmi differ diff --git a/icons/turf/damaged.dmi b/icons/turf/damaged.dmi index a81384d8be6..74bba1a76b3 100644 Binary files a/icons/turf/damaged.dmi and b/icons/turf/damaged.dmi differ diff --git a/icons/turf/overlays.dmi b/icons/turf/overlays.dmi index c9decbc5a3a..91ad71baada 100644 Binary files a/icons/turf/overlays.dmi and b/icons/turf/overlays.dmi differ diff --git a/icons/ui_icons/antags/heretic/knowledge.dmi b/icons/ui/antags/heretic/knowledge.dmi similarity index 100% rename from icons/ui_icons/antags/heretic/knowledge.dmi rename to icons/ui/antags/heretic/knowledge.dmi diff --git a/icons/stamp_icons/font.png b/icons/ui/stamp_icons/font.png similarity index 100% rename from icons/stamp_icons/font.png rename to icons/ui/stamp_icons/font.png diff --git a/icons/stamp_icons/large_stamp-cap.png b/icons/ui/stamp_icons/large_stamp-cap.png similarity index 100% rename from icons/stamp_icons/large_stamp-cap.png rename to icons/ui/stamp_icons/large_stamp-cap.png diff --git a/icons/stamp_icons/large_stamp-ce.png b/icons/ui/stamp_icons/large_stamp-ce.png similarity index 100% rename from icons/stamp_icons/large_stamp-ce.png rename to icons/ui/stamp_icons/large_stamp-ce.png diff --git a/icons/stamp_icons/large_stamp-centcom.png b/icons/ui/stamp_icons/large_stamp-centcom.png similarity index 100% rename from icons/stamp_icons/large_stamp-centcom.png rename to icons/ui/stamp_icons/large_stamp-centcom.png diff --git a/icons/stamp_icons/large_stamp-chap.png b/icons/ui/stamp_icons/large_stamp-chap.png similarity index 100% rename from icons/stamp_icons/large_stamp-chap.png rename to icons/ui/stamp_icons/large_stamp-chap.png diff --git a/icons/stamp_icons/large_stamp-clown.png b/icons/ui/stamp_icons/large_stamp-clown.png similarity index 100% rename from icons/stamp_icons/large_stamp-clown.png rename to icons/ui/stamp_icons/large_stamp-clown.png diff --git a/icons/stamp_icons/large_stamp-cmo.png b/icons/ui/stamp_icons/large_stamp-cmo.png similarity index 100% rename from icons/stamp_icons/large_stamp-cmo.png rename to icons/ui/stamp_icons/large_stamp-cmo.png diff --git a/icons/stamp_icons/large_stamp-deny.png b/icons/ui/stamp_icons/large_stamp-deny.png similarity index 100% rename from icons/stamp_icons/large_stamp-deny.png rename to icons/ui/stamp_icons/large_stamp-deny.png diff --git a/icons/stamp_icons/large_stamp-hop.png b/icons/ui/stamp_icons/large_stamp-hop.png similarity index 100% rename from icons/stamp_icons/large_stamp-hop.png rename to icons/ui/stamp_icons/large_stamp-hop.png diff --git a/icons/stamp_icons/large_stamp-hos.png b/icons/ui/stamp_icons/large_stamp-hos.png similarity index 100% rename from icons/stamp_icons/large_stamp-hos.png rename to icons/ui/stamp_icons/large_stamp-hos.png diff --git a/icons/stamp_icons/large_stamp-law.png b/icons/ui/stamp_icons/large_stamp-law.png similarity index 100% rename from icons/stamp_icons/large_stamp-law.png rename to icons/ui/stamp_icons/large_stamp-law.png diff --git a/icons/stamp_icons/large_stamp-mime.png b/icons/ui/stamp_icons/large_stamp-mime.png similarity index 100% rename from icons/stamp_icons/large_stamp-mime.png rename to icons/ui/stamp_icons/large_stamp-mime.png diff --git a/icons/stamp_icons/large_stamp-ok.png b/icons/ui/stamp_icons/large_stamp-ok.png similarity index 100% rename from icons/stamp_icons/large_stamp-ok.png rename to icons/ui/stamp_icons/large_stamp-ok.png diff --git a/icons/stamp_icons/large_stamp-qm.png b/icons/ui/stamp_icons/large_stamp-qm.png similarity index 100% rename from icons/stamp_icons/large_stamp-qm.png rename to icons/ui/stamp_icons/large_stamp-qm.png diff --git a/icons/stamp_icons/large_stamp-rd.png b/icons/ui/stamp_icons/large_stamp-rd.png similarity index 100% rename from icons/stamp_icons/large_stamp-rd.png rename to icons/ui/stamp_icons/large_stamp-rd.png diff --git a/icons/stamp_icons/large_stamp-syndicate.png b/icons/ui/stamp_icons/large_stamp-syndicate.png similarity index 100% rename from icons/stamp_icons/large_stamp-syndicate.png rename to icons/ui/stamp_icons/large_stamp-syndicate.png diff --git a/icons/stamp_icons/large_stamp-void.png b/icons/ui/stamp_icons/large_stamp-void.png similarity index 100% rename from icons/stamp_icons/large_stamp-void.png rename to icons/ui/stamp_icons/large_stamp-void.png diff --git a/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx b/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx index 097a417829c..31becf60533 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx @@ -278,7 +278,7 @@ const KnowledgeTree = (props) => { }} >