diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm index e21c87a8ae7a..84e2589722d5 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm @@ -511,7 +511,7 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) "OF" = ( -/obj/structure/flora/ash/whitesands/fireblossom, +/obj/structure/flora/ash/fireblossom, /obj/structure/stone_tile/cracked{ dir = 4 }, diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_icecropolis.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_icecropolis.dmm index 5c3fd9bea5fa..242bdc988a84 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_icecropolis.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_icecropolis.dmm @@ -2409,8 +2409,8 @@ /area/ruin/unpowered/icecropolis/rusty) "RQ" = ( /obj/structure/table/wood/reinforced, -/obj/item/seeds/lavaland/whitesands/fern, -/obj/item/seeds/lavaland/whitesands/fireblossom, +/obj/item/seeds/lavaland/fern, +/obj/item/seeds/lavaland/fireblossom, /obj/item/seeds/lavaland/porcini, /obj/item/seeds/lavaland/polypore, /obj/item/seeds/lavaland/cactus, diff --git a/_maps/RandomRuins/RockRuins/rockplanet_ore_proccessing_facility.dmm b/_maps/RandomRuins/RockRuins/rockplanet_ore_proccessing_facility.dmm index ecedb245142f..b219896d21ab 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_ore_proccessing_facility.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_ore_proccessing_facility.dmm @@ -108,7 +108,7 @@ dir = 10 }, /obj/structure/lattice/lava{ - icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi' + icon = 'icons/obj/smooth_structures/catwalk.dmi' }, /turf/open/lava/smooth{ smoothing_flags = 0; @@ -163,7 +163,7 @@ dir = 1 }, /obj/structure/lattice/lava{ - icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi' + icon = 'icons/obj/smooth_structures/catwalk.dmi' }, /turf/open/lava/smooth{ smoothing_flags = 0; @@ -298,7 +298,7 @@ dir = 6 }, /obj/structure/lattice/lava{ - icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi' + icon = 'icons/obj/smooth_structures/catwalk.dmi' }, /turf/open/lava/smooth{ smoothing_flags = 0; @@ -383,7 +383,7 @@ "xz" = ( /obj/structure/railing, /obj/structure/lattice/lava{ - icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi' + icon = 'icons/obj/smooth_structures/catwalk.dmi' }, /turf/open/lava/smooth{ smoothing_flags = 0; @@ -512,7 +512,7 @@ dir = 8 }, /obj/structure/lattice/lava{ - icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi' + icon = 'icons/obj/smooth_structures/catwalk.dmi' }, /turf/open/lava/smooth{ smoothing_flags = 0; @@ -531,7 +531,7 @@ }, /obj/structure/railing/corner, /obj/structure/lattice/lava{ - icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi' + icon = 'icons/obj/smooth_structures/catwalk.dmi' }, /turf/open/lava/smooth{ smoothing_flags = 0; @@ -543,7 +543,7 @@ dir = 9 }, /obj/structure/lattice/lava{ - icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi' + icon = 'icons/obj/smooth_structures/catwalk.dmi' }, /turf/open/lava/smooth{ smoothing_flags = 0; @@ -568,7 +568,7 @@ dir = 4 }, /obj/structure/lattice/lava{ - icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi' + icon = 'icons/obj/smooth_structures/catwalk.dmi' }, /turf/open/lava/smooth{ smoothing_flags = 0; @@ -597,7 +597,7 @@ dir = 1 }, /obj/structure/lattice/lava{ - icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi' + icon = 'icons/obj/smooth_structures/catwalk.dmi' }, /turf/open/lava/smooth{ smoothing_flags = 0; @@ -683,7 +683,7 @@ dir = 1 }, /obj/structure/lattice/lava{ - icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi' + icon = 'icons/obj/smooth_structures/catwalk.dmi' }, /turf/open/lava/smooth{ smoothing_flags = 0; @@ -759,7 +759,7 @@ dir = 8 }, /obj/structure/lattice/lava{ - icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi' + icon = 'icons/obj/smooth_structures/catwalk.dmi' }, /turf/open/lava/smooth{ smoothing_flags = 0; diff --git a/_maps/shuttles/shiptest/chapel.dmm b/_maps/shuttles/shiptest/chapel.dmm index 433420f6b4e2..bc2407edb619 100644 --- a/_maps/shuttles/shiptest/chapel.dmm +++ b/_maps/shuttles/shiptest/chapel.dmm @@ -2206,7 +2206,7 @@ /area/ship/hallway/starboard) "Ds" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/ash_flora/whitesands/puce, +/obj/item/reagent_containers/food/snacks/grown/ash_flora/puce, /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf, /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf, /obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit, diff --git a/_maps/shuttles/shiptest/rigger_b.dmm b/_maps/shuttles/shiptest/rigger_b.dmm index 3299ff57d9ab..6ae182174862 100644 --- a/_maps/shuttles/shiptest/rigger_b.dmm +++ b/_maps/shuttles/shiptest/rigger_b.dmm @@ -940,8 +940,8 @@ /area/ship/crew) "nv" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/ash_flora/whitesands/puce, -/obj/item/reagent_containers/food/snacks/grown/ash_flora/whitesands/puce, +/obj/item/reagent_containers/food/snacks/grown/ash_flora/puce, +/obj/item/reagent_containers/food/snacks/grown/ash_flora/puce, /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf, /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf, /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf, diff --git a/code/_onclick/hud/ghost.dm b/code/_onclick/hud/ghost.dm index 2294988bf2ce..1024fc2cd482 100644 --- a/code/_onclick/hud/ghost.dm +++ b/code/_onclick/hud/ghost.dm @@ -46,7 +46,7 @@ /atom/movable/screen/ghost/spawner_menu name = "Spawner Menu" - icon = 'whitesands/icons/mob/screen_ghost.dmi' + icon = 'icons/hud/screen_ghost.dmi' icon_state = "spawner_menu" /atom/movable/screen/ghost/spawner_menu/Click() diff --git a/code/datums/components/crafting/guncrafting.dm b/code/datums/components/crafting/guncrafting.dm index 77268cc1c706..c26b81bc41eb 100644 --- a/code/datums/components/crafting/guncrafting.dm +++ b/code/datums/components/crafting/guncrafting.dm @@ -18,5 +18,5 @@ /obj/item/weaponcrafting/silkstring name = "silkstring" desc = "A long piece of Silk that looks like a cable coil." - icon = 'whitesands/icons/obj/improvised.dmi' + icon = 'icons/obj/improvised.dmi' icon_state = "silkstring" diff --git a/code/datums/components/taped.dm b/code/datums/components/taped.dm index 5fc753676bbb..112f190c7024 100644 --- a/code/datums/components/taped.dm +++ b/code/datums/components/taped.dm @@ -43,7 +43,7 @@ taped_integrity += patch_amount tape_marks.Blend("#fff", ICON_ADD) - tape_marks.Blend(icon('whitesands/icons/obj/tapes.dmi', "[taped_icon_state]_mask"), ICON_MULTIPLY) + tape_marks.Blend(icon('icons/obj/tapes.dmi', "[taped_icon_state]_mask"), ICON_MULTIPLY) taped_icon = new(tape_marks) I.add_overlay(taped_icon) I.update_icon() diff --git a/code/datums/mapgen/Cavegens/IcemoonCaves.dm b/code/datums/mapgen/Cavegens/IcemoonCaves.dm index 95224279b452..52d4679c7bb3 100644 --- a/code/datums/mapgen/Cavegens/IcemoonCaves.dm +++ b/code/datums/mapgen/Cavegens/IcemoonCaves.dm @@ -18,7 +18,7 @@ /obj/structure/flora/rock/pile/icy = 2, /obj/structure/flora/grass/both = 6, /obj/structure/flora/ash/chilly = 2, - /obj/structure/flora/ash/whitesands/puce = 2, + /obj/structure/flora/ash/puce = 2, ) /datum/map_generator/cave_generator/icemoon/surface diff --git a/code/datums/mapgen/Cavegens/LavalandGenerator.dm b/code/datums/mapgen/Cavegens/LavalandGenerator.dm index 5dc0c7d20220..f2e5f6182b60 100644 --- a/code/datums/mapgen/Cavegens/LavalandGenerator.dm +++ b/code/datums/mapgen/Cavegens/LavalandGenerator.dm @@ -9,7 +9,7 @@ /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random = 40, /obj/structure/spawner/lavaland = 3, \ /mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30, /obj/structure/spawner/lavaland/legion = 3, \ SPAWN_MEGAFAUNA = 4, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10) - flora_spawn_list = list(/obj/structure/flora/ash/whitesands/fireblossom = 2, /obj/structure/flora/ash/whitesands/puce = 2, /obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2, /obj/structure/flora/ash/whitesands/fern = 2) + flora_spawn_list = list(/obj/structure/flora/ash/fireblossom = 2, /obj/structure/flora/ash/puce = 2, /obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2, /obj/structure/flora/ash/fern = 2) initial_closed_chance = 45 smoothing_iterations = 50 diff --git a/code/datums/mapgen/Cavegens/WhitesandsCaves.dm b/code/datums/mapgen/Cavegens/WhitesandsCaves.dm index db562f50c75f..d434494e6976 100644 --- a/code/datums/mapgen/Cavegens/WhitesandsCaves.dm +++ b/code/datums/mapgen/Cavegens/WhitesandsCaves.dm @@ -9,7 +9,7 @@ /mob/living/simple_animal/hostile/asteroid/whitesands/survivor/random = 25, /obj/structure/spawner/lavaland/legion = 3, \ SPAWN_MEGAFAUNA = 4, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10, ) - flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 4 , /obj/structure/flora/ash/cap_shroom = 4 , /obj/structure/flora/ash/stem_shroom = 4 , /obj/structure/flora/ash/cacti = 2, /obj/structure/flora/ash/tall_shroom = 4, /obj/structure/flora/ash/whitesands/fireblossom = 2, /obj/structure/flora/ash/whitesands/puce = 1) + flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 4 , /obj/structure/flora/ash/cap_shroom = 4 , /obj/structure/flora/ash/stem_shroom = 4 , /obj/structure/flora/ash/cacti = 2, /obj/structure/flora/ash/tall_shroom = 4, /obj/structure/flora/ash/fireblossom = 2, /obj/structure/flora/ash/puce = 1) initial_closed_chance = 45 smoothing_iterations = 50 diff --git a/code/game/machinery/airlock_cycle_control.dm b/code/game/machinery/airlock_cycle_control.dm index 690fe497ee1d..be9cfb429750 100644 --- a/code/game/machinery/airlock_cycle_control.dm +++ b/code/game/machinery/airlock_cycle_control.dm @@ -56,14 +56,14 @@ /obj/item/wallframe/advanced_airlock_controller name = "airlock controller frame" desc = "Used for building advanced airlock controllers." - icon = 'whitesands/icons/obj/monitors.dmi' + icon = 'icons/obj/monitors.dmi' icon_state = "aac_bitem" result_path = /obj/machinery/advanced_airlock_controller /obj/machinery/advanced_airlock_controller name = "advanced airlock controller" desc = "A machine designed to control the operation of cycling airlocks" - icon = 'whitesands/icons/obj/monitors.dmi' + icon = 'icons/obj/monitors.dmi' icon_state = "aac" use_power = IDLE_POWER_USE idle_power_usage = 4 diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index cf049f805e79..ce148c70a3f4 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -14,7 +14,7 @@ name = "cloning pod" desc = "An electronically-lockable pod for growing organic tissue." density = TRUE - icon = 'whitesands/icons/obj/machines/cloning.dmi' + icon = 'icons/obj/machines/cloning.dmi' icon_state = "pod_0" req_access = list(ACCESS_CLONING) //FOR PREMATURE UNLOCKING. verb_say = "states" diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 4fc919e0bbf4..fe7d9444c207 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -331,8 +331,8 @@ /obj/machinery/door/airlock/titanium name = "shuttle airlock" assemblytype = /obj/structure/door_assembly/door_assembly_titanium - icon = 'whitesands/icons/obj/doors/airlocks/shuttle/shuttle.dmi' - overlays_file = 'whitesands/icons/obj/doors/airlocks/shuttle/overlays.dmi' + icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' + overlays_file = 'icons/obj/doors/airlocks/shuttle/old_overlays.dmi' normal_integrity = 400 has_hatch = FALSE @@ -478,8 +478,8 @@ /obj/machinery/door/airlock/shuttle name = "shuttle airlock" - icon = 'whitesands/icons/obj/doors/airlocks/shuttle/shuttle.dmi' //WS Edit - Classic Shuttle - overlays_file = 'whitesands/icons/obj/doors/airlocks/shuttle/overlays.dmi' + icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' //WS Edit - Classic Shuttle //I'm leaving this. Your hubris will be remembered. + overlays_file = 'icons/obj/doors/airlocks/shuttle/old_overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_shuttle has_hatch = FALSE diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index f014e523edc5..478c53924ea7 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -197,31 +197,31 @@ update_freelook_sight() /obj/machinery/door/poddoor/multi_tile/four_tile_ver/ - icon = 'whitesands/icons/obj/doors/1x4blast_vert.dmi' + icon = 'icons/obj/doors/1x4blast_vert.dmi' bound_height = 128 dir = NORTH /obj/machinery/door/poddoor/multi_tile/three_tile_ver/ - icon = 'whitesands/icons/obj/doors/1x3blast_vert.dmi' + icon = 'icons/obj/doors/1x3blast_vert.dmi' bound_height = 96 dir = NORTH /obj/machinery/door/poddoor/multi_tile/two_tile_ver/ - icon = 'whitesands/icons/obj/doors/1x2blast_vert.dmi' + icon = 'icons/obj/doors/1x2blast_vert.dmi' bound_height = 64 dir = NORTH /obj/machinery/door/poddoor/multi_tile/four_tile_hor/ - icon = 'whitesands/icons/obj/doors/1x4blast_hor.dmi' + icon = 'icons/obj/doors/1x4blast_hor.dmi' bound_width = 128 dir = EAST /obj/machinery/door/poddoor/multi_tile/three_tile_hor/ - icon = 'whitesands/icons/obj/doors/1x3blast_hor.dmi' + icon = 'icons/obj/doors/1x3blast_hor.dmi' bound_width = 96 dir = EAST /obj/machinery/door/poddoor/multi_tile/two_tile_hor/ - icon = 'whitesands/icons/obj/doors/1x2blast_hor.dmi' + icon = 'icons/obj/doors/1x2blast_hor.dmi' bound_width = 64 dir = EAST diff --git a/code/game/machinery/doors/spacepod.dm b/code/game/machinery/doors/spacepod.dm index 8bdae8db384c..c0ee5cc6e896 100644 --- a/code/game/machinery/doors/spacepod.dm +++ b/code/game/machinery/doors/spacepod.dm @@ -1,7 +1,7 @@ /obj/structure/spacepoddoor name = "podlock" desc = "Why it no open!!!" - icon = 'whitesands/icons/effects/beam.dmi' + icon = 'icons/effects/beam.dmi' icon_state = "n_beam" density = 1 anchored = 1 diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index b9c5b3fc5cd1..cb9cd85dd54e 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -27,7 +27,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) /obj/machinery/requests_console name = "requests console" desc = "A console intended to send requests between different vessels and settlements in a local region." - icon = 'whitesands/icons/obj/terminals.dmi' //WS Edit - Better Icons + icon = 'icons/obj/terminals.dmi' icon_state = "req_comp0" var/department = "Unknown" //The list of all departments on the station (Determined from this variable on each unit) Set this to the same thing if you want several consoles in one department var/list/messages = list() //List of all messages diff --git a/code/game/machinery/shuttle/custom_shuttle.dm b/code/game/machinery/shuttle/custom_shuttle.dm index b47173b88331..4eecb9dec425 100644 --- a/code/game/machinery/shuttle/custom_shuttle.dm +++ b/code/game/machinery/shuttle/custom_shuttle.dm @@ -4,7 +4,7 @@ density = TRUE obj_integrity = 250 max_integrity = 250 - icon = 'whitesands/icons/obj/shuttle.dmi' + icon = 'icons/obj/shuttle.dmi' icon_state = "burst_plasma" circuit = /obj/item/circuitboard/machine/shuttle/engine var/icon_state_closed = "burst_plasma" diff --git a/code/game/machinery/shuttle/shuttle_engine_types.dm b/code/game/machinery/shuttle/shuttle_engine_types.dm index 6b72df941750..9a9f4eec845c 100644 --- a/code/game/machinery/shuttle/shuttle_engine_types.dm +++ b/code/game/machinery/shuttle/shuttle_engine_types.dm @@ -126,7 +126,7 @@ /obj/machinery/power/smes/shuttle name = "electric engine precharger" desc = "A medium-capacity, high transfer superconducting magnetic energy storage unit specially made for use with shuttle engines." - icon = 'whitesands/icons/obj/shuttle.dmi' + icon = 'icons/obj/shuttle.dmi' input_level = 0 input_level_max = 50000 output_level = 50000 diff --git a/code/game/machinery/shuttle/shuttle_heater.dm b/code/game/machinery/shuttle/shuttle_heater.dm index be9ad55eb5d8..1862c3728e2f 100644 --- a/code/game/machinery/shuttle/shuttle_heater.dm +++ b/code/game/machinery/shuttle/shuttle_heater.dm @@ -8,7 +8,7 @@ name = "shuttle atmospherics device" desc = "This does something to do with shuttle atmospherics" icon_state = "heater" - icon = 'whitesands/icons/obj/shuttle.dmi' + icon = 'icons/obj/shuttle.dmi' /obj/machinery/atmospherics/components/unary/shuttle/heater name = "engine heater" diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm index f14408350d62..67eafc2e6e94 100644 --- a/code/game/objects/effects/decals/decal.dm +++ b/code/game/objects/effects/decals/decal.dm @@ -32,7 +32,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /obj/effect/turf_decal - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "warningline" layer = TURF_DECAL_LAYER var/detail_overlay diff --git a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm index fd79571f106b..daf0010f0cbe 100644 --- a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm +++ b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm @@ -722,5 +722,5 @@ TURF_DECAL_COLOR_HELPER(transparent/inteqbrown, "#4b2a18", 140) /obj/effect/turf_decal/solgov //Credit to baystation for these sprites! alpha = 230 - icon = 'whitesands/icons/obj/solgov_floor.dmi' + icon = 'icons/obj/solgov_floor.dmi' icon_state = "center" diff --git a/code/game/objects/effects/decals/turfdecal/markings.dm b/code/game/objects/effects/decals/turfdecal/markings.dm index 2b2d7b90b966..1d08a7c84f75 100644 --- a/code/game/objects/effects/decals/turfdecal/markings.dm +++ b/code/game/objects/effects/decals/turfdecal/markings.dm @@ -230,113 +230,113 @@ icon_state = "s3,3" /obj/effect/turf_decal/atmos/oxygen - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "oxygen" /obj/effect/turf_decal/atmos/carbon_dioxide - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "carbon_dioxide" /obj/effect/turf_decal/atmos/nitrogen - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "nitrogen" /obj/effect/turf_decal/atmos/air - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "air" /obj/effect/turf_decal/atmos/nitrous_oxide - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "nitrous_oxide" /obj/effect/turf_decal/atmos/plasma - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "plasma" /obj/effect/turf_decal/atmos/mix - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "mix" /obj/effect/turf_decal/number/one - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "1" /obj/effect/turf_decal/number/two - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "2" /obj/effect/turf_decal/number/three - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "3" /obj/effect/turf_decal/number/four - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "4" /obj/effect/turf_decal/number/five - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "5" /obj/effect/turf_decal/number/six - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "6" /obj/effect/turf_decal/number/seven - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "7" /obj/effect/turf_decal/number/eight - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "8" /obj/effect/turf_decal/number/nine - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "9" /obj/effect/turf_decal/number/zero - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "0" /obj/effect/turf_decal/dept/hop - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "hop" /obj/effect/turf_decal/dept/bar - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "bar" /obj/effect/turf_decal/dept/cargo - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "cargo" /obj/effect/turf_decal/dept/medical - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "med" /obj/effect/turf_decal/dept/science - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "sci" /obj/effect/turf_decal/dept/security - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "sec" /obj/effect/turf_decal/dept/mining - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "mine" /obj/effect/turf_decal/zoo - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "zoo" /obj/effect/turf_decal/no - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "no" /obj/effect/turf_decal/radiation - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "radiation" /obj/effect/turf_decal/radiation/white - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "radiation-w" diff --git a/code/game/objects/effects/radiation.dm b/code/game/objects/effects/radiation.dm index 17eb05da721f..b1b03884106e 100644 --- a/code/game/objects/effects/radiation.dm +++ b/code/game/objects/effects/radiation.dm @@ -1,6 +1,6 @@ /obj/effect/radiation name = "background radiation" - icon = 'whitesands/icons/effects/effects.dmi' + icon = 'icons/effects/effects.dmi' icon_state = "radiation" invisibility = INVISIBILITY_ABSTRACT var/rad_power = 33 diff --git a/code/game/objects/effects/spawners/structure.dm b/code/game/objects/effects/spawners/structure.dm index 54790c7cc4ca..cd2a3d7cc134 100644 --- a/code/game/objects/effects/spawners/structure.dm +++ b/code/game/objects/effects/spawners/structure.dm @@ -365,7 +365,7 @@ again. //shutter windows /obj/effect/spawner/structure/window/shutters - icon = 'whitesands/icons/obj/structures_spawners.dmi' + icon = 'icons/obj/structures_spawners.dmi' icon_state = "shwindow_spawner" name = "shutter window spawner" spawn_list = list(/obj/structure/grille, /obj/structure/window/fulltile, /obj/machinery/door/firedoor/window) @@ -376,18 +376,18 @@ again. /obj/effect/spawner/structure/window/reinforced/shutters name = "reinforced shutter window spawner" - icon = 'whitesands/icons/obj/structures_spawners.dmi' + icon = 'icons/obj/structures_spawners.dmi' icon_state = "shrwindow_spawner" spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/machinery/door/firedoor/window) /obj/effect/spawner/structure/window/reinforced/tinted/shutters name = "tinted reinforced shutter window spawner" - icon = 'whitesands/icons/obj/structures_spawners.dmi' + icon = 'icons/obj/structures_spawners.dmi' icon_state = "shtwindow_spawner" spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/tinted/fulltile, /obj/machinery/door/firedoor/window) /obj/effect/spawner/structure/window/plasma/reinforced/shutters name = "reinforced plasma shutter window spawner" - icon = 'whitesands/icons/obj/structures_spawners.dmi' + icon = 'icons/obj/structures_spawners.dmi' icon_state = "shprwindow_spawner" spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/fulltile, /obj/machinery/door/firedoor/window) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 6ec916533d71..f49003a3bf23 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -15,7 +15,7 @@ /obj/item/card name = "card" desc = "Does card things." - icon = 'whitesands/icons/obj/card.dmi' //WS Edit - Actually good-looking IDs >:) + icon = 'icons/obj/card.dmi' w_class = WEIGHT_CLASS_TINY var/list/files = list() diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 45a95d1ae0e5..1b64e134b53f 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -769,7 +769,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/lighter/clockwork //WS edit: Clockwork Zippo, by Tergius. PR #395 name = "bronze zippo" desc = "A zippo plated with brass. I mean bronze. Has a neat red flame!" - icon = 'whitesands/icons/obj/cigarettes.dmi' + icon = 'icons/obj/cigarettes.dmi' icon_state = "clockworklighter" heat = 2000 //?????????????????? light_color = LIGHT_COLOR_BLOOD_MAGIC diff --git a/code/game/objects/items/decal_painter.dm b/code/game/objects/items/decal_painter.dm index 4dace1b5a302..79dd0b695e7a 100644 --- a/code/game/objects/items/decal_painter.dm +++ b/code/game/objects/items/decal_painter.dm @@ -3,7 +3,7 @@ /obj/item/floor_painter name = "floor painter" - icon = 'whitesands/icons/obj/device.dmi' + icon = 'icons/obj/device.dmi' pickup_sound = 'sound/items/handling/device_pickup.ogg' drop_sound = 'sound/items/handling/device_drop.ogg' icon_state = "floor_sprayer" @@ -45,7 +45,7 @@ /obj/item/floor_painter/interact(mob/user as mob) //TODO: Make TGUI for this because ouch if(!floor_icon) - floor_icon = icon('whitesands/icons/turf/floors/tiles.dmi', floor_state, floor_dir) + floor_icon = icon('icons/turf/floors/tiles.dmi', floor_state, floor_dir) user << browse_rsc(floor_icon, "floor.png") var/dat = {"
@@ -109,16 +109,16 @@ floor_state = allowed_states[index] check_directional_tile() - floor_icon = icon('whitesands/icons/turf/floors/tiles.dmi', floor_state, floor_dir) + floor_icon = icon('icons/turf/floors/tiles.dmi', floor_state, floor_dir) if(usr) attack_self(usr) /obj/item/floor_painter/proc/check_directional_tile() - var/icon/current = icon('whitesands/icons/turf/floors/tiles.dmi', floor_state, NORTHWEST) + var/icon/current = icon('icons/turf/floors/tiles.dmi', floor_state, NORTHWEST) if(current.GetPixel(1,1) != null) allowed_directions = GLOB.alldirs else - current = icon('whitesands/icons/turf/floors/tiles.dmi', floor_state, WEST) + current = icon('icons/turf/floors/tiles.dmi', floor_state, WEST) if(current.GetPixel(1,1) != null) allowed_directions = GLOB.cardinals else @@ -199,9 +199,9 @@ to_chat(user, "\The [src] can only be used on flooring.") return if(color_disallowed.Find(decal_state)) - F.AddComponent(/datum/component/decal, 'whitesands/icons/turf/decals.dmi', decal_state, decal_dir, CLEAN_TYPE_PAINT, color, null, null, alpha) + F.AddComponent(/datum/component/decal, 'icons/turf/decals.dmi', decal_state, decal_dir, CLEAN_TYPE_PAINT, color, null, null, alpha) else - F.AddComponent(/datum/component/decal, 'whitesands/icons/turf/decals.dmi', decal_state, decal_dir, CLEAN_TYPE_PAINT, decal_color, null, null, alpha) + F.AddComponent(/datum/component/decal, 'icons/turf/decals.dmi', decal_state, decal_dir, CLEAN_TYPE_PAINT, decal_color, null, null, alpha) playsound(src.loc, 'sound/effects/spray2.ogg', 50, TRUE) /obj/item/decal_painter/attack_self(mob/user) @@ -213,7 +213,7 @@ /obj/item/decal_painter/interact(mob/user as mob) //TODO: Make TGUI for this because ouch if(!decal_icon) - decal_icon = icon('whitesands/icons/turf/decals.dmi', decal_state, decal_dir) + decal_icon = icon('icons/turf/decals.dmi', decal_state, decal_dir) user << browse_rsc(decal_icon, "floor.png") var/dat = {"
@@ -286,7 +286,7 @@ decal_color = chosen_colour - decal_icon = icon('whitesands/icons/turf/decals.dmi', decal_state, decal_dir) + decal_icon = icon('icons/turf/decals.dmi', decal_state, decal_dir) if(usr) attack_self(usr) diff --git a/code/game/objects/items/desk_flags.dm b/code/game/objects/items/desk_flags.dm index 203bdc550b6f..3ac3418209e0 100644 --- a/code/game/objects/items/desk_flags.dm +++ b/code/game/objects/items/desk_flags.dm @@ -1,7 +1,7 @@ /obj/item/desk_flag name = "flag" desc = "Show your patriotism with WaffleCo. brand desk flags!" - icon = 'whitesands/icons/obj/flags.dmi' + icon = 'icons/obj/flags.dmi' icon_state = "flag" force = 3 throwforce = 2 diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index a4ebd412fdab..1f1441911f1d 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -14,7 +14,7 @@ GLOBAL_LIST_EMPTY(PDAs) /obj/item/pda name = "\improper PDA" desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge." - icon = 'whitesands/icons/obj/pda.dmi' //WS Edit - Better PDAs from Eris(?) + icon = 'icons/obj/pda.dmi' icon_state = "pda" item_state = "electronic" lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm index ae051b716dd0..f9399a8f40c4 100644 --- a/code/game/objects/items/devices/geiger_counter.dm +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -11,11 +11,11 @@ /obj/item/geiger_counter //DISCLAIMER: I know nothing about how real-life Geiger counters work. This will not be realistic. ~Xhuis name = "\improper Geiger counter" desc = "A handheld device used for detecting and measuring radiation pulses." - icon = 'whitesands/icons/obj/tools.dmi' //WS begin - Better tool sprites + icon = 'icons/obj/tools.dmi' icon_state = "geiger_off" item_state = "geiger" - lefthand_file = 'whitesands/icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'whitesands/icons/mob/inhands/equipment/tools_righthand.dmi' //WS end + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' //WS end w_class = WEIGHT_CLASS_SMALL slot_flags = ITEM_SLOT_BELT item_flags = NOBLUDGEON diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 442f9d084d47..0225a9077a61 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -13,10 +13,10 @@ /obj/item/multitool name = "multitool" desc = "Used for pulsing wires to test which to cut. Not recommended by doctors." - icon = 'whitesands/icons/obj/tools.dmi' //WS Edit - Better Tool Sprites + icon = 'icons/obj/tools.dmi' icon_state = "multitool" - lefthand_file = 'whitesands/icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'whitesands/icons/mob/inhands/equipment/tools_righthand.dmi' + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' force = 5 w_class = WEIGHT_CLASS_SMALL tool_behaviour = TOOL_MULTITOOL @@ -183,5 +183,6 @@ /obj/item/multitool/old desc = "Used for pulsing wires to test which to cut. This one looks... 'retro'. It wasn't recommended by doctors then and won't be recommended by doctors now." icon = 'icons/obj/device.dmi' + icon_state = "hypertool" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 1b39eecee57b..ba4d77abb8ec 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -21,7 +21,7 @@ GENE SCANNER name = "\improper T-ray scanner" desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes." custom_price = 150 - icon = 'whitesands/icons/obj/tools.dmi' + icon = 'icons/obj/tools.dmi' icon_state = "t-ray0" var/on = FALSE slot_flags = ITEM_SLOT_BELT @@ -416,7 +416,7 @@ GENE SCANNER desc = "A hand-held environmental scanner which reports current gas levels. Alt-Click to use the built in barometer function." name = "analyzer" custom_price = 100 - icon = 'whitesands/icons/obj/tools.dmi' //WS edit - Better tools + icon = 'icons/obj/tools.dmi' icon_state = "analyzer" item_state = "analyzer" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' diff --git a/code/game/objects/items/fireaxe.dm b/code/game/objects/items/fireaxe.dm index 7ff0a5088f02..9087ef2aab2e 100644 --- a/code/game/objects/items/fireaxe.dm +++ b/code/game/objects/items/fireaxe.dm @@ -65,7 +65,7 @@ icon_state = "bone_axe0" name = "bone axe" desc = "A large, vicious axe crafted out of several sharpened bone plates and crudely tied together. Made of monsters, by killing monsters, for killing monsters." - icon = 'whitesands/icons/obj/items_and_weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' /obj/item/fireaxe/boneaxe/ComponentInitialize() . = ..() diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index 61ca566efa5f..8982cca96c40 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -417,6 +417,6 @@ /obj/item/restraints/legcuffs/bola/watcher //tribal bola for tribal lizards name = "watcher Bola" desc = "A Bola made from the stretchy sinew of fallen watchers." - icon = 'whitesands/icons/obj/items_and_weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "bola_watcher" breakouttime = 45 diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index d3cf2ec5da9f..b1ffb655f257 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -261,10 +261,10 @@ /obj/item/melee/transforming/energy/ctf name = "energy sword" desc = "That cable over there, I'm going to cut it." - icon = 'whitesands/icons/obj/items_and_weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "plasmasword0" - lefthand_file = 'whitesands/icons/mob/inhands/weapons/swords_lefthand.dmi' - righthand_file = 'whitesands/icons/mob/inhands/weapons/swords_righthand.dmi' + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' sharpness = IS_SHARP armour_penetration = 200 block_chance = 0 @@ -286,5 +286,5 @@ force_on = 34 //desword grade, but 0 blocking /obj/item/melee/transforming/energy/ctf/transform_messages(mob/living/user, supress_message_text) - playsound(user, active ? 'whitesands/sound/weapons/SolGov_sword_arm.ogg' : 'sound/weapons/saberoff.ogg', 35, TRUE) + playsound(user, active ? 'sound/weapons/SolGov_sword_arm.ogg' : 'sound/weapons/saberoff.ogg', 35, TRUE) to_chat(user, "[src] [active ? "is now active":"can now be concealed"].") diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 66ece04bcaae..47da7aa09163 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -664,7 +664,7 @@ /obj/item/melee/greykingsword name = "blade of the grey-king" desc = "A legendary sword made with 3 replica katanas nailed together and dipped in heavy narcotics." - icon = 'whitesands/icons/obj/items_and_weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "grey_sword" item_state = "swordoff" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' @@ -719,7 +719,7 @@ /obj/item/kitchen/knife/letter_opener name = "letter opener" - icon = 'whitesands/icons/obj/items_and_weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "letter_opener" desc = "A military combat utility survival knife." embedding = list("pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE) @@ -732,11 +732,11 @@ /obj/item/melee/weebstick name = "Weeb Stick" desc = "Glorious nippon steel, folded 1000 times." - icon = 'whitesands/icons/obj/items_and_weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "weeb_blade" item_state = "weeb_blade" - lefthand_file = 'whitesands/icons/mob/inhands/weapons/swords_lefthand.dmi' - righthand_file = 'whitesands/icons/mob/inhands/weapons/swords_righthand.dmi' + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' pickup_sound = 'sound/items/handling/knife2_pickup.ogg' drop_sound = 'sound/items/handling/metal_drop.ogg' flags_1 = CONDUCT_1 @@ -750,7 +750,7 @@ throwforce = 12 block_chance = 40 armour_penetration = 50 - hitsound = 'whitesands/sound/weapons/anime_slash.ogg' + hitsound = 'sound/weapons/anime_slash.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "diced", "cut") /obj/item/melee/weebstick/Initialize() @@ -782,14 +782,14 @@ /obj/item/storage/belt/weebstick name = "nanoforged blade sheath" desc = "It yearns to bath in the blood of your enemies... but you hold it back!" - icon = 'whitesands/icons/obj/items_and_weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "weeb_sheath" item_state = "sheath" w_class = WEIGHT_CLASS_BULKY force = 3 var/primed = FALSE //Prerequisite to anime bullshit // ##The anime bullshit## - Mostly stolen from action/innate/dash - var/dash_sound = 'whitesands/sound/weapons/unsheathed_blade.ogg' + var/dash_sound = 'sound/weapons/unsheathed_blade.ogg' var/beam_effect = "blood_beam" var/phasein = /obj/effect/temp_visual/dir_setting/cult/phase var/phaseout = /obj/effect/temp_visual/dir_setting/cult/phase @@ -871,7 +871,7 @@ var/turf/tile = T for(var/mob/living/victim in tile) if(victim != user) - playsound(victim, 'whitesands/sound/weapons/anime_slash.ogg', 10, TRUE) + playsound(victim, 'sound/weapons/anime_slash.ogg', 10, TRUE) victim.take_bodypart_damage(15) // Unlike actual ninjas, we stop noclip-dashing here. if(isclosedturf(T)) diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm index 751f762e8b5f..4111d9491e1b 100644 --- a/code/game/objects/items/pinpointer.dm +++ b/code/game/objects/items/pinpointer.dm @@ -220,7 +220,7 @@ /obj/item/pinpointer/deepcore name = "dual mining scanner" desc = "A handheld dowsing utility for locating material deep beneath the surface and on the surface. Alt-Click to change modes." - icon = 'whitesands/icons/obj/mining.dmi' + icon = 'icons/obj/mining.dmi' icon_state = "mining" custom_price = 300 custom_premium_price = 300 diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 55dde7bc388d..fbaffcd84b58 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -667,10 +667,10 @@ /obj/item/toy/plush/hornet name = "strange bug plushie" desc = "A cute, soft plush of a long-horned bug." - icon = 'whitesands/icons/obj/plushes.dmi' + icon = 'icons/obj/plushes.dmi' icon_state = "plushie_hornet" attack_verb = list("poked", "shaws") - squeak_override = list('whitesands/sound/hornetnoises/hornet_gitgud.ogg'=1, 'whitesands/sound/hornetnoises/hornet_SHAW.ogg'=10) //i have no clue how this works, the intended effect is that "git gud" will play 1 out of 11 times + squeak_override = list('sound/hornetnoises/hornet_gitgud.ogg'=1, 'sound/hornetnoises/hornet_SHAW.ogg'=10) //i have no clue how this works, the intended effect is that "git gud" will play 1 out of 11 times gender = FEMALE /obj/item/toy/plush/hornet/gay @@ -681,7 +681,7 @@ /obj/item/toy/plush/knight name = "odd bug plushie" desc = "A cute, soft plush of a little bug. It sounds like this one didn't come with a voice box." - icon = 'whitesands/icons/obj/plushes.dmi' + icon = 'icons/obj/plushes.dmi' icon_state = "plushie_knight" attack_verb = list("poked") should_squeak = FALSE @@ -689,10 +689,10 @@ /obj/item/toy/plush/among name = "amoung pequeño" desc = "A little pill shaped guy, with a price tag of 3€." - icon = 'whitesands/icons/obj/plushes.dmi' + icon = 'icons/obj/plushes.dmi' icon_state = "plushie_among" attack_verb = list("killed","stabbed","shot","slapped","stung", "ejected") - squeak_override = list('whitesands/sound/hornetnoises/agoguskill.ogg') + squeak_override = list('sound/hornetnoises/agoguskill.ogg') var/random_among = TRUE //if the (among) uses random coloring var/rare_among = 1 //chance for rare color variant diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index 7bd89b574bb6..991277d7d819 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -282,9 +282,9 @@ name = "Goliath shield" desc = "A shield made from interwoven plates of goliath hide." icon_state = "goliath_shield" - icon = 'whitesands/icons/obj/shields.dmi' - lefthand_file = 'whitesands/icons/mob/inhands/equipment/shields_lefthand.dmi' - righthand_file = 'whitesands/icons/mob/inhands/equipment/shields_righthand.dmi' + icon = 'icons/obj/shields.dmi' + lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' mob_overlay_icon = 'icons/mob/clothing/back.dmi' custom_materials = list() transparent = FALSE diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm index ea24249ae9fd..0639f0630de7 100644 --- a/code/game/objects/items/spear.dm +++ b/code/game/objects/items/spear.dm @@ -163,9 +163,9 @@ icon_state = "bone_spear0" name = "bone spear" desc = "A haphazardly-constructed yet still deadly weapon. The pinnacle of modern technology." - icon = 'whitesands/icons/obj/items_and_weapons.dmi' - lefthand_file = 'whitesands/icons/mob/inhands/weapons/polearms_lefthand.dmi' - righthand_file = 'whitesands/icons/mob/inhands/weapons/polearms_righthand.dmi' + icon = 'icons/obj/items_and_weapons.dmi' + lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi' mob_overlay_icon = 'icons/mob/clothing/back.dmi' force = 12 throwforce = 22 @@ -242,9 +242,9 @@ icon_state = "crystal_spear0" name = "crystal spear" desc = "While more 'sharp stick' than spear, this thing is extremely dangerous neverless. Crafted out of the mysterous crystals, it can hit for very high damage, although it will break with repeated use." - icon = 'whitesands/icons/obj/items_and_weapons.dmi' - lefthand_file = 'whitesands/icons/mob/inhands/weapons/polearms_lefthand.dmi' - righthand_file = 'whitesands/icons/mob/inhands/weapons/polearms_righthand.dmi' + icon = 'icons/obj/items_and_weapons.dmi' + lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi' mob_overlay_icon = 'icons/mob/clothing/back.dmi' force = 12 throwforce = 40 diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 0f2f29c61c4e..511eb82f67d8 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -390,7 +390,7 @@ desc = "Used to secure limbs following a fracture." gender = PLURAL singular_name = "splint" - icon = 'whitesands/icons/obj/items_and_weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "splint" apply_sounds = list('sound/effects/rip1.ogg', 'sound/effects/rip2.ogg') self_delay = 40 diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index ad2137d3643a..eb39dde285a1 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -385,7 +385,7 @@ GLOBAL_LIST_INIT(silk_recipes, list ( \ name = "silk" desc = "A long soft material. This one is made from cotton rather than spidersilk." singular_name = "Silk Sheet" - icon = 'whitesands/icons/obj/stack_objects.dmi' + icon = 'icons/obj/stack_objects.dmi' icon_state = "sheet-silk" novariants = TRUE merge_type = /obj/item/stack/sheet/silk diff --git a/code/game/objects/items/stacks/tape.dm b/code/game/objects/items/stacks/tape.dm index 9c0461a2913f..5aa42bb0b4c6 100644 --- a/code/game/objects/items/stacks/tape.dm +++ b/code/game/objects/items/stacks/tape.dm @@ -72,13 +72,13 @@ name = "packaging tape" singular_name = "tape strip" desc = "Sticks things together with minimal effort." - icon = 'whitesands/icons/obj/tapes.dmi' + icon = 'icons/obj/tapes.dmi' icon_state = "tape" item_flags = NOBLUDGEON | NO_MAT_REDEMPTION amount = 10 max_amount = 10 grind_results = list(/datum/reagent/cellulose = 5) - usesound = 'whitesands/sound/items/tape.ogg' + usesound = 'sound/items/tape.ogg' var/stop_bleed = 600 var/nonorganic_heal = 5 diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index dc1dad787e24..8dd26d622235 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -292,7 +292,7 @@ /obj/item/stack/tile/carpet/nanoweave name = "nanoweave carpet" - icon = 'whitesands/icons/obj/tiles.dmi' + icon = 'icons/obj/tiles.dmi' desc = "A piece of nanoweave carpet." icon_state = "dark_carpet_tile" custom_materials = list(/datum/material/iron=500, /datum/material/plasma=500) //basically tiles made of plasteel diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 0b034925ff97..4d62dee2b697 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -231,7 +231,7 @@ /obj/item/storage/backpack/satchel/leather name = "leather satchel" desc = "It's a very fancy satchel made with fine leather." - icon = 'whitesands/icons/obj/storage.dmi' //WS Edit - Suitcases + icon = 'icons/obj/storage.dmi' //WS Edit - Suitcases icon_state = "satchel" item_state = "satchel" @@ -346,7 +346,7 @@ /obj/item/storage/backpack/messenger name = "messenger bag" desc = "A sturdy backpack worn over one shoulder." - icon = 'whitesands/icons/obj/storage.dmi' + icon = 'icons/obj/storage.dmi' mob_overlay_icon = 'icons/mob/clothing/back.dmi' icon_state = "courierbag" item_state = "courierbag" diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 1c38ac3b4b8a..b2bfcb16891a 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -101,7 +101,7 @@ name = "mining satchel" desc = "This little bugger can be used to store and transport ores." //WS Begin - Better bag sprites - icon = 'whitesands/icons/obj/bags.dmi' + icon = 'icons/obj/bags.dmi' icon_state = "minebag" //WS end slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_POCKETS @@ -173,7 +173,7 @@ name = "mining satchel of holding" desc = "A revolution in convenience, this satchel allows for huge amounts of ore storage. It's been outfitted with anti-malfunction safety measures." //WS Begin - Better bag sprites - icon = 'whitesands/icons/obj/bags.dmi' + icon = 'icons/obj/bags.dmi' icon_state = "minebagbs" //WS end @@ -191,7 +191,7 @@ /obj/item/storage/bag/plants name = "plant bag" //WS Begin - Better bag sprites - icon = 'whitesands/icons/obj/bags.dmi' + icon = 'icons/obj/bags.dmi' icon_state = "plantbag" //WS end resistance_flags = FLAMMABLE @@ -296,7 +296,7 @@ /obj/item/storage/bag/medical name = "medicine bag" - icon = 'whitesands/icons/obj/bags.dmi' + icon = 'icons/obj/bags.dmi' icon_state = "medbag" desc = "A bag for storing syringes, sutures, ointments, and pills." w_class = WEIGHT_CLASS_NORMAL @@ -390,7 +390,7 @@ /obj/item/storage/bag/chemistry name = "chemistry bag" //WS Begin - Better bag sprites - icon = 'whitesands/icons/obj/bags.dmi' + icon = 'icons/obj/bags.dmi' icon_state = "chembag" //WS end desc = "A bag for storing pills, patches, and bottles." @@ -420,7 +420,7 @@ /obj/item/storage/bag/bio name = "bio bag" //WS Begin - Better bag sprites - icon = 'whitesands/icons/obj/bags.dmi' + icon = 'icons/obj/bags.dmi' icon_state = "virobag" //WS end desc = "A bag for the safe transportation and disposal of biowaste and other biological materials." @@ -453,7 +453,7 @@ /obj/item/storage/bag/construction name = "construction bag" //WS Begin - Better bag sprites - icon = 'whitesands/icons/obj/bags.dmi' + icon = 'icons/obj/bags.dmi' icon_state = "engbag" //WS end desc = "A bag for storing small construction components." @@ -483,7 +483,7 @@ /obj/item/storage/bag/construction/holding name = "construction bag of holding" - icon = 'whitesands/icons/obj/bags.dmi' + icon = 'icons/obj/bags.dmi' icon_state = "engibs" desc = "A bag for storing construction equipment. With the help of bluespace, you'll be building more airlocks and cameras then ever before." slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_POCKETS @@ -496,7 +496,7 @@ /obj/item/storage/bag/plants/holding name = "harvest carrier of holding" - icon = 'whitesands/icons/obj/bags.dmi' + icon = 'icons/obj/bags.dmi' icon_state = "plantbs" desc = "A bag for storing agricultural goods, augmented with bluespace technology. A glorious melon-carrying chariot, worthy of a true botanist." slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_POCKETS @@ -509,7 +509,7 @@ /obj/item/storage/bag/chemistry/holding name = "chemistry satchel of holding" - icon = 'whitesands/icons/obj/bags.dmi' + icon = 'icons/obj/bags.dmi' icon_state = "chembs" desc = "A bag for storing varied chemical goods, optimized with bluespace technology to allow the resident chemist to carry their entire lab around with them." slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_POCKETS @@ -522,7 +522,7 @@ /obj/item/storage/bag/bio/holding name = "biohazard container of holding" - icon = 'whitesands/icons/obj/bags.dmi' + icon = 'icons/obj/bags.dmi' icon_state = "biobagbs" desc = "A bag designed to safely contain biologically-hazardous objects. This bag has been outfitted with a bluespace storage well, and can carry considerably more then it's actual size." slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_POCKETS diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 423d0ba39631..b1010c3241d2 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -265,7 +265,7 @@ /obj/item/storage/box/hypospray name = "hypospray mk. II kit" - icon = 'whitesands/icons/obj/storage.dmi' //WS Edit - Suitcases + icon = 'icons/obj/storage.dmi' //WS Edit - Suitcases icon_state = "medbriefcase" illustration = null @@ -901,7 +901,7 @@ /obj/item/storage/box/slugshot name = "box of 12-gauge slug shotgun shells" desc = "a box full of slug shots, designed for riot shotguns" - icon = 'whitesands/icons/obj/storage.dmi' + icon = 'icons/obj/storage.dmi' icon_state = "slugshot_box" illustration = null diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm index a70c3081438d..895b94acf574 100644 --- a/code/game/objects/items/storage/briefcase.dm +++ b/code/game/objects/items/storage/briefcase.dm @@ -1,7 +1,7 @@ /obj/item/storage/briefcase name = "briefcase" desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional." - icon = 'whitesands/icons/obj/storage.dmi' //WS edit - Better briefcases + icon = 'icons/obj/storage.dmi' //WS edit - Better briefcases icon_state = "briefcase" lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi' diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 7e79fae5f9fe..2e373874cd55 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -11,7 +11,7 @@ /obj/item/storage/firstaid name = "first-aid kit" desc = "It's an emergency medical kit for those serious boo-boos." - icon = 'whitesands/icons/obj/storage.dmi' + icon = 'icons/obj/storage.dmi' icon_state = "firstaid" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index 69f0b886ab8e..505db0812137 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -3,7 +3,7 @@ desc = "A locked box." icon_state = "lockbox+l" item_state = "syringe_kit" - icon = 'whitesands/icons/obj/storage.dmi' //WS edit - better briefcases + icon = 'icons/obj/storage.dmi' //WS edit - better briefcases lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' w_class = WEIGHT_CLASS_BULKY diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 53cbaf338349..1275c3865c42 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -117,7 +117,7 @@ // ----------------------------- /obj/item/storage/secure/briefcase name = "secure briefcase" - icon = 'whitesands/icons/obj/storage.dmi' //WS edit - better briefcases + icon = 'icons/obj/storage.dmi' //WS edit - better briefcases icon_state = "secure" item_state = "sec-case" lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi' diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index b3824f2c75e8..bcd087b85c45 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -1,10 +1,10 @@ /obj/item/crowbar name = "pocket crowbar" desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors." - icon = 'whitesands/icons/obj/tools.dmi' //WS Edit - Better Tool Sprites + icon = 'icons/obj/tools.dmi' icon_state = "crowbar" - lefthand_file = 'whitesands/icons/mob/inhands/equipment/tools_lefthand.dmi' //WS edit: i finally do those god forsaken inhands - righthand_file = 'whitesands/icons/mob/inhands/equipment/tools_righthand.dmi' + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' usesound = 'sound/items/crowbar.ogg' flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT @@ -121,3 +121,4 @@ /obj/item/crowbar/old desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors. This one seems to be covered in dust." icon = 'icons/obj/tools.dmi' + icon_state = "oldcrowbar" diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index f503e959df28..dc47ace2d2ce 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -1,7 +1,7 @@ /obj/item/screwdriver name = "screwdriver" desc = "You can be totally screwy with this." - icon = 'whitesands/icons/obj/tools.dmi' //WS Edit - Better Tool Sprites + icon = 'icons/obj/tools.dmi' icon_state = "screwdriver_map" item_state = "screwdriver" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' @@ -139,3 +139,4 @@ /obj/item/screwdriver/old desc = "You can be totally screwy with this. Well, if the end wasn't so rusty." icon = 'icons/obj/tools.dmi' + icon_state = "oldscrewdriver" diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index d33c5afb75b9..f1503957ff23 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -2,7 +2,7 @@ /obj/item/weldingtool name = "welding tool" desc = "A standard welder, used for cutting through metal." - icon = 'whitesands/icons/obj/tools.dmi' //WS Edit - Better Tool Sprites + icon = 'icons/obj/tools.dmi' icon_state = "welder" item_state = "welder" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' @@ -396,5 +396,6 @@ /obj/item/weldingtool/old desc = "A standard edition welder provided by Nanotrasen. This one seems to leak a little bit." icon = 'icons/obj/tools.dmi' + icon_state = "oldwelder" #undef WELDER_FUEL_BURN_INTERVAL diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index 9a966db5c44a..246d6b31855d 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -1,7 +1,7 @@ /obj/item/wirecutters name = "wirecutters" desc = "This cuts wires." - icon = 'whitesands/icons/obj/tools.dmi' //WS Edit - Better Tool Sprites + icon = 'icons/obj/tools.dmi' icon_state = "cutters_map" item_state = "cutters" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' @@ -104,3 +104,4 @@ /obj/item/wirecutters/old desc = "This cuts wires. It also appears to be slightly rusty..." icon = 'icons/obj/tools.dmi' + icon_state = "oldcutters" diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm index f490f4a08df2..f9d36d30d8ff 100644 --- a/code/game/objects/items/tools/wrench.dm +++ b/code/game/objects/items/tools/wrench.dm @@ -1,10 +1,10 @@ /obj/item/wrench name = "wrench" desc = "A wrench with common uses. Can be found in your hand. This one is a pipe wrench." - icon = 'whitesands/icons/obj/tools.dmi' + icon = 'icons/obj/tools.dmi' icon_state = "wrench_pipe" //now where could my pipe wrench be? - lefthand_file = 'whitesands/icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'whitesands/icons/mob/inhands/equipment/tools_righthand.dmi' + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT force = 5 @@ -135,6 +135,4 @@ /obj/item/wrench/old desc = "A wrench with common uses. Can be found in your hand. This one seems ancient!" icon = 'icons/obj/tools.dmi' - icon_state = "wrench" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + icon_state = "oldwrench" diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index f500f5ab6389..86843c261dcd 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -1074,9 +1074,9 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 desc = "Jagged pieces of bone are tied to what looks like a goliaths femur." icon_state = "bone_sword" item_state = "bone_sword" - icon = 'whitesands/icons/obj/items_and_weapons.dmi' - lefthand_file = 'whitesands/icons/mob/inhands/weapons/swords_lefthand.dmi' - righthand_file = 'whitesands/icons/mob/inhands/weapons/swords_righthand.dmi' + icon = 'icons/obj/items_and_weapons.dmi' + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' mob_overlay_icon = 'icons/mob/clothing/back.dmi' force = 15 throwforce = 10 diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm index df56b93dfcd1..4b4f089b43c3 100644 --- a/code/game/objects/structures/catwalk.dm +++ b/code/game/objects/structures/catwalk.dm @@ -1,7 +1,7 @@ /obj/structure/catwalk name = "catwalk" desc = "A catwalk for easier EVA maneuvering and cable placement." - icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi' + icon = 'icons/obj/smooth_structures/more_catwalk.dmi' icon_state = "catwalk" base_icon_state = "catwalk" density = FALSE @@ -45,7 +45,7 @@ var/turf/open/floor/turf_type = initial(plated_tile.turf_type) smoothing_flags &= ~SMOOTH_BITMASK SSicon_smooth.remove_from_queues(src) - var/image/I = image('whitesands/icons/obj/catwalks.dmi', "plated") + var/image/I = image('icons/obj/smooth_structures/more_catwalk.dmi', "plated") I.color = initial(turf_type.color) overlays += I else diff --git a/code/game/objects/structures/crates_lockers/closets/wallmount.dm b/code/game/objects/structures/crates_lockers/closets/wallmount.dm index 7d458e268920..2e0be1907ce4 100644 --- a/code/game/objects/structures/crates_lockers/closets/wallmount.dm +++ b/code/game/objects/structures/crates_lockers/closets/wallmount.dm @@ -3,7 +3,7 @@ anchored = TRUE density = TRUE can_be_unanchored = FALSE - icon = 'whitesands/icons/obj/closet.dmi' + icon = 'icons/obj/wallcloset.dmi' icon_state = "generic_wall" /obj/structure/closet/wall/red @@ -31,7 +31,7 @@ anchored = TRUE density = TRUE can_be_unanchored = FALSE - icon = 'whitesands/icons/obj/closet.dmi' + icon = 'icons/obj/wallcloset.dmi' icon_door = "blue_wall" /obj/structure/closet/wardrobe/pink/wall @@ -39,7 +39,7 @@ anchored = TRUE density = TRUE can_be_unanchored = FALSE - icon = 'whitesands/icons/obj/closet.dmi' + icon = 'icons/obj/wallcloset.dmi' icon_door = "pink_wall" /obj/structure/closet/wardrobe/black/wall @@ -47,7 +47,7 @@ anchored = TRUE density = TRUE can_be_unanchored = FALSE - icon = 'whitesands/icons/obj/closet.dmi' + icon = 'icons/obj/wallcloset.dmi' icon_door = "black_wall" /obj/structure/closet/wardrobe/green/wall @@ -55,7 +55,7 @@ anchored = TRUE density = TRUE can_be_unanchored = FALSE - icon = 'whitesands/icons/obj/closet.dmi' + icon = 'icons/obj/wallcloset.dmi' icon_door = "green_wall" /obj/structure/closet/wardrobe/orange/wall @@ -63,7 +63,7 @@ anchored = TRUE density = TRUE can_be_unanchored = FALSE - icon = 'whitesands/icons/obj/closet.dmi' + icon = 'icons/obj/wallcloset.dmi' icon_door = "orange_wall" /obj/structure/closet/wardrobe/yellow/wall @@ -71,7 +71,7 @@ anchored = TRUE density = TRUE can_be_unanchored = FALSE - icon = 'whitesands/icons/obj/closet.dmi' + icon = 'icons/obj/wallcloset.dmi' icon_door = "yellow_wall" /obj/structure/closet/wardrobe/white/wall @@ -79,7 +79,7 @@ anchored = TRUE density = TRUE can_be_unanchored = FALSE - icon = 'whitesands/icons/obj/closet.dmi' + icon = 'icons/obj/wallcloset.dmi' icon_door = "white_wall" /obj/structure/closet/wardrobe/pjs/wall @@ -87,7 +87,7 @@ anchored = TRUE density = TRUE can_be_unanchored = FALSE - icon = 'whitesands/icons/obj/closet.dmi' + icon = 'icons/obj/wallcloset.dmi' icon_door = "white_wall" /obj/structure/closet/wardrobe/grey/wall @@ -95,7 +95,7 @@ anchored = TRUE density = TRUE can_be_unanchored = FALSE - icon = 'whitesands/icons/obj/closet.dmi' + icon = 'icons/obj/wallcloset.dmi' icon_door = "grey_wall" /obj/structure/closet/wardrobe/mixed/wall @@ -103,7 +103,7 @@ anchored = TRUE density = TRUE can_be_unanchored = FALSE - icon = 'whitesands/icons/obj/closet.dmi' + icon = 'icons/obj/wallcloset.dmi' icon_door = "mixed_wall" //special @@ -113,7 +113,7 @@ anchored = TRUE density = TRUE can_be_unanchored = FALSE - icon = 'whitesands/icons/obj/closet.dmi' + icon = 'icons/obj/wallcloset.dmi' icon_state = "fire_wall" /obj/structure/closet/emcloset/wall @@ -121,7 +121,7 @@ anchored = TRUE density = TRUE can_be_unanchored = FALSE - icon = 'whitesands/icons/obj/closet.dmi' + icon = 'icons/obj/wallcloset.dmi' icon_state = "emergency_wall" //secure closets/freezers @@ -130,14 +130,15 @@ anchored = TRUE density = TRUE can_be_unanchored = FALSE - icon = 'whitesands/icons/obj/closet.dmi' + icon = 'icons/obj/wallcloset.dmi' icon_state = "freezer_wall" + /obj/structure/closet/secure_closet/freezer/wall wall_mounted = TRUE anchored = TRUE density = TRUE can_be_unanchored = FALSE - icon = 'whitesands/icons/obj/closet.dmi' + icon = 'icons/obj/wallcloset.dmi' icon_state = "freezer_wall" /obj/structure/closet/secure_closet/freezer/kitchen/wall @@ -145,7 +146,7 @@ anchored = TRUE density = TRUE can_be_unanchored = FALSE - icon = 'whitesands/icons/obj/closet.dmi' + icon = 'icons/obj/wallcloset.dmi' icon_state = "freezer_wall" /obj/structure/closet/secure_closet/brig/wall @@ -153,6 +154,6 @@ anchored = TRUE density = TRUE can_be_unanchored = FALSE - icon = 'whitesands/icons/obj/closet.dmi' + icon = 'icons/obj/wallcloset.dmi' icon_state = "generic_wall" icon_door = "generic_wall" diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm index 133f25afdb44..2558993a5278 100644 --- a/code/game/objects/structures/door_assembly_types.dm +++ b/code/game/objects/structures/door_assembly_types.dm @@ -137,7 +137,7 @@ name = "shuttle airlock assembly" icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' base_name = "shuttle airlock" - overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' + overlays_file = 'icons/obj/doors/airlocks/shuttle/old_overlays.dmi' airlock_type = /obj/machinery/door/airlock/shuttle glass_type = /obj/machinery/door/airlock/shuttle/glass @@ -233,9 +233,9 @@ /obj/structure/door_assembly/door_assembly_titanium name = "titanium airlock assembly" - icon = 'whitesands/icons/obj/doors/airlocks/shuttle/shuttle.dmi' + icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' base_name = "shuttle airlock" - overlays_file = 'whitesands/icons/obj/doors/airlocks/shuttle/overlays.dmi' + overlays_file = 'icons/obj/doors/airlocks/shuttle/old_overlays.dmi' glass_type = /obj/machinery/door/airlock/titanium/glass airlock_type = /obj/machinery/door/airlock/titanium mineral = "titanium" diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index b07b1aa08f3c..c9ba25c29898 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 = 'whitesands/icons/obj/wallmounts.dmi' //WS Edit - Better Icons + icon = 'icons/obj/wallmounts.dmi' //WS Edit - Better Icons icon_state = "extinguisher_closed" anchored = TRUE density = FALSE diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 84c015f24cc6..c449d0a50064 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -327,7 +327,7 @@ /obj/structure/falsewall/titanium name = "wall" desc = "A light-weight titanium wall used in shuttles." - icon = 'whitesands/icons/turf/walls/shuttle_wall.dmi' + icon = 'icons/turf/walls/shuttle_wall.dmi' icon_state = "shuttle_wall-0" base_icon_state = "shuttle_wall" mineral = /obj/item/stack/sheet/mineral/titanium diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 7e38ad8a47d8..5815bcc475e3 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -69,7 +69,7 @@ /obj/structure/lattice/catwalk name = "catwalk" desc = "A catwalk for easier EVA maneuvering and cable placement." - icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi' + icon = 'icons/obj/smooth_structures/more_catwalk.dmi' icon_state = "catwalk-0" base_icon_state = "catwalk" number_of_mats = 2 diff --git a/code/game/objects/structures/radioactive.dm b/code/game/objects/structures/radioactive.dm index c4f3a21b3806..6dbc40b11e4e 100644 --- a/code/game/objects/structures/radioactive.dm +++ b/code/game/objects/structures/radioactive.dm @@ -3,7 +3,7 @@ /obj/structure/radioactive name = "nuclear waste barrel" desc = "An old container of radioactive biproducts." - icon = 'whitesands/icons/obj/hazard.dmi' + icon = 'icons/obj/hazard.dmi' icon_state = "barrel" density = TRUE var/rad_power = 100 diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index d1ecd7f2622f..c815720718c2 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -1,5 +1,5 @@ /obj/structure/sign/warning/longtermwaste - icon = 'whitesands/icons/obj/64x32.dmi' + icon = 'icons/obj/64x32.dmi' icon_state = "longwarning" name = "long term nuclear waste warning sign" sign_change_name = "Read further to survive..." diff --git a/code/game/objects/structures/signs/_signs.dm b/code/game/objects/structures/signs/_signs.dm index 3f2fd2fa19aa..65e30053ef33 100644 --- a/code/game/objects/structures/signs/_signs.dm +++ b/code/game/objects/structures/signs/_signs.dm @@ -236,14 +236,14 @@ /obj/structure/sign/solgov_seal name = "Seal of the solarian government" desc = "A seal emblazened with a gold trim depicting the star, sol." - icon = 'whitesands/icons/obj/solgov_logos.dmi' + icon = 'icons/obj/solgov_logos.dmi' icon_state = "solgovseal" pixel_y = 27 /obj/structure/sign/solgov_flag name = "solgov banner" desc = "A large flag displaying the logo of solgov, the local government of the sol system." - icon = 'whitesands/icons/obj/solgov_logos.dmi' + icon = 'icons/obj/solgov_logos.dmi' icon_state = "solgovflag-left" pixel_y = 26 @@ -261,7 +261,7 @@ /obj/structure/sign/number name = "zero" desc = "A numeral sign." - icon = 'whitesands/icons/turf/decals.dmi' + icon = 'icons/turf/decals.dmi' icon_state = "0" /obj/structure/sign/number/one diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 84b18cd21372..7fdd6cf5412c 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -733,7 +733,7 @@ /obj/structure/table/wood/reinforced //a reinforced version of the regular wooden table, primarily for use in solgov outposts or ships name = "reinforced wooden table" desc = "A reinforced version of the four-legged wooden table. Likely as easy to burn as a normal one." - icon = 'whitesands/icons/obj/smooth_structures/reinforced_wood_table.dmi' + icon = 'icons/obj/smooth_structures/reinforced_wood_table.dmi' icon_state = "reinforced_wood_table-0" base_icon_state = "reinforced_wood_table" deconstruction_ready = 0 diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 20788b8296c2..7f2f1531b608 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -684,7 +684,7 @@ /obj/structure/window/reinforced/fulltile/shuttle name = "shuttle window" desc = "A reinforced, air-locked pod window." - icon = 'whitesands/icons/obj/smooth_structures/shuttle_window.dmi' + icon = 'icons/obj/smooth_structures/shuttle_window.dmi' icon_state = "shuttle_window-0" base_icon_state = "shuttle_window" wtype = "shuttle" diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index 9e6d543540bd..911fc53acaf3 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -627,8 +627,8 @@ /turf/closed/mineral/iron/whitesands - icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' - smooth_icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' + icon = 'icons/turf/walls/ws_walls.dmi' + smooth_icon = 'icons/turf/walls/ws_walls.dmi' environment_type = WHITESANDS_WALL_ENV turf_type = /turf/open/floor/plating/asteroid/whitesands baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried @@ -637,8 +637,8 @@ has_borders = FALSE /turf/closed/mineral/uranium/whitesands - icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' - smooth_icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' + icon = 'icons/turf/walls/ws_walls.dmi' + smooth_icon = 'icons/turf/walls/ws_walls.dmi' environment_type = WHITESANDS_WALL_ENV turf_type = /turf/open/floor/plating/asteroid/whitesands baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried @@ -647,8 +647,8 @@ has_borders = FALSE /turf/closed/mineral/diamond/whitesands - icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' - smooth_icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' + icon = 'icons/turf/walls/ws_walls.dmi' + smooth_icon = 'icons/turf/walls/ws_walls.dmi' environment_type = WHITESANDS_WALL_ENV turf_type = /turf/open/floor/plating/asteroid/whitesands baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried @@ -657,8 +657,8 @@ has_borders = FALSE /turf/closed/mineral/plasma/whitesands - icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' - smooth_icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' + icon = 'icons/turf/walls/ws_walls.dmi' + smooth_icon = 'icons/turf/walls/ws_walls.dmi' environment_type = WHITESANDS_WALL_ENV turf_type = /turf/open/floor/plating/asteroid/whitesands baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried @@ -667,8 +667,8 @@ has_borders = FALSE /turf/closed/mineral/bscrystal/whitesands - icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' - smooth_icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' + icon = 'icons/turf/walls/ws_walls.dmi' + smooth_icon = 'icons/turf/walls/ws_walls.dmi' environment_type = WHITESANDS_WALL_ENV turf_type = /turf/open/floor/plating/asteroid/whitesands baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried @@ -677,8 +677,8 @@ has_borders = FALSE /turf/closed/mineral/gibtonite/whitesands - icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' - smooth_icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' + icon = 'icons/turf/walls/ws_walls.dmi' + smooth_icon = 'icons/turf/walls/ws_walls.dmi' environment_type = WHITESANDS_WALL_ENV turf_type = /turf/open/floor/plating/asteroid/whitesands baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried @@ -687,8 +687,8 @@ has_borders = FALSE /turf/closed/mineral/random/whitesands - icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' - smooth_icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' + icon = 'icons/turf/walls/ws_walls.dmi' + smooth_icon = 'icons/turf/walls/ws_walls.dmi' environment_type = WHITESANDS_WALL_ENV turf_type = /turf/open/floor/plating/asteroid/whitesands baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried @@ -699,9 +699,9 @@ defer_change = TRUE has_borders = FALSE -/turf/closed/mineral/random/whitesands/high_chance - icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' - smooth_icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' +/turf/closed/mineral/random/high_chance + icon = 'icons/turf/walls/ws_walls.dmi' + smooth_icon = 'icons/turf/walls/ws_walls.dmi' environment_type = WHITESANDS_WALL_ENV turf_type = /turf/open/floor/plating/asteroid/whitesands baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried @@ -710,8 +710,8 @@ has_borders = FALSE /turf/closed/mineral/random/labormineral/whitesands - icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' - smooth_icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' + icon = 'icons/turf/walls/ws_walls.dmi' + smooth_icon = 'icons/turf/walls/ws_walls.dmi' environment_type = WHITESANDS_WALL_ENV turf_type = /turf/open/floor/plating/asteroid/whitesands baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried @@ -720,8 +720,8 @@ has_borders = FALSE /turf/closed/mineral/random/low_chance - icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' - smooth_icon = 'whitesands/icons/turf/walls/whitesands/ws_walls.dmi' + icon = 'icons/turf/walls/ws_walls.dmi' + smooth_icon = 'icons/turf/walls/ws_walls.dmi' environment_type = WHITESANDS_WALL_ENV turf_type = /turf/open/floor/plating/asteroid/whitesands baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried diff --git a/code/game/turfs/closed/wall/mineral_walls.dm b/code/game/turfs/closed/wall/mineral_walls.dm index 1a0e8cccd2e2..c2ff2ff5086f 100644 --- a/code/game/turfs/closed/wall/mineral_walls.dm +++ b/code/game/turfs/closed/wall/mineral_walls.dm @@ -238,7 +238,7 @@ /turf/closed/wall/mineral/titanium //has to use this path due to how building walls works name = "wall" desc = "A light-weight titanium wall used in shuttles." - icon = 'whitesands/icons/turf/walls/shuttle_wall.dmi' + icon = 'icons/turf/walls/shuttle_wall.dmi' icon_state = "shuttle_wall-0" base_icon_state = "shuttle_wall" explosion_block = 3 @@ -254,7 +254,7 @@ canSmoothWith = list(SMOOTH_GROUP_TITANIUM_WALLS_EXTERIOR, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS) /turf/closed/wall/mineral/titanium/nodiagonal - icon = 'whitesands/icons/turf/walls/shuttle_wall.dmi' + icon = 'icons/turf/walls/shuttle_wall.dmi' icon_state = "map-shuttle_nd" base_icon_state = "shuttle_wall" smoothing_flags = SMOOTH_BITMASK diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm index 856a2e43f3d7..2ec40f804743 100644 --- a/code/game/turfs/open/floor.dm +++ b/code/game/turfs/open/floor.dm @@ -290,7 +290,7 @@ name = "floor" icon_state = "materialfloor" material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS - icon = 'whitesands/icons/turf/floors/tiles.dmi' + icon = 'icons/turf/floors/tiles.dmi' icon_state = "tiled" /turf/open/floor/material/spawn_tile() diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm index 0d7be86e6a78..897376b2e9a7 100644 --- a/code/game/turfs/open/floor/fancy_floor.dm +++ b/code/game/turfs/open/floor/fancy_floor.dm @@ -354,7 +354,7 @@ /turf/open/floor/carpet/nanoweave name = "nanoweave carpet" desc = "A padded piece of plasteel plating, used to make space-based installations a feel little less soulless." - icon = 'whitesands/icons/turf/floors/nanoweave_dark.dmi' + icon = 'icons/turf/floors/nanoweave_dark.dmi' icon_state = "icon-255" //no i am not renaming like 40 tile states 5 times over base_icon_state = "icon" //god hates you - Zeta floor_tile = /obj/item/stack/tile/carpet/nanoweave @@ -363,35 +363,35 @@ /turf/open/floor/carpet/nanoweave/red name = "nanoweave carpet (red)" - icon = 'whitesands/icons/turf/floors/nanoweave_red.dmi' //the good part of being a lazy dickwad is that i dont need to redefine icon_state and base_icon_state 5 times over + icon = 'icons/turf/floors/nanoweave_red.dmi' //the good part of being a lazy dickwad is that i dont need to redefine icon_state and base_icon_state 5 times over floor_tile = /obj/item/stack/tile/carpet/nanoweave/red smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_CARPET_NWRED) canSmoothWith = list(SMOOTH_GROUP_CARPET_NWRED) /turf/open/floor/carpet/nanoweave/beige //this one is good for varediting to cool colors name = "nanoweave carpet (beige)" - icon = 'whitesands/icons/turf/floors/nanoweave_beige.dmi' + icon = 'icons/turf/floors/nanoweave_beige.dmi' floor_tile = /obj/item/stack/tile/carpet/nanoweave/beige smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_CARPET_NWBEIGE) canSmoothWith = list(SMOOTH_GROUP_CARPET_NWBEIGE) /turf/open/floor/carpet/nanoweave/blue name = "nanoweave carpet (blue)" - icon = 'whitesands/icons/turf/floors/nanoweave_blue.dmi' + icon = 'icons/turf/floors/nanoweave_blue.dmi' floor_tile = /obj/item/stack/tile/carpet/nanoweave/blue smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_CARPET_NWBLUE) canSmoothWith = list(SMOOTH_GROUP_CARPET_NWBLUE) /turf/open/floor/carpet/nanoweave/purple name = "nanoweave carpet (purple)" - icon = 'whitesands/icons/turf/floors/nanoweave_purple.dmi' + icon = 'icons/turf/floors/nanoweave_purple.dmi' floor_tile = /obj/item/stack/tile/carpet/nanoweave/purple smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_CARPET_NWPURPLE) canSmoothWith = list(SMOOTH_GROUP_CARPET_NWPURPLE) /turf/open/floor/carpet/nanoweave/orange name = "nanoweave carpet (orange)" - icon = 'whitesands/icons/turf/floors/nanoweave_orange.dmi' + icon = 'icons/turf/floors/nanoweave_orange.dmi' floor_tile = /obj/item/stack/tile/carpet/nanoweave/orange smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_CARPET_NWORANGE) canSmoothWith = list(SMOOTH_GROUP_CARPET_NWORANGE) diff --git a/code/game/turfs/open/floor/mineral_floor.dm b/code/game/turfs/open/floor/mineral_floor.dm index 481cb3878e1a..55bc1404b0b9 100644 --- a/code/game/turfs/open/floor/mineral_floor.dm +++ b/code/game/turfs/open/floor/mineral_floor.dm @@ -79,7 +79,7 @@ /turf/open/floor/mineral/titanium name = "shuttle floor" - icon = 'whitesands/icons/turf/floors/shuttle_floors.dmi' + icon = 'icons/turf/floors/shuttle_floors.dmi' icon_state = "titanium" floor_tile = /obj/item/stack/tile/mineral/titanium broken_states = list("titanium_dam1","titanium_dam2","titanium_dam3","titanium_dam4","titanium_dam5") @@ -156,7 +156,7 @@ //PLASTITANIUM (syndieshuttle) /turf/open/floor/mineral/plastitanium name = "shuttle floor" - icon = 'whitesands/icons/turf/floors/shuttle_floors.dmi' + icon = 'icons/turf/floors/shuttle_floors.dmi' icon_state = "plastitanium" floor_tile = /obj/item/stack/tile/mineral/plastitanium broken_states = list("plastitanium_dam1","plastitanium_dam2","plastitanium_dam3","plastitanium_dam4","plastitanium_dam5") diff --git a/code/game/turfs/open/floor/plasteel_floor.dm b/code/game/turfs/open/floor/plasteel_floor.dm index be997f2b2a25..6636755e3264 100644 --- a/code/game/turfs/open/floor/plasteel_floor.dm +++ b/code/game/turfs/open/floor/plasteel_floor.dm @@ -1,5 +1,5 @@ /turf/open/floor/plasteel - icon = 'whitesands/icons/turf/floors/tiles.dmi' + icon = 'icons/turf/floors/tiles.dmi' color = COLOR_FLOORTILE_GRAY base_icon_state = "tiled" icon_state = "tiled" @@ -51,7 +51,7 @@ color = COLOR_WHITE /turf/open/floor/plasteel/tech - icon = 'whitesands/icons/turf/floors/techfloor.dmi' + icon = 'icons/turf/floors/techfloor.dmi' icon_state = "techfloor_gray" base_icon_state = "techfloor_gray" floor_tile = /obj/item/stack/tile/plasteel/tech @@ -86,7 +86,7 @@ base_icon_state = "ridged" /turf/open/floor/plasteel/showroomfloor - icon = 'whitesands/icons/turf/floors.dmi' + icon = 'icons/turf/floors.dmi' icon_state = "showroomfloor" base_icon_state = "showroomfloor" @@ -104,7 +104,7 @@ /turf/open/floor/plasteel/freezer color = null - icon = 'whitesands/icons/turf/floors.dmi' + icon = 'icons/turf/floors.dmi' icon_state = "freezer" base_icon_state = "freezer" @@ -114,7 +114,7 @@ /turf/open/floor/plasteel/kitchen_coldroom name = "cold room floor" - icon = 'whitesands/icons/turf/floors.dmi' + icon = 'icons/turf/floors.dmi' initial_gas_mix = KITCHEN_COLDROOM_ATMOS /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor //tempted to make this a subset of freezer @@ -124,7 +124,7 @@ /turf/open/floor/plasteel/grimy color = null - icon = 'whitesands/icons/turf/floors.dmi' + icon = 'icons/turf/floors.dmi' icon_state = "lino" base_icon_state = "lino" tiled_dirt = FALSE @@ -194,7 +194,7 @@ /turf/open/floor/plasteel/elevatorshaft - icon = 'whitesands/icons/turf/floors.dmi' + icon = 'icons/turf/floors.dmi' icon_state = "elevatorshaft" base_icon_state = "elevatorshaft" color = null @@ -219,7 +219,7 @@ * */ /turf/open/floor/plasteel/median - icon = 'whitesands/icons/turf/floors/medians.dmi' + icon = 'icons/turf/floors/medians.dmi' icon_state = "floor_fuckywucky" name = "Uh oh tile" diff --git a/code/game/turfs/open/floor/plating/whitesands.dm b/code/game/turfs/open/floor/plating/whitesands.dm index abd1d29bb490..32e75e8879f3 100644 --- a/code/game/turfs/open/floor/plating/whitesands.dm +++ b/code/game/turfs/open/floor/plating/whitesands.dm @@ -1,7 +1,7 @@ /turf/open/floor/plating/asteroid/whitesands name = "salted sand" baseturfs = /turf/open/floor/plating/asteroid/whitesands - icon = 'whitesands/icons/turf/floors/whitesands/ws_floors.dmi' + icon = 'icons/turf/floors//ws_floors.dmi' icon_state = "sand" icon_plating = "sand" planetary_atmos = TRUE diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index 278c1b90297d..aa1717230c48 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -285,7 +285,7 @@ /obj/item/antag_spawner/syndi_borer name = "syndicate brain-slug container" desc = "Releases a modified cortical borer to assist the user." - icon = 'whitesands/icons/obj/chemical.dmi' //Temporary? Doesn't look like a feckin syndicate item, and is overall shit. FIX + icon = 'icons/obj/chemical.dmi' //Temporary? //The most permanent type of solution lol icon_state = "hypoviallarge-b" var/polling = FALSE diff --git a/code/modules/antagonists/borer/borer.dm b/code/modules/antagonists/borer/borer.dm index 6a78de6d1450..4fc5a6aab8f1 100644 --- a/code/modules/antagonists/borer/borer.dm +++ b/code/modules/antagonists/borer/borer.dm @@ -954,7 +954,7 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 3) give_back_control_action.Remove(victim) /datum/action/innate/borer - icon_icon = 'whitesands/icons/mob/actions/actions_borer.dmi' + icon_icon = 'icons/mob/actions/actions_borer.dmi' background_icon_state = "bg_alien" /datum/action/innate/borer/talk_to_host diff --git a/code/modules/atmospherics/machinery/components/binary_devices/relief_valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/relief_valve.dm index 49ebaaa2e4bb..8ef01b857653 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/relief_valve.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/relief_valve.dm @@ -1,7 +1,7 @@ /obj/machinery/atmospherics/components/binary/relief_valve name = "binary pressure relief valve" desc = "Like a manual valve, but opens at a certain pressure rather than being toggleable." - icon = 'whitesands/icons/obj/atmospherics/components/relief_valve.dmi' + icon = 'icons/obj/atmospherics/components/relief_valve.dmi' icon_state = "relief_valve-t-map" can_unwrench = TRUE construction_type = /obj/item/pipe/binary diff --git a/code/modules/atmospherics/machinery/components/unary_devices/relief_valve.dm b/code/modules/atmospherics/machinery/components/unary_devices/relief_valve.dm index 1e180e309e68..1bc4bf810d48 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/relief_valve.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/relief_valve.dm @@ -1,7 +1,7 @@ /obj/machinery/atmospherics/components/unary/relief_valve name = "pressure relief valve" desc = "A valve that opens to the air at a certain pressure, then closes once it goes below another." - icon = 'whitesands/icons/obj/atmospherics/components/relief_valve.dmi' + icon = 'icons/obj/atmospherics/components/relief_valve.dmi' icon_state = "relief_valve-e-map" can_unwrench = TRUE interaction_flags_machine = INTERACT_MACHINE_OFFLINE | INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON | INTERACT_MACHINE_SET_MACHINE diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 8bbcd6153841..18601d8efc9c 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -3,7 +3,7 @@ /obj/machinery/portable_atmospherics/canister name = "canister" desc = "A canister for the storage of gas." - icon = 'whitesands/icons/obj/atmos.dmi' + icon = 'icons/obj/nutanks.dmi' icon_state = "yellow" density = TRUE base_icon_state = "yellow" //Used to make dealing with breaking the canister less hellish. diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index ccba57df5968..90d55d78166c 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -848,7 +848,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( sleep(rand(40,80)) target.playsound_local(source, 'sound/machines/airlockforced.ogg', 30, 1) if("speen") //WS - Ghostspeen - target.playsound_local(source, 'whitesands/sound/voice/speen.ogg', 50, 1) + target.playsound_local(source, 'sound/voice/speen.ogg', 50, 1) qdel(src) /datum/hallucination/weird_sounds diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index a0ba25360b29..fe2c218d42d3 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -4,7 +4,7 @@ /obj/item/reagent_containers/food/drinks name = "drink" desc = "yummy" - icon = 'whitesands/icons/obj/drinks.dmi' + icon = 'icons/obj/drinks.dmi' icon_state = null lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' @@ -274,7 +274,7 @@ /obj/item/reagent_containers/food/drinks/waterbottle name = "bottle of water" desc = "A bottle of water filled at an old Earth bottling facility." - icon = 'whitesands/icons/obj/drinks.dmi' + icon = 'icons/obj/drinks.dmi' icon_state = "smallbottle" item_state = "bottle" list_reagents = list(/datum/reagent/water = 49.5, /datum/reagent/fluorine = 0.5)//see desc, don't think about it too hard @@ -394,7 +394,7 @@ return var/obj/item/broken_bottle/B = new (loc) B.icon_state = icon_state - var/icon/I = new('whitesands/icons/obj/drinks.dmi', src.icon_state) + var/icon/I = new('icons/obj/drinks.dmi', src.icon_state) I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1) I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0)) B.icon = I @@ -453,7 +453,7 @@ /obj/item/reagent_containers/food/drinks/colocup name = "colo cup" desc = "A cheap, mass produced style of cup, typically used at parties. They never seem to come out red, for some reason..." - icon = 'whitesands/icons/obj/drinks.dmi' + icon = 'icons/obj/drinks.dmi' icon_state = "colocup" lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 5ec9c391de91..9bbe7cfeaafb 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -43,7 +43,7 @@ thrower.put_in_hands(B) B.icon_state = icon_state - var/icon/I = new('whitesands/icons/obj/drinks.dmi', src.icon_state) + var/icon/I = new('icons/obj/drinks.dmi', src.icon_state) I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1) I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0)) B.icon = I @@ -136,7 +136,7 @@ /obj/item/broken_bottle name = "broken bottle" desc = "A bottle with a sharp broken bottom." - icon = 'whitesands/icons/obj/drinks.dmi' + icon = 'icons/obj/drinks.dmi' icon_state = "broken_bottle" force = 9 throwforce = 5 @@ -147,7 +147,7 @@ hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("stabbed", "slashed", "attacked") sharpness = IS_SHARP - var/static/icon/broken_outline = icon('whitesands/icons/obj/drinks.dmi', "broken") + var/static/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken") /obj/item/broken_bottle/Initialize() . = ..() @@ -622,7 +622,7 @@ /obj/item/reagent_containers/food/drinks/bottle/sarsaparilla/attack_self(mob/user) if(!is_drainable()) // Uses the reagents.flags cause reagent_flags is only the init value - playsound(src, 'whitesands/sound/items/openbottle.ogg', 30, 1) + playsound(src, 'sound/items/openbottle.ogg', 30, 1) user.visible_message("[user] takes the cap off \the [src].", "You take the cap off [src].") reagents.flags |= OPENCONTAINER //Cap's off if(prob(1)) //Lucky you @@ -642,7 +642,7 @@ desc = "Legend says something amazing happens when you collect enough of these." custom_price = 100 custom_premium_price = 110 - icon = 'whitesands/icons/obj/items_and_weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "sandstar" w_class = WEIGHT_CLASS_TINY custom_materials = list(/datum/material/gold = 200) @@ -650,7 +650,7 @@ /obj/item/storage/bottles name = "bottle crate" desc = "A small crate for storing bottles" - icon = 'whitesands/icons/obj/storage.dmi' + icon = 'icons/obj/storage.dmi' icon_state = "bottlecrate" item_state = "deliverypackage" lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm index 7de17d374825..89efb1b1cf8d 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm @@ -150,7 +150,7 @@ /obj/machinery/grill/cat name = "catgrill" desc = "Is this what the youngins are into now?" - icon = 'whitesands/icons/obj/kitchen.dmi' + icon = 'icons/obj/kitchen.dmi' icon_state = "catgrill_open" anchored = FALSE diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index ca685710581e..deaaf9e5498c 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -2,7 +2,7 @@ /obj/item/plant_analyzer name = "plant analyzer" desc = "A scanner used to evaluate a plant's various areas of growth, chemical contents, and genetic traits." - icon = 'whitesands/icons/obj/device.dmi' //WS edit - analyzer update + icon = 'icons/obj/device.dmi' icon_state = "hydro" item_state = "analyzer" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' diff --git a/code/modules/language/dwarven.dm b/code/modules/language/dwarven.dm index f46ef653c9e2..ddc0301a0e9f 100644 --- a/code/modules/language/dwarven.dm +++ b/code/modules/language/dwarven.dm @@ -13,5 +13,4 @@ syllables = list("kulet", "alak", "bidok", "nicol", "anam", "gatal", "mabdug", "zustash", "sedil", "ustos", "emr", "izeg", "beming", "gost", "ntak", "tosid", "feb", "berim", "ibruk", "ermis", "thoth", "thatthil", "gistang", "libash", "lakish", "asdos", "roder", "nel", "biban", "ugog", "ish", "robek", "olmul", "nokzam", "emuth", "fer", "uvel", "dolush", "ag^k", "ucat", "ng rak", "enir", "ugath", "lisig", "etg", "erong", "osed", "lanlar", "udir", "tarmid", "s krith", "nural", "bugsud", "okag", "nazush", "nashon", "ftrid", "en''r", "dstik", "kogan", "ingish", "dudgoth", "stalk*b", "themor", "murak", "altth", "osod", "thcekut", "cog", "selsten", "egdoth", "othsin", "idek", "st", "suthmam", "im", "okab", "onlnl", "gasol", "tegir", "nam...sh", "noval", "shalig", "shin", "lek", ",,kim", "kfkdal", "stum,,m", "alud", "olom", "%lot", "rozsed", "thos", "okon", "nDON'T TURN AROUND!") - playsound(src, 'whitesands/sound/weapons/gun/commissar/dontturnaround.ogg', 50, 0, 4) + playsound(src, 'sound/weapons/gun/commissar/dontturnaround.ogg', 50, 0, 4) cooldown = world.time /obj/item/gun/ballistic/automatic/pistol/commissar/examine(mob/user) diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index b656bcd3eabf..c5b8c56cc4e1 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -356,9 +356,9 @@ unique_reskin = null recoil = 10 weapon_weight = WEAPON_LIGHT - fire_sound = 'whitesands/sound/weapons/gun/shotgun/quadfire.ogg' - rack_sound = 'whitesands/sound/weapons/gun/shotgun/quadrack.ogg' - load_sound = 'whitesands/sound/weapons/gun/shotgun/quadinsert.ogg' + fire_sound = 'sound/weapons/gun/shotgun/quadfire.ogg' + rack_sound = 'sound/weapons/gun/shotgun/quadrack.ogg' + load_sound = 'sound/weapons/gun/shotgun/quadinsert.ogg' fire_sound_volume = 50 rack_sound_volume = 50 can_be_sawn_off = FALSE diff --git a/code/modules/projectiles/guns/misc/bow.dm b/code/modules/projectiles/guns/misc/bow.dm index d2361b8bc52b..6144b4c85dab 100644 --- a/code/modules/projectiles/guns/misc/bow.dm +++ b/code/modules/projectiles/guns/misc/bow.dm @@ -5,7 +5,7 @@ icon_state = "bow" item_state = "pipebow" load_sound = null - fire_sound = 'whitesands/sound/weapons/bowfire.ogg' + fire_sound = 'sound/weapons/bowfire.ogg' slot_flags = ITEM_SLOT_BACK mag_type = /obj/item/ammo_box/magazine/internal/bow trigger_guard = TRIGGER_GUARD_ALLOW_ALL @@ -35,7 +35,7 @@ if(chambered) to_chat(user, "You [drawn ? "release" : "draw"] [src]'s string.") if(!drawn) - playsound(src, 'whitesands/sound/weapons/bowdraw.ogg', 75, 0) + playsound(src, 'sound/weapons/bowdraw.ogg', 75, 0) drawn = !drawn update_icon() diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 14a925a0ba8e..cf7e448458fb 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -296,7 +296,7 @@ //A vial-loaded hypospray. Cartridge-based! /obj/item/hypospray/mkii name = "hypospray mk.II" - icon = 'whitesands/icons/obj/syringe.dmi' + icon = 'icons/obj/syringe.dmi' icon_state = "hypo2" desc = "A new development from DeForest Medical, this hypospray takes 30-unit vials as the drug supply for easy swapping." w_class = WEIGHT_CLASS_TINY diff --git a/code/modules/reagents/reagent_containers/hypovial.dm b/code/modules/reagents/reagent_containers/hypovial.dm index d858c7bcafb8..a63e98ba58c7 100644 --- a/code/modules/reagents/reagent_containers/hypovial.dm +++ b/code/modules/reagents/reagent_containers/hypovial.dm @@ -2,7 +2,7 @@ /obj/item/reagent_containers/glass/bottle/vial name = "broken hypovial" desc = "A hypovial compatible with most hyposprays." - icon = 'whitesands/icons/obj/chemical.dmi' + icon = 'icons/obj/chemical.dmi' icon_state = "hypovial" spillable = FALSE var/comes_with = list() //Easy way of doing this. diff --git a/code/modules/ruins/rockplanet_ruin_code.dm b/code/modules/ruins/rockplanet_ruin_code.dm index 66e46f58d0d8..0d583fbe916a 100644 --- a/code/modules/ruins/rockplanet_ruin_code.dm +++ b/code/modules/ruins/rockplanet_ruin_code.dm @@ -93,7 +93,7 @@ /obj/item/strange_crystal name = "strange crystal" desc = "A crystal that came from a dead creature. Its rapid growth and corruption is kept inert." - icon = 'whitesands/icons/obj/lavaland/newlavalandplants.dmi' + icon = 'icons/obj/lavaland/ash_flora.dmi' icon_state = "unnamed_crystal" grind_results = list(/datum/reagent/crystal_reagent = 4) diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm index 9a8476f386f4..574e75786ad9 100644 --- a/code/modules/surgery/organs/ears.dm +++ b/code/modules/surgery/organs/ears.dm @@ -161,7 +161,7 @@ /obj/item/organ/ears/robot name = "auditory sensors" - icon = 'whitesands/icons/obj/surgery.dmi' + icon = 'icons/obj/surgery.dmi' icon_state = "robotic_ears" desc = "A pair of microphones intended to be installed in an IPC head, that grant the ability to hear." zone = "head" diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index 2de572826cf3..439484377dcd 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -398,7 +398,7 @@ /obj/item/organ/eyes/compound name = "compound eyes" desc = "These eyes seem to have increased sensitivity to bright light, with some improvement to low light vision. It's like these eyes are looking everywhere at once!" - icon = 'whitesands/icons/obj/surgery.dmi' + icon = 'icons/obj/surgery.dmi' icon_state = "compound_eyes" see_in_dark = 6 flash_protect = FLASH_PROTECTION_SENSITIVE //Obligatory flash sensitivity for balance diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm index 769636fbacc0..243d5b6134c0 100644 --- a/code/modules/surgery/organs/liver.dm +++ b/code/modules/surgery/organs/liver.dm @@ -120,7 +120,7 @@ organ_flags = ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon. /obj/item/organ/liver/cybernetic/upgraded/ipc - icon = 'whitesands/icons/obj/surgery.dmi' + icon = 'icons/obj/surgery.dmi' name = "substance processor" icon_state = "substance_processor" attack_verb = list("processed") diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index 0f4ec127d632..615428d962b5 100644 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -167,7 +167,7 @@ /obj/item/organ/stomach/cell name = "micro-cell" - icon = 'whitesands/icons/obj/surgery.dmi' + icon = 'icons/obj/surgery.dmi' icon_state = "microcell" w_class = WEIGHT_CLASS_NORMAL zone = "chest" diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 8807bc2d2092..76672669df72 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -1,7 +1,7 @@ /obj/item/retractor name = "retractor" desc = "Retracts stuff." - icon = 'whitesands/icons/obj/surgery.dmi' //SHIPTEST edit: cool and new tools + icon = 'icons/obj/surgery.dmi' //SHIPTEST edit: cool and new tools icon_state = "retractor" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' @@ -23,7 +23,7 @@ /obj/item/hemostat name = "hemostat" desc = "You think you have seen this before." - icon = 'whitesands/icons/obj/surgery.dmi' //SHIPTEST edit: cool and new tools + icon = 'icons/obj/surgery.dmi' //SHIPTEST edit: cool and new tools icon_state = "hemostat" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' @@ -46,7 +46,7 @@ /obj/item/cautery name = "cautery" desc = "This stops bleeding." - icon = 'whitesands/icons/obj/surgery.dmi' //SHIPTEST edit: cool and new tools + icon = 'icons/obj/surgery.dmi' //SHIPTEST edit: cool and new tools icon_state = "cautery" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' @@ -69,7 +69,7 @@ /obj/item/surgicaldrill name = "surgical drill" desc = "You can drill using this item. You dig?" - icon = 'whitesands/icons/obj/surgery.dmi' //SHIPTEST edit: cool and new tools + icon = 'icons/obj/surgery.dmi' //SHIPTEST edit: cool and new tools icon_state = "drill" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' @@ -108,7 +108,7 @@ /obj/item/scalpel name = "scalpel" desc = "Cut, cut, and once more cut." - icon = 'whitesands/icons/obj/surgery.dmi' //SHIPTEST edit: cool and new tools + icon = 'icons/obj/surgery.dmi' //SHIPTEST edit: cool and new tools icon_state = "scalpel" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' @@ -145,7 +145,7 @@ /obj/item/circular_saw name = "circular saw" desc = "For heavy duty cutting." - icon = 'whitesands/icons/obj/surgery.dmi' //SHIPTEST edit: cool and new tools + icon = 'icons/obj/surgery.dmi' //SHIPTEST edit: cool and new tools icon_state = "saw" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' @@ -307,9 +307,10 @@ /obj/item/retractor/advanced name = "mechanical pinches" desc = "An ungainly set of rods and gears mounted onto a gauntlet apparatus." - lefthand_file = 'whitesands/icons/mob/inhands/equipment/medical_lefthand.dmi' - righthand_file = 'whitesands/icons/mob/inhands/equipment/medical_righthand.dmi' + lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' icon_state = "retractor_a" + item_state = "adv_clamps" toolspeed = 0.7 force = 10 //this is in essence a hunk of metal strapped to someone's hand, it's gonna hurt @@ -357,7 +358,7 @@ /obj/item/shears name = "amputation shears" desc = "A type of heavy duty surgical shears used for achieving a clean separation between limb and patient. Keeping the patient still is imperative to be able to secure and align the shears." - icon = 'whitesands/icons/obj/surgery.dmi' //SHiIPTEST AWESOME + icon = 'icons/obj/surgery.dmi' //SHiIPTEST AWESOME icon_state = "shears" flags_1 = CONDUCT_1 item_flags = SURGICAL_TOOL diff --git a/code/modules/unit_tests/plantgrowth_tests.dm b/code/modules/unit_tests/plantgrowth_tests.dm index 2dfb92fbf9cb..6b40236860ef 100644 --- a/code/modules/unit_tests/plantgrowth_tests.dm +++ b/code/modules/unit_tests/plantgrowth_tests.dm @@ -9,7 +9,6 @@ states |= icon_states('icons/obj/hydroponics/growing_mushrooms.dmi') states |= icon_states('icons/obj/hydroponics/growing_vegetables.dmi') states |= icon_states('goon/icons/obj/hydroponics.dmi') - states |= icon_states('whitesands/icons/obj/lavaland/newlavalandplants.dmi') // WS edit - New sprite dmi var/list/paths = subtypesof(/obj/item/seeds) - /obj/item/seeds - typesof(/obj/item/seeds/sample) - /obj/item/seeds/lavaland for(var/seedpath in paths) diff --git a/code/modules/vehicles/pimpin_ride.dm b/code/modules/vehicles/pimpin_ride.dm index 475c43654d15..fa2e067097d6 100644 --- a/code/modules/vehicles/pimpin_ride.dm +++ b/code/modules/vehicles/pimpin_ride.dm @@ -84,11 +84,11 @@ /obj/vehicle/ridden/lawnmower name = "lawn mower" desc = "Equipped with reliable safeties to prevent accidents in the workplace." - icon = 'whitesands/icons/obj/vehicles.dmi' + icon = 'icons/obj/vehicles.dmi' icon_state = "lawnmower" var/emagged = FALSE - var/list/drive_sounds = list('whitesands/sound/effects/mowermove1.ogg', 'whitesands/sound/effects/mowermove2.ogg') - var/list/gib_sounds = list('whitesands/sound/effects/mowermovesquish.ogg') + var/list/drive_sounds = list('sound/effects/mowermove1.ogg', 'sound/effects/mowermove2.ogg') + var/list/gib_sounds = list('sound/effects/mowermovesquish.ogg') var/driver /obj/vehicle/ridden/lawnmower/Initialize() diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index 34dc60cb2e10..3538c370bc05 100644 Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ diff --git a/icons/hud/screen_ghost.dmi b/icons/hud/screen_ghost.dmi index 6519d00aa978..663cf91e3622 100644 Binary files a/icons/hud/screen_ghost.dmi and b/icons/hud/screen_ghost.dmi differ diff --git a/icons/misc/language.dmi b/icons/misc/language.dmi index 7370f30d714d..aa177e8ce49a 100644 Binary files a/icons/misc/language.dmi and b/icons/misc/language.dmi differ diff --git a/whitesands/icons/effects/numbers.dmi b/icons/misc/numbers.dmi similarity index 100% rename from whitesands/icons/effects/numbers.dmi rename to icons/misc/numbers.dmi diff --git a/whitesands/icons/effects/overmap.dmi b/icons/misc/overmap.dmi similarity index 100% rename from whitesands/icons/effects/overmap.dmi rename to icons/misc/overmap.dmi diff --git a/whitesands/icons/effects/overmap_large.dmi b/icons/misc/overmap_large.dmi similarity index 100% rename from whitesands/icons/effects/overmap_large.dmi rename to icons/misc/overmap_large.dmi diff --git a/whitesands/icons/effects/overmap_larger.dmi b/icons/misc/overmap_larger.dmi similarity index 100% rename from whitesands/icons/effects/overmap_larger.dmi rename to icons/misc/overmap_larger.dmi diff --git a/whitesands/icons/mob/actions/actions_borer.dmi b/icons/mob/actions/actions_borer.dmi similarity index 100% rename from whitesands/icons/mob/actions/actions_borer.dmi rename to icons/mob/actions/actions_borer.dmi diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi index 0dcab9618889..869665d8db82 100644 Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi index 0a47b0796e27..d9482a73c20b 100644 Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ diff --git a/icons/mob/inhands/equipment/medical_lefthand.dmi b/icons/mob/inhands/equipment/medical_lefthand.dmi index 3a56ffd087df..c2833664cff8 100644 Binary files a/icons/mob/inhands/equipment/medical_lefthand.dmi and b/icons/mob/inhands/equipment/medical_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/medical_righthand.dmi b/icons/mob/inhands/equipment/medical_righthand.dmi index 8c21c102ebb2..8007a5bfda59 100644 Binary files a/icons/mob/inhands/equipment/medical_righthand.dmi and b/icons/mob/inhands/equipment/medical_righthand.dmi differ diff --git a/icons/mob/inhands/equipment/mining_lefthand.dmi b/icons/mob/inhands/equipment/mining_lefthand.dmi index f31c70b62778..cb65b4cb126f 100644 Binary files a/icons/mob/inhands/equipment/mining_lefthand.dmi and b/icons/mob/inhands/equipment/mining_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/mining_righthand.dmi b/icons/mob/inhands/equipment/mining_righthand.dmi index fbc0118f49e2..b87f21f2e08e 100644 Binary files a/icons/mob/inhands/equipment/mining_righthand.dmi and b/icons/mob/inhands/equipment/mining_righthand.dmi differ diff --git a/icons/mob/inhands/equipment/shields_lefthand.dmi b/icons/mob/inhands/equipment/shields_lefthand.dmi index e9d0dd0d2b7e..ddbb7f4f9de7 100644 Binary files a/icons/mob/inhands/equipment/shields_lefthand.dmi and b/icons/mob/inhands/equipment/shields_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/shields_righthand.dmi b/icons/mob/inhands/equipment/shields_righthand.dmi index dda17156fe47..63c652188960 100644 Binary files a/icons/mob/inhands/equipment/shields_righthand.dmi and b/icons/mob/inhands/equipment/shields_righthand.dmi differ diff --git a/icons/mob/inhands/equipment/tools_lefthand.dmi b/icons/mob/inhands/equipment/tools_lefthand.dmi index 7424c6d2fdea..0eb0e826571f 100644 Binary files a/icons/mob/inhands/equipment/tools_lefthand.dmi and b/icons/mob/inhands/equipment/tools_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/tools_righthand.dmi b/icons/mob/inhands/equipment/tools_righthand.dmi index fa1ebbdcfa70..5fe94c68c6be 100644 Binary files a/icons/mob/inhands/equipment/tools_righthand.dmi and b/icons/mob/inhands/equipment/tools_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/axes_lefthand.dmi b/icons/mob/inhands/weapons/axes_lefthand.dmi index 6b4041e477d9..164a4453b909 100644 Binary files a/icons/mob/inhands/weapons/axes_lefthand.dmi and b/icons/mob/inhands/weapons/axes_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/axes_righthand.dmi b/icons/mob/inhands/weapons/axes_righthand.dmi index 30553d6320b2..5ab5c7c9bebb 100644 Binary files a/icons/mob/inhands/weapons/axes_righthand.dmi and b/icons/mob/inhands/weapons/axes_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/polearms_lefthand.dmi b/icons/mob/inhands/weapons/polearms_lefthand.dmi index 941a72b8da4f..ef2a953f746d 100644 Binary files a/icons/mob/inhands/weapons/polearms_lefthand.dmi and b/icons/mob/inhands/weapons/polearms_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/polearms_righthand.dmi b/icons/mob/inhands/weapons/polearms_righthand.dmi index 9f26ccc18171..e61b825271be 100644 Binary files a/icons/mob/inhands/weapons/polearms_righthand.dmi and b/icons/mob/inhands/weapons/polearms_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi index d0e3051c1f97..59c1ff84b213 100644 Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi index 9087da87a47d..364493a24118 100644 Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/thrown_lefthand.dmi b/icons/mob/inhands/weapons/thrown_lefthand.dmi index 0fc6ea58a540..6b3d86532da4 100644 Binary files a/icons/mob/inhands/weapons/thrown_lefthand.dmi and b/icons/mob/inhands/weapons/thrown_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/thrown_righthand.dmi b/icons/mob/inhands/weapons/thrown_righthand.dmi index ba33c217ac26..3344f1ba31cc 100644 Binary files a/icons/mob/inhands/weapons/thrown_righthand.dmi and b/icons/mob/inhands/weapons/thrown_righthand.dmi differ diff --git a/icons/mob/moth_wings.dmi b/icons/mob/moth_wings.dmi index 52626c54c834..a3a687cb91df 100644 Binary files a/icons/mob/moth_wings.dmi and b/icons/mob/moth_wings.dmi differ diff --git a/icons/mob/pets.dmi b/icons/mob/pets.dmi index fea296d63596..a4dc31d0f062 100644 Binary files a/icons/mob/pets.dmi and b/icons/mob/pets.dmi differ diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi index 7d92e31640e2..6b03f5bd35c0 100644 Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ diff --git a/icons/mob/simple_human.dmi b/icons/mob/simple_human.dmi index 9c31f5b8907b..c56efdd5f0a6 100644 Binary files a/icons/mob/simple_human.dmi and b/icons/mob/simple_human.dmi differ diff --git a/whitesands/icons/mob/spider.dmi b/icons/mob/species/rachnid/spider.dmi similarity index 100% rename from whitesands/icons/mob/spider.dmi rename to icons/mob/species/rachnid/spider.dmi diff --git a/whitesands/icons/mob/spider_legs.dmi b/icons/mob/species/rachnid/spider_legs.dmi similarity index 100% rename from whitesands/icons/mob/spider_legs.dmi rename to icons/mob/species/rachnid/spider_legs.dmi diff --git a/whitesands/icons/mob/spider_mandibles.dmi b/icons/mob/species/rachnid/spider_mandibles.dmi similarity index 100% rename from whitesands/icons/mob/spider_mandibles.dmi rename to icons/mob/species/rachnid/spider_mandibles.dmi diff --git a/whitesands/icons/mob/spider_spinneret.dmi b/icons/mob/species/rachnid/spider_spinneret.dmi similarity index 100% rename from whitesands/icons/mob/spider_spinneret.dmi rename to icons/mob/species/rachnid/spider_spinneret.dmi diff --git a/whitesands/icons/obj/64x32.dmi b/icons/obj/64x32.dmi similarity index 100% rename from whitesands/icons/obj/64x32.dmi rename to icons/obj/64x32.dmi diff --git a/whitesands/icons/obj/atmospherics/components/relief_valve.dmi b/icons/obj/atmospherics/components/relief_valve.dmi similarity index 100% rename from whitesands/icons/obj/atmospherics/components/relief_valve.dmi rename to icons/obj/atmospherics/components/relief_valve.dmi diff --git a/icons/obj/atmospherics/pipes/pipe_item.dmi b/icons/obj/atmospherics/pipes/pipe_item.dmi index 7b7936ac6a7d..60d377f589d2 100644 Binary files a/icons/obj/atmospherics/pipes/pipe_item.dmi and b/icons/obj/atmospherics/pipes/pipe_item.dmi differ diff --git a/whitesands/icons/obj/bags.dmi b/icons/obj/bags.dmi similarity index 100% rename from whitesands/icons/obj/bags.dmi rename to icons/obj/bags.dmi diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index b48dab77e856..1607dc47db22 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi index 9e528a8c9716..e5b809e1f8be 100644 Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi index d5d40018bdf7..4c0d1aa14be3 100644 Binary files a/icons/obj/cigarettes.dmi and b/icons/obj/cigarettes.dmi differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index 994d02556ef5..01fac8aeadd8 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 891e2bab911d..3ec5d3d88932 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ diff --git a/icons/obj/doors/1x2blast_hor.dmi b/icons/obj/doors/1x2blast_hor.dmi index a0a3d9351f1a..5bb0c401d033 100644 Binary files a/icons/obj/doors/1x2blast_hor.dmi and b/icons/obj/doors/1x2blast_hor.dmi differ diff --git a/icons/obj/doors/1x2blast_vert.dmi b/icons/obj/doors/1x2blast_vert.dmi index 6e810457d142..2146e52e9a4b 100644 Binary files a/icons/obj/doors/1x2blast_vert.dmi and b/icons/obj/doors/1x2blast_vert.dmi differ diff --git a/whitesands/icons/obj/doors/1x3blast_hor.dmi b/icons/obj/doors/1x3blast_hor.dmi similarity index 100% rename from whitesands/icons/obj/doors/1x3blast_hor.dmi rename to icons/obj/doors/1x3blast_hor.dmi diff --git a/whitesands/icons/obj/doors/1x3blast_vert.dmi b/icons/obj/doors/1x3blast_vert.dmi similarity index 100% rename from whitesands/icons/obj/doors/1x3blast_vert.dmi rename to icons/obj/doors/1x3blast_vert.dmi diff --git a/icons/obj/doors/1x4blast_hor.dmi b/icons/obj/doors/1x4blast_hor.dmi index d43298973c97..75ed414ad19e 100644 Binary files a/icons/obj/doors/1x4blast_hor.dmi and b/icons/obj/doors/1x4blast_hor.dmi differ diff --git a/icons/obj/doors/1x4blast_vert.dmi b/icons/obj/doors/1x4blast_vert.dmi index 26c730b983a1..8db2877d8516 100644 Binary files a/icons/obj/doors/1x4blast_vert.dmi and b/icons/obj/doors/1x4blast_vert.dmi differ diff --git a/whitesands/icons/obj/doors/airlocks/shuttle/overlays.dmi b/icons/obj/doors/airlocks/shuttle/old_overlays.dmi similarity index 100% rename from whitesands/icons/obj/doors/airlocks/shuttle/overlays.dmi rename to icons/obj/doors/airlocks/shuttle/old_overlays.dmi diff --git a/icons/obj/doors/airlocks/shuttle/shuttle.dmi b/icons/obj/doors/airlocks/shuttle/shuttle.dmi index b4b998e4bcb7..0e0559716331 100644 Binary files a/icons/obj/doors/airlocks/shuttle/shuttle.dmi and b/icons/obj/doors/airlocks/shuttle/shuttle.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 3a9f1582d3ff..3d63fdd56359 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/whitesands/icons/obj/flags.dmi b/icons/obj/flags.dmi similarity index 100% rename from whitesands/icons/obj/flags.dmi rename to icons/obj/flags.dmi diff --git a/whitesands/icons/obj/hazard.dmi b/icons/obj/hazard.dmi similarity index 100% rename from whitesands/icons/obj/hazard.dmi rename to icons/obj/hazard.dmi diff --git a/icons/obj/hydroponics/growing.dmi b/icons/obj/hydroponics/growing.dmi index abd9df066c8a..c1db09aec60d 100644 Binary files a/icons/obj/hydroponics/growing.dmi and b/icons/obj/hydroponics/growing.dmi differ diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi index 208a046f0e41..c4ace9a98ad7 100644 Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ diff --git a/icons/obj/improvised.dmi b/icons/obj/improvised.dmi index b2ef58f7088a..43fc38a4be59 100644 Binary files a/icons/obj/improvised.dmi and b/icons/obj/improvised.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index 19e1d5307f16..b1f30ce39fcc 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index 446c61751e70..1ccf6cf78dd1 100644 Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ diff --git a/icons/obj/lavaland/ash_flora.dmi b/icons/obj/lavaland/ash_flora.dmi index 42ef66bb0169..6f971fd600dd 100644 Binary files a/icons/obj/lavaland/ash_flora.dmi and b/icons/obj/lavaland/ash_flora.dmi differ diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index 06941bcaa720..2f72e4503112 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ diff --git a/whitesands/icons/obj/machines/bsm.dmi b/icons/obj/machines/bsm.dmi similarity index 100% rename from whitesands/icons/obj/machines/bsm.dmi rename to icons/obj/machines/bsm.dmi diff --git a/icons/obj/machines/cloning.dmi b/icons/obj/machines/cloning.dmi index a32fd11627b9..de68060740e0 100644 Binary files a/icons/obj/machines/cloning.dmi and b/icons/obj/machines/cloning.dmi differ diff --git a/whitesands/icons/obj/machines/deepcore.dmi b/icons/obj/machines/deepcore.dmi similarity index 100% rename from whitesands/icons/obj/machines/deepcore.dmi rename to icons/obj/machines/deepcore.dmi diff --git a/whitesands/icons/obj/machines/drill.dmi b/icons/obj/machines/drill.dmi similarity index 100% rename from whitesands/icons/obj/machines/drill.dmi rename to icons/obj/machines/drill.dmi diff --git a/whitesands/icons/obj/machines/orm.dmi b/icons/obj/machines/orm.dmi similarity index 100% rename from whitesands/icons/obj/machines/orm.dmi rename to icons/obj/machines/orm.dmi diff --git a/icons/obj/machines/sleeper.dmi b/icons/obj/machines/sleeper.dmi index 83b63d654a8c..3258d652257b 100644 Binary files a/icons/obj/machines/sleeper.dmi and b/icons/obj/machines/sleeper.dmi differ diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi index 225cd1b3d1f9..c8c93013e86d 100644 Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ diff --git a/icons/obj/monitors.dmi b/icons/obj/monitors.dmi index c06b0f722a4f..074a8c2d9521 100644 Binary files a/icons/obj/monitors.dmi and b/icons/obj/monitors.dmi differ diff --git a/icons/obj/nutanks.dmi b/icons/obj/nutanks.dmi new file mode 100644 index 000000000000..c325dadf1c32 Binary files /dev/null and b/icons/obj/nutanks.dmi differ diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi index 241bb46b98a9..541b7449036b 100644 Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ diff --git a/icons/obj/plushes.dmi b/icons/obj/plushes.dmi index dbca125a354b..aae620d6b5b3 100644 Binary files a/icons/obj/plushes.dmi and b/icons/obj/plushes.dmi differ diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi index 75c32c754424..eb64b631ca4c 100644 Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ diff --git a/icons/obj/shields.dmi b/icons/obj/shields.dmi index 47bdc940d288..42a1df870181 100644 Binary files a/icons/obj/shields.dmi and b/icons/obj/shields.dmi differ diff --git a/whitesands/icons/obj/shuttle.dmi b/icons/obj/shuttle.dmi similarity index 100% rename from whitesands/icons/obj/shuttle.dmi rename to icons/obj/shuttle.dmi diff --git a/whitesands/icons/obj/smooth_structures/catwalk.dmi b/icons/obj/smooth_structures/more_catwalk.dmi similarity index 100% rename from whitesands/icons/obj/smooth_structures/catwalk.dmi rename to icons/obj/smooth_structures/more_catwalk.dmi diff --git a/whitesands/icons/obj/smooth_structures/reinforced_wood_table.dmi b/icons/obj/smooth_structures/reinforced_wood_table.dmi similarity index 100% rename from whitesands/icons/obj/smooth_structures/reinforced_wood_table.dmi rename to icons/obj/smooth_structures/reinforced_wood_table.dmi diff --git a/icons/obj/smooth_structures/shuttle_window.dmi b/icons/obj/smooth_structures/shuttle_window.dmi index b1b6d9e47d15..f0cd4364a746 100644 Binary files a/icons/obj/smooth_structures/shuttle_window.dmi and b/icons/obj/smooth_structures/shuttle_window.dmi differ diff --git a/whitesands/icons/obj/solgov_floor.dmi b/icons/obj/solgov_floor.dmi similarity index 100% rename from whitesands/icons/obj/solgov_floor.dmi rename to icons/obj/solgov_floor.dmi diff --git a/whitesands/icons/obj/solgov_logos.dmi b/icons/obj/solgov_logos.dmi similarity index 100% rename from whitesands/icons/obj/solgov_logos.dmi rename to icons/obj/solgov_logos.dmi diff --git a/icons/obj/stack_objects.dmi b/icons/obj/stack_objects.dmi index c55d6e4c7017..9b1a543b724d 100644 Binary files a/icons/obj/stack_objects.dmi and b/icons/obj/stack_objects.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 17bd2c83ac0b..9e1cb32c3c23 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ diff --git a/icons/obj/structures_spawners.dmi b/icons/obj/structures_spawners.dmi index 45d3f3bc3ee4..1d34347a2c98 100644 Binary files a/icons/obj/structures_spawners.dmi and b/icons/obj/structures_spawners.dmi differ diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi index 1ead9de9c0ce..913ebf8fc5a2 100644 Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ diff --git a/icons/obj/syringe.dmi b/icons/obj/syringe.dmi index 6e747370668c..d331d2852361 100644 Binary files a/icons/obj/syringe.dmi and b/icons/obj/syringe.dmi differ diff --git a/icons/obj/tapes.dmi b/icons/obj/tapes.dmi index a406a4dd1f9a..cbc5ca921cdc 100644 Binary files a/icons/obj/tapes.dmi and b/icons/obj/tapes.dmi differ diff --git a/icons/obj/terminals.dmi b/icons/obj/terminals.dmi index 717ec7ed38b1..200d657b0992 100644 Binary files a/icons/obj/terminals.dmi and b/icons/obj/terminals.dmi differ diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index a80959a2d39e..5e072b68f42d 100644 Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi index 609d59fdf545..4c9bec48b3c4 100644 Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ diff --git a/icons/obj/vehicles.dmi b/icons/obj/vehicles.dmi index 3e769a312c64..a935a37239fb 100644 Binary files a/icons/obj/vehicles.dmi and b/icons/obj/vehicles.dmi differ diff --git a/whitesands/icons/obj/closet.dmi b/icons/obj/wallcloset.dmi similarity index 100% rename from whitesands/icons/obj/closet.dmi rename to icons/obj/wallcloset.dmi diff --git a/icons/obj/wallmounts.dmi b/icons/obj/wallmounts.dmi index f4127bb8c618..1ba247814045 100644 Binary files a/icons/obj/wallmounts.dmi and b/icons/obj/wallmounts.dmi differ diff --git a/icons/turf/decals.dmi b/icons/turf/decals.dmi index aa6eed5fdb04..7b7407354046 100644 Binary files a/icons/turf/decals.dmi and b/icons/turf/decals.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index 5db0b0a329bb..b3e2de1d7e4f 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ diff --git a/whitesands/icons/turf/floors/medians.dmi b/icons/turf/floors/medians.dmi similarity index 100% rename from whitesands/icons/turf/floors/medians.dmi rename to icons/turf/floors/medians.dmi diff --git a/whitesands/icons/turf/floors/nanoweave_beige.dmi b/icons/turf/floors/nanoweave_beige.dmi similarity index 100% rename from whitesands/icons/turf/floors/nanoweave_beige.dmi rename to icons/turf/floors/nanoweave_beige.dmi diff --git a/whitesands/icons/turf/floors/nanoweave_blue.dmi b/icons/turf/floors/nanoweave_blue.dmi similarity index 100% rename from whitesands/icons/turf/floors/nanoweave_blue.dmi rename to icons/turf/floors/nanoweave_blue.dmi diff --git a/whitesands/icons/turf/floors/nanoweave_dark.dmi b/icons/turf/floors/nanoweave_dark.dmi similarity index 100% rename from whitesands/icons/turf/floors/nanoweave_dark.dmi rename to icons/turf/floors/nanoweave_dark.dmi diff --git a/whitesands/icons/turf/floors/nanoweave_orange.dmi b/icons/turf/floors/nanoweave_orange.dmi similarity index 100% rename from whitesands/icons/turf/floors/nanoweave_orange.dmi rename to icons/turf/floors/nanoweave_orange.dmi diff --git a/whitesands/icons/turf/floors/nanoweave_purple.dmi b/icons/turf/floors/nanoweave_purple.dmi similarity index 100% rename from whitesands/icons/turf/floors/nanoweave_purple.dmi rename to icons/turf/floors/nanoweave_purple.dmi diff --git a/whitesands/icons/turf/floors/nanoweave_red.dmi b/icons/turf/floors/nanoweave_red.dmi similarity index 100% rename from whitesands/icons/turf/floors/nanoweave_red.dmi rename to icons/turf/floors/nanoweave_red.dmi diff --git a/whitesands/icons/turf/floors/shuttle_floors.dmi b/icons/turf/floors/shuttle_floors.dmi similarity index 100% rename from whitesands/icons/turf/floors/shuttle_floors.dmi rename to icons/turf/floors/shuttle_floors.dmi diff --git a/whitesands/icons/turf/floors/techfloor.dmi b/icons/turf/floors/techfloor.dmi similarity index 100% rename from whitesands/icons/turf/floors/techfloor.dmi rename to icons/turf/floors/techfloor.dmi diff --git a/whitesands/icons/turf/floors/tiles.dmi b/icons/turf/floors/tiles.dmi similarity index 100% rename from whitesands/icons/turf/floors/tiles.dmi rename to icons/turf/floors/tiles.dmi diff --git a/whitesands/icons/turf/floors/whitesands/ws_floors.dmi b/icons/turf/floors/ws_floors.dmi similarity index 100% rename from whitesands/icons/turf/floors/whitesands/ws_floors.dmi rename to icons/turf/floors/ws_floors.dmi diff --git a/whitesands/icons/turf/overmap.dmi b/icons/turf/overmap.dmi similarity index 100% rename from whitesands/icons/turf/overmap.dmi rename to icons/turf/overmap.dmi diff --git a/icons/turf/walls/shuttle_wall.dmi b/icons/turf/walls/shuttle_wall.dmi index f8c03e3946b9..9b048fd12780 100644 Binary files a/icons/turf/walls/shuttle_wall.dmi and b/icons/turf/walls/shuttle_wall.dmi differ diff --git a/whitesands/icons/turf/walls/whitesands/ws_walls.dmi b/icons/turf/walls/ws_walls.dmi similarity index 100% rename from whitesands/icons/turf/walls/whitesands/ws_walls.dmi rename to icons/turf/walls/ws_walls.dmi diff --git a/whitesands/sound/effects/alarm.ogg b/sound/effects/alarm.ogg similarity index 100% rename from whitesands/sound/effects/alarm.ogg rename to sound/effects/alarm.ogg diff --git a/whitesands/sound/effects/footstep/squid1.ogg b/sound/effects/footstep/squid1.ogg similarity index 100% rename from whitesands/sound/effects/footstep/squid1.ogg rename to sound/effects/footstep/squid1.ogg diff --git a/whitesands/sound/effects/footstep/squid2.ogg b/sound/effects/footstep/squid2.ogg similarity index 100% rename from whitesands/sound/effects/footstep/squid2.ogg rename to sound/effects/footstep/squid2.ogg diff --git a/whitesands/sound/effects/footstep/squid3.ogg b/sound/effects/footstep/squid3.ogg similarity index 100% rename from whitesands/sound/effects/footstep/squid3.ogg rename to sound/effects/footstep/squid3.ogg diff --git a/whitesands/sound/effects/mowermove1.ogg b/sound/effects/mowermove1.ogg similarity index 100% rename from whitesands/sound/effects/mowermove1.ogg rename to sound/effects/mowermove1.ogg diff --git a/whitesands/sound/effects/mowermove2.ogg b/sound/effects/mowermove2.ogg similarity index 100% rename from whitesands/sound/effects/mowermove2.ogg rename to sound/effects/mowermove2.ogg diff --git a/whitesands/sound/effects/mowermovesquish.ogg b/sound/effects/mowermovesquish.ogg similarity index 100% rename from whitesands/sound/effects/mowermovesquish.ogg rename to sound/effects/mowermovesquish.ogg diff --git a/whitesands/sound/hornetnoises/Hornet_Fight_Death_01.ogg b/sound/hornetnoises/Hornet_Fight_Death_01.ogg similarity index 100% rename from whitesands/sound/hornetnoises/Hornet_Fight_Death_01.ogg rename to sound/hornetnoises/Hornet_Fight_Death_01.ogg diff --git a/whitesands/sound/hornetnoises/agoguskill.ogg b/sound/hornetnoises/agoguskill.ogg similarity index 100% rename from whitesands/sound/hornetnoises/agoguskill.ogg rename to sound/hornetnoises/agoguskill.ogg diff --git a/whitesands/sound/hornetnoises/hornet_SHAW.ogg b/sound/hornetnoises/hornet_SHAW.ogg similarity index 100% rename from whitesands/sound/hornetnoises/hornet_SHAW.ogg rename to sound/hornetnoises/hornet_SHAW.ogg diff --git a/whitesands/sound/hornetnoises/hornet_gitgud.ogg b/sound/hornetnoises/hornet_gitgud.ogg similarity index 100% rename from whitesands/sound/hornetnoises/hornet_gitgud.ogg rename to sound/hornetnoises/hornet_gitgud.ogg diff --git a/whitesands/sound/items/openbottle.ogg b/sound/items/openbottle.ogg similarity index 100% rename from whitesands/sound/items/openbottle.ogg rename to sound/items/openbottle.ogg diff --git a/whitesands/sound/items/tape.ogg b/sound/items/tape.ogg similarity index 100% rename from whitesands/sound/items/tape.ogg rename to sound/items/tape.ogg diff --git a/whitesands/sound/voice/speen.ogg b/sound/voice/speen.ogg similarity index 100% rename from whitesands/sound/voice/speen.ogg rename to sound/voice/speen.ogg diff --git a/whitesands/sound/voice/squid/squidscream.ogg b/sound/voice/squid/squidscream.ogg similarity index 100% rename from whitesands/sound/voice/squid/squidscream.ogg rename to sound/voice/squid/squidscream.ogg diff --git a/whitesands/sound/weapons/SolGov_sword_arm.ogg b/sound/weapons/SolGov_sword_arm.ogg similarity index 100% rename from whitesands/sound/weapons/SolGov_sword_arm.ogg rename to sound/weapons/SolGov_sword_arm.ogg diff --git a/whitesands/sound/weapons/anime_slash.ogg b/sound/weapons/anime_slash.ogg similarity index 100% rename from whitesands/sound/weapons/anime_slash.ogg rename to sound/weapons/anime_slash.ogg diff --git a/whitesands/sound/weapons/bowdraw.ogg b/sound/weapons/bowdraw.ogg similarity index 100% rename from whitesands/sound/weapons/bowdraw.ogg rename to sound/weapons/bowdraw.ogg diff --git a/whitesands/sound/weapons/bowfire.ogg b/sound/weapons/bowfire.ogg similarity index 100% rename from whitesands/sound/weapons/bowfire.ogg rename to sound/weapons/bowfire.ogg diff --git a/whitesands/sound/weapons/gun/commissar/dontturnaround.ogg b/sound/weapons/gun/commissar/dontturnaround.ogg similarity index 100% rename from whitesands/sound/weapons/gun/commissar/dontturnaround.ogg rename to sound/weapons/gun/commissar/dontturnaround.ogg diff --git a/whitesands/sound/weapons/gun/commissar/dry.ogg b/sound/weapons/gun/commissar/dry.ogg similarity index 100% rename from whitesands/sound/weapons/gun/commissar/dry.ogg rename to sound/weapons/gun/commissar/dry.ogg diff --git a/whitesands/sound/weapons/gun/commissar/magazine.ogg b/sound/weapons/gun/commissar/magazine.ogg similarity index 100% rename from whitesands/sound/weapons/gun/commissar/magazine.ogg rename to sound/weapons/gun/commissar/magazine.ogg diff --git a/whitesands/sound/weapons/gun/commissar/pickup.ogg b/sound/weapons/gun/commissar/pickup.ogg similarity index 100% rename from whitesands/sound/weapons/gun/commissar/pickup.ogg rename to sound/weapons/gun/commissar/pickup.ogg diff --git a/whitesands/sound/weapons/gun/commissar/shot.ogg b/sound/weapons/gun/commissar/shot.ogg similarity index 100% rename from whitesands/sound/weapons/gun/commissar/shot.ogg rename to sound/weapons/gun/commissar/shot.ogg diff --git a/whitesands/sound/weapons/gun/shotgun/quadfire.ogg b/sound/weapons/gun/shotgun/quadfire.ogg similarity index 100% rename from whitesands/sound/weapons/gun/shotgun/quadfire.ogg rename to sound/weapons/gun/shotgun/quadfire.ogg diff --git a/whitesands/sound/weapons/gun/shotgun/quadinsert.ogg b/sound/weapons/gun/shotgun/quadinsert.ogg similarity index 100% rename from whitesands/sound/weapons/gun/shotgun/quadinsert.ogg rename to sound/weapons/gun/shotgun/quadinsert.ogg diff --git a/whitesands/sound/weapons/gun/shotgun/quadrack.ogg b/sound/weapons/gun/shotgun/quadrack.ogg similarity index 100% rename from whitesands/sound/weapons/gun/shotgun/quadrack.ogg rename to sound/weapons/gun/shotgun/quadrack.ogg diff --git a/whitesands/sound/weapons/unsheathed_blade.ogg b/sound/weapons/unsheathed_blade.ogg similarity index 100% rename from whitesands/sound/weapons/unsheathed_blade.ogg rename to sound/weapons/unsheathed_blade.ogg diff --git a/whitesands/tools/generate-spider-names.sh b/tools/generate-spider-names.sh similarity index 100% rename from whitesands/tools/generate-spider-names.sh rename to tools/generate-spider-names.sh diff --git a/whitesands/tools/merge-upstream-pull-request.sh b/tools/merge-upstream-pull-request.sh similarity index 100% rename from whitesands/tools/merge-upstream-pull-request.sh rename to tools/merge-upstream-pull-request.sh diff --git a/whitesands/tools/spidernames.js b/tools/spidernames.js similarity index 100% rename from whitesands/tools/spidernames.js rename to tools/spidernames.js diff --git a/whitesands/README.md b/whitesands/README.md deleted file mode 100644 index 2ab388ed03e0..000000000000 --- a/whitesands/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Depreaciated Modularized Custom File Directory - -## What it was - -This directory existed to house custom code changes that could be properly seperated from the codebase and placed here. While Whitesands once mirrored /tg/ changes, and -this directory was necessary to prevent merge conflicts and pain, it is no longer needed and can be properly disreguarded. Any help with demodularizing this folder -would be greatly appreciated. diff --git a/whitesands/code/datums/ruins/jungle.dm b/whitesands/code/datums/ruins/jungle.dm deleted file mode 100644 index b5d137f0c084..000000000000 --- a/whitesands/code/datums/ruins/jungle.dm +++ /dev/null @@ -1,142 +0,0 @@ -// Hey! Listen! Update \config\jungleruinblacklist.txt with your new ruins! - -/datum/map_template/ruin/jungle - prefix = "_maps/RandomRuins/JungleRuins/" - -/datum/map_template/ruin/jungle/solgov_crash - name = "Abandoned SolGov Exploration Pod" - id = "jungle-solgov-explorer" - description = "A recently abandoned standard SolGov exploration pod. It may not be powerful or resilient, but it can fly in a pinch." - suffix = "jungle_surface_abandonedsolgov.dmm" - -/datum/map_template/ruin/jungle/monke - name = "Enlightenment" - id = "jungle-monkies" - description = "Ook. Ooh Ooh Aah. AAH. OOK OOK OOK. OOK OOK AAH AAAH AAAAAAAAAAAAAAAH!" - suffix = "jungle_surface_monkies.dmm" - -/datum/map_template/ruin/jungle/ai_ikea - name = "Space Ikea AI Shipment" - id = "ikea-ai" - description = "A Space Ikea Brand AI Core and Necessities Crate, it seems to have missed its intended target." - suffix = "jungle_surface_ikea_ai.dmm" - -/datum/map_template/ruin/jungle/coffinpirate - name = "Coffin-Shaped Pirate Hut" - id = "coffinpirate" - description = "An odd coffin shaped pirate hut that the inhabitant of died in." - suffix = "jungle_surface_coffinpirate.dmm" - -/datum/map_template/ruin/jungle/medtech - name = "MedTech facility" - id = "medtech-facility" - description = "A MedTech pharmaceutical manufacturing plant where something went terribly wrong." - suffix = "jungle_medtech_outbreak.dmm" - - -///how bad can i possibly be? -/datum/map_template/ruin/jungle/onceler - name = "Thneed Factory" - id = "tumblr-sexyman" - description = "After a logging incident gone wrong, the Syndicate invade this factory to stop the beast." - suffix = "jungle_surface_tumblr_sexyman.dmm" - -//putting this area here until i make jungle areas.dm in another PR that i am totally making -/area/ruin/jungle/onceler/main - requires_power = FALSE - name = "Thneed Factory" - icon_state = "engine" - -//thneedville end - -//industrial society blah blah blah -/datum/map_template/ruin/jungle/unabomber - name = "Bombmaker's Cabin" - id = "unabomber-cabin" - description = "The Industrial Revolution and its consequences have been a disaster for the human race." - suffix = "jungle_surface_unabomber_cabin.dmm" - -/datum/map_template/ruin/jungle/weedshack - name = "Stoner's Cabin" - id = "weed-shack" - description = "The Industrial Revolution and its consequences have been a disaster for the human race." - suffix = "jungle_surface_weed_shack.dmm" - -//vae's jungle ruins from bungalowstation -/datum/map_template/ruin/jungle/pizzawave - name = "Jungle Pizzawave" - id = "pizzawave" - description = "Get some pizza my dude." - suffix = "jungle_pizzawave.dmm" - -/datum/map_template/ruin/jungle/nest - name = "Jungle Xenonest" - id = "xenonestjungle" - description = "A Xeno nest crammed into the Jungle." - suffix = "jungle_nest.dmm" - -/datum/map_template/ruin/jungle/seedling - name = "Seedling ruin" - id = "seedling" - description = "A rare seedling plant." - suffix = "jungle_seedling.dmm" - -/datum/map_template/ruin/jungle/demon - name = "Demonic Office" - id = "demonjungle" - description = "They handle the paperwork that comes with selling your soul." - suffix = "jungle_demon.dmm" - -/datum/map_template/ruin/jungle/hangar - name = "Abandoned Hangar" - id = "hangar" - description = "An abandoned hangar containing exosuits." - suffix = "jungle_hangar.dmm" - -/datum/map_template/ruin/jungle/skeleton - name = "Skeleton Pile" - id = "skeletonjungle" - description = "You will get boned." - suffix = "jungle_skeleton.dmm" - -/datum/map_template/ruin/jungle/spider - name = "Jungle Spiders" - id = "spiderjungle" - description = "A genetic experiment gone wrong." - suffix = "jungle_spider.dmm" - -/datum/map_template/ruin/jungle/pirate - name = "Jungle Pirates" - id = "piratejungle" - description = "A group of pirates on a small ship in the jungle." - suffix = "jungle_pirate.dmm" - -/datum/map_template/ruin/jungle/syndicate - name = "Jungle Syndicate Bunker" - id = "syndicatebunkerjungle" - description = "A small bunker owned by the Syndicate." - suffix = "jungle_syndicate.dmm" - -/datum/map_template/ruin/jungle/village - name = "Monkey Village" - id = "monkeyvillage" - description = "A small village of monkeys." - suffix = "jungle_village.dmm" - -/datum/map_template/ruin/jungle/witch - name = "Jungle Witch" - id = "witchjungle" - description = "Some heretical sorcerer living in a dingy hut, with a cat." - suffix = "jungle_witch.dmm" - -/datum/map_template/ruin/jungle/roommates - name = "Roommates" - id = "roommates" - description = "And they were roommates." - suffix = "jungle_surface_roommates.dmm" - -/datum/map_template/ruin/jungle/ninjashrine - name = "Ninja Shrine" - id = "ninjashrine" - description = "A ninja shrine." - suffix = "jungle_surface_ninjashrine.dmm" diff --git a/whitesands/icons/effects/beam.dmi b/whitesands/icons/effects/beam.dmi deleted file mode 100644 index 792622d8fd2c..000000000000 Binary files a/whitesands/icons/effects/beam.dmi and /dev/null differ diff --git a/whitesands/icons/effects/effects.dmi b/whitesands/icons/effects/effects.dmi deleted file mode 100644 index a2ae44379781..000000000000 Binary files a/whitesands/icons/effects/effects.dmi and /dev/null differ diff --git a/whitesands/icons/effects/language.dmi b/whitesands/icons/effects/language.dmi deleted file mode 100644 index 84c2ae3a403e..000000000000 Binary files a/whitesands/icons/effects/language.dmi and /dev/null differ diff --git a/whitesands/icons/effects/prefabdecals.dmi b/whitesands/icons/effects/prefabdecals.dmi deleted file mode 100644 index 93c13cc1c9a9..000000000000 Binary files a/whitesands/icons/effects/prefabdecals.dmi and /dev/null differ diff --git a/whitesands/icons/effects/warning_stripes.dmi b/whitesands/icons/effects/warning_stripes.dmi deleted file mode 100644 index a0cf5e32447c..000000000000 Binary files a/whitesands/icons/effects/warning_stripes.dmi and /dev/null differ diff --git a/whitesands/icons/mob/inhands/clothing/lefthand.dmi b/whitesands/icons/mob/inhands/clothing/lefthand.dmi deleted file mode 100644 index cb03640df153..000000000000 Binary files a/whitesands/icons/mob/inhands/clothing/lefthand.dmi and /dev/null differ diff --git a/whitesands/icons/mob/inhands/clothing/righthand.dmi b/whitesands/icons/mob/inhands/clothing/righthand.dmi deleted file mode 100644 index 3ecec7b7fbad..000000000000 Binary files a/whitesands/icons/mob/inhands/clothing/righthand.dmi and /dev/null differ diff --git a/whitesands/icons/mob/inhands/equipment/medical_lefthand.dmi b/whitesands/icons/mob/inhands/equipment/medical_lefthand.dmi deleted file mode 100644 index 08dd0d20ab49..000000000000 Binary files a/whitesands/icons/mob/inhands/equipment/medical_lefthand.dmi and /dev/null differ diff --git a/whitesands/icons/mob/inhands/equipment/medical_righthand.dmi b/whitesands/icons/mob/inhands/equipment/medical_righthand.dmi deleted file mode 100644 index d74291de8c1c..000000000000 Binary files a/whitesands/icons/mob/inhands/equipment/medical_righthand.dmi and /dev/null differ diff --git a/whitesands/icons/mob/inhands/equipment/mining_lefthand.dmi b/whitesands/icons/mob/inhands/equipment/mining_lefthand.dmi deleted file mode 100644 index 6c6ce7a255e4..000000000000 Binary files a/whitesands/icons/mob/inhands/equipment/mining_lefthand.dmi and /dev/null differ diff --git a/whitesands/icons/mob/inhands/equipment/mining_righthand.dmi b/whitesands/icons/mob/inhands/equipment/mining_righthand.dmi deleted file mode 100644 index 9d914f500b81..000000000000 Binary files a/whitesands/icons/mob/inhands/equipment/mining_righthand.dmi and /dev/null differ diff --git a/whitesands/icons/mob/inhands/equipment/shields_lefthand.dmi b/whitesands/icons/mob/inhands/equipment/shields_lefthand.dmi deleted file mode 100644 index 3dff3dd308fd..000000000000 Binary files a/whitesands/icons/mob/inhands/equipment/shields_lefthand.dmi and /dev/null differ diff --git a/whitesands/icons/mob/inhands/equipment/shields_righthand.dmi b/whitesands/icons/mob/inhands/equipment/shields_righthand.dmi deleted file mode 100644 index d8927c7dbfdb..000000000000 Binary files a/whitesands/icons/mob/inhands/equipment/shields_righthand.dmi and /dev/null differ diff --git a/whitesands/icons/mob/inhands/equipment/tools_lefthand.dmi b/whitesands/icons/mob/inhands/equipment/tools_lefthand.dmi deleted file mode 100644 index 597bc157ae35..000000000000 Binary files a/whitesands/icons/mob/inhands/equipment/tools_lefthand.dmi and /dev/null differ diff --git a/whitesands/icons/mob/inhands/equipment/tools_righthand.dmi b/whitesands/icons/mob/inhands/equipment/tools_righthand.dmi deleted file mode 100644 index 1be4cd708a52..000000000000 Binary files a/whitesands/icons/mob/inhands/equipment/tools_righthand.dmi and /dev/null differ diff --git a/whitesands/icons/mob/inhands/weapons/axes_lefthand.dmi .dmi b/whitesands/icons/mob/inhands/weapons/axes_lefthand.dmi .dmi deleted file mode 100644 index ee45deec39e9..000000000000 Binary files a/whitesands/icons/mob/inhands/weapons/axes_lefthand.dmi .dmi and /dev/null differ diff --git a/whitesands/icons/mob/inhands/weapons/axes_righthand.dmi .dmi b/whitesands/icons/mob/inhands/weapons/axes_righthand.dmi .dmi deleted file mode 100644 index cc61fe7e48bb..000000000000 Binary files a/whitesands/icons/mob/inhands/weapons/axes_righthand.dmi .dmi and /dev/null differ diff --git a/whitesands/icons/mob/inhands/weapons/polearms_lefthand.dmi b/whitesands/icons/mob/inhands/weapons/polearms_lefthand.dmi deleted file mode 100644 index 5e10bc0d97e3..000000000000 Binary files a/whitesands/icons/mob/inhands/weapons/polearms_lefthand.dmi and /dev/null differ diff --git a/whitesands/icons/mob/inhands/weapons/polearms_righthand.dmi b/whitesands/icons/mob/inhands/weapons/polearms_righthand.dmi deleted file mode 100644 index 2b1432b562e1..000000000000 Binary files a/whitesands/icons/mob/inhands/weapons/polearms_righthand.dmi and /dev/null differ diff --git a/whitesands/icons/mob/inhands/weapons/swords_lefthand.dmi b/whitesands/icons/mob/inhands/weapons/swords_lefthand.dmi deleted file mode 100644 index df4e45c697f5..000000000000 Binary files a/whitesands/icons/mob/inhands/weapons/swords_lefthand.dmi and /dev/null differ diff --git a/whitesands/icons/mob/inhands/weapons/swords_righthand.dmi b/whitesands/icons/mob/inhands/weapons/swords_righthand.dmi deleted file mode 100644 index e7e7c4ed1343..000000000000 Binary files a/whitesands/icons/mob/inhands/weapons/swords_righthand.dmi and /dev/null differ diff --git a/whitesands/icons/mob/inhands/weapons/thrown_lefthand.dmi .dmi b/whitesands/icons/mob/inhands/weapons/thrown_lefthand.dmi .dmi deleted file mode 100644 index 21eee5d69fd4..000000000000 Binary files a/whitesands/icons/mob/inhands/weapons/thrown_lefthand.dmi .dmi and /dev/null differ diff --git a/whitesands/icons/mob/inhands/weapons/thrown_righthand.dmi b/whitesands/icons/mob/inhands/weapons/thrown_righthand.dmi deleted file mode 100644 index 04bf163eff79..000000000000 Binary files a/whitesands/icons/mob/inhands/weapons/thrown_righthand.dmi and /dev/null differ diff --git a/whitesands/icons/mob/moth_wings.dmi b/whitesands/icons/mob/moth_wings.dmi deleted file mode 100644 index a3a687cb91df..000000000000 Binary files a/whitesands/icons/mob/moth_wings.dmi and /dev/null differ diff --git a/whitesands/icons/mob/pets.dmi b/whitesands/icons/mob/pets.dmi deleted file mode 100644 index eb0f07778125..000000000000 Binary files a/whitesands/icons/mob/pets.dmi and /dev/null differ diff --git a/whitesands/icons/mob/robots.dmi b/whitesands/icons/mob/robots.dmi deleted file mode 100644 index 7606f78f4ba8..000000000000 Binary files a/whitesands/icons/mob/robots.dmi and /dev/null differ diff --git a/whitesands/icons/mob/screen_ghost.dmi b/whitesands/icons/mob/screen_ghost.dmi deleted file mode 100644 index d57be0966277..000000000000 Binary files a/whitesands/icons/mob/screen_ghost.dmi and /dev/null differ diff --git a/whitesands/icons/mob/simple_human.dmi b/whitesands/icons/mob/simple_human.dmi deleted file mode 100644 index 23576f45a0a5..000000000000 Binary files a/whitesands/icons/mob/simple_human.dmi and /dev/null differ diff --git a/whitesands/icons/obj/atmos.dmi b/whitesands/icons/obj/atmos.dmi deleted file mode 100644 index d0e43b6a52c0..000000000000 Binary files a/whitesands/icons/obj/atmos.dmi and /dev/null differ diff --git a/whitesands/icons/obj/atmospherics/pipes/pipe_item.dmi b/whitesands/icons/obj/atmospherics/pipes/pipe_item.dmi deleted file mode 100644 index 2c297a16ca46..000000000000 Binary files a/whitesands/icons/obj/atmospherics/pipes/pipe_item.dmi and /dev/null differ diff --git a/whitesands/icons/obj/card.dmi b/whitesands/icons/obj/card.dmi deleted file mode 100644 index 1607dc47db22..000000000000 Binary files a/whitesands/icons/obj/card.dmi and /dev/null differ diff --git a/whitesands/icons/obj/catwalks.dmi b/whitesands/icons/obj/catwalks.dmi deleted file mode 100644 index 20c5e1f4d98b..000000000000 Binary files a/whitesands/icons/obj/catwalks.dmi and /dev/null differ diff --git a/whitesands/icons/obj/chemical.dmi b/whitesands/icons/obj/chemical.dmi deleted file mode 100644 index a960cdc96109..000000000000 Binary files a/whitesands/icons/obj/chemical.dmi and /dev/null differ diff --git a/whitesands/icons/obj/cigarettes.dmi b/whitesands/icons/obj/cigarettes.dmi deleted file mode 100644 index 33f6cdc57968..000000000000 Binary files a/whitesands/icons/obj/cigarettes.dmi and /dev/null differ diff --git a/whitesands/icons/obj/decals.dmi b/whitesands/icons/obj/decals.dmi deleted file mode 100644 index 64383c6ab07e..000000000000 Binary files a/whitesands/icons/obj/decals.dmi and /dev/null differ diff --git a/whitesands/icons/obj/device.dmi b/whitesands/icons/obj/device.dmi deleted file mode 100644 index c51b6df7307f..000000000000 Binary files a/whitesands/icons/obj/device.dmi and /dev/null differ diff --git a/whitesands/icons/obj/doors/1x2blast_hor.dmi b/whitesands/icons/obj/doors/1x2blast_hor.dmi deleted file mode 100644 index 59827a280793..000000000000 Binary files a/whitesands/icons/obj/doors/1x2blast_hor.dmi and /dev/null differ diff --git a/whitesands/icons/obj/doors/1x2blast_vert.dmi b/whitesands/icons/obj/doors/1x2blast_vert.dmi deleted file mode 100644 index f3fe9da8bbfe..000000000000 Binary files a/whitesands/icons/obj/doors/1x2blast_vert.dmi and /dev/null differ diff --git a/whitesands/icons/obj/doors/1x4blast_hor.dmi b/whitesands/icons/obj/doors/1x4blast_hor.dmi deleted file mode 100644 index 41165639a905..000000000000 Binary files a/whitesands/icons/obj/doors/1x4blast_hor.dmi and /dev/null differ diff --git a/whitesands/icons/obj/doors/1x4blast_vert.dmi b/whitesands/icons/obj/doors/1x4blast_vert.dmi deleted file mode 100644 index 2835732ad540..000000000000 Binary files a/whitesands/icons/obj/doors/1x4blast_vert.dmi and /dev/null differ diff --git a/whitesands/icons/obj/doors/airlocks/shuttle/shuttle.dmi b/whitesands/icons/obj/doors/airlocks/shuttle/shuttle.dmi deleted file mode 100644 index 0e0559716331..000000000000 Binary files a/whitesands/icons/obj/doors/airlocks/shuttle/shuttle.dmi and /dev/null differ diff --git a/whitesands/icons/obj/drinks.dmi b/whitesands/icons/obj/drinks.dmi deleted file mode 100644 index 3d63fdd56359..000000000000 Binary files a/whitesands/icons/obj/drinks.dmi and /dev/null differ diff --git a/whitesands/icons/obj/improvised.dmi b/whitesands/icons/obj/improvised.dmi deleted file mode 100644 index e4d50612f7a6..000000000000 Binary files a/whitesands/icons/obj/improvised.dmi and /dev/null differ diff --git a/whitesands/icons/obj/items_and_weapons.dmi b/whitesands/icons/obj/items_and_weapons.dmi deleted file mode 100644 index 7f72f1b2de36..000000000000 Binary files a/whitesands/icons/obj/items_and_weapons.dmi and /dev/null differ diff --git a/whitesands/icons/obj/kitchen.dmi b/whitesands/icons/obj/kitchen.dmi deleted file mode 100644 index 147f9c953527..000000000000 Binary files a/whitesands/icons/obj/kitchen.dmi and /dev/null differ diff --git a/whitesands/icons/obj/lavaland/newlavalandplants.dmi b/whitesands/icons/obj/lavaland/newlavalandplants.dmi deleted file mode 100644 index 8b6d67b62f2f..000000000000 Binary files a/whitesands/icons/obj/lavaland/newlavalandplants.dmi and /dev/null differ diff --git a/whitesands/icons/obj/library.dmi b/whitesands/icons/obj/library.dmi deleted file mode 100644 index e339d9f8e6a8..000000000000 Binary files a/whitesands/icons/obj/library.dmi and /dev/null differ diff --git a/whitesands/icons/obj/machines/cloning.dmi b/whitesands/icons/obj/machines/cloning.dmi deleted file mode 100644 index de68060740e0..000000000000 Binary files a/whitesands/icons/obj/machines/cloning.dmi and /dev/null differ diff --git a/whitesands/icons/obj/machines/sleeper.dmi b/whitesands/icons/obj/machines/sleeper.dmi deleted file mode 100644 index 36564d261cf2..000000000000 Binary files a/whitesands/icons/obj/machines/sleeper.dmi and /dev/null differ diff --git a/whitesands/icons/obj/mining.dmi b/whitesands/icons/obj/mining.dmi deleted file mode 100644 index bbd45c1b9305..000000000000 Binary files a/whitesands/icons/obj/mining.dmi and /dev/null differ diff --git a/whitesands/icons/obj/monitors.dmi b/whitesands/icons/obj/monitors.dmi deleted file mode 100644 index 4337f08030b2..000000000000 Binary files a/whitesands/icons/obj/monitors.dmi and /dev/null differ diff --git a/whitesands/icons/obj/pda.dmi b/whitesands/icons/obj/pda.dmi deleted file mode 100644 index 541b7449036b..000000000000 Binary files a/whitesands/icons/obj/pda.dmi and /dev/null differ diff --git a/whitesands/icons/obj/plushes.dmi b/whitesands/icons/obj/plushes.dmi deleted file mode 100644 index 34910a8403f5..000000000000 Binary files a/whitesands/icons/obj/plushes.dmi and /dev/null differ diff --git a/whitesands/icons/obj/power.dmi b/whitesands/icons/obj/power.dmi deleted file mode 100644 index 76712f82a371..000000000000 Binary files a/whitesands/icons/obj/power.dmi and /dev/null differ diff --git a/whitesands/icons/obj/shields.dmi b/whitesands/icons/obj/shields.dmi deleted file mode 100644 index dcfda3ef96d8..000000000000 Binary files a/whitesands/icons/obj/shields.dmi and /dev/null differ diff --git a/whitesands/icons/obj/smooth_structures/shuttle_window.dmi b/whitesands/icons/obj/smooth_structures/shuttle_window.dmi deleted file mode 100644 index f0cd4364a746..000000000000 Binary files a/whitesands/icons/obj/smooth_structures/shuttle_window.dmi and /dev/null differ diff --git a/whitesands/icons/obj/stack_objects.dmi b/whitesands/icons/obj/stack_objects.dmi deleted file mode 100644 index d6177182b6a6..000000000000 Binary files a/whitesands/icons/obj/stack_objects.dmi and /dev/null differ diff --git a/whitesands/icons/obj/storage.dmi b/whitesands/icons/obj/storage.dmi deleted file mode 100644 index a1207590ffbe..000000000000 Binary files a/whitesands/icons/obj/storage.dmi and /dev/null differ diff --git a/whitesands/icons/obj/structures_spawners.dmi b/whitesands/icons/obj/structures_spawners.dmi deleted file mode 100644 index 1d34347a2c98..000000000000 Binary files a/whitesands/icons/obj/structures_spawners.dmi and /dev/null differ diff --git a/whitesands/icons/obj/surgery.dmi b/whitesands/icons/obj/surgery.dmi deleted file mode 100644 index 6f965ec4d173..000000000000 Binary files a/whitesands/icons/obj/surgery.dmi and /dev/null differ diff --git a/whitesands/icons/obj/syringe.dmi b/whitesands/icons/obj/syringe.dmi deleted file mode 100644 index ec6651e2886f..000000000000 Binary files a/whitesands/icons/obj/syringe.dmi and /dev/null differ diff --git a/whitesands/icons/obj/tapes.dmi b/whitesands/icons/obj/tapes.dmi deleted file mode 100644 index 14e267907941..000000000000 Binary files a/whitesands/icons/obj/tapes.dmi and /dev/null differ diff --git a/whitesands/icons/obj/terminals.dmi b/whitesands/icons/obj/terminals.dmi deleted file mode 100644 index a765a479ddd8..000000000000 Binary files a/whitesands/icons/obj/terminals.dmi and /dev/null differ diff --git a/whitesands/icons/obj/tiles.dmi b/whitesands/icons/obj/tiles.dmi deleted file mode 100644 index 16ee1cbb0ee8..000000000000 Binary files a/whitesands/icons/obj/tiles.dmi and /dev/null differ diff --git a/whitesands/icons/obj/tools.dmi b/whitesands/icons/obj/tools.dmi deleted file mode 100644 index 9646611ee435..000000000000 Binary files a/whitesands/icons/obj/tools.dmi and /dev/null differ diff --git a/whitesands/icons/obj/vehicles.dmi b/whitesands/icons/obj/vehicles.dmi deleted file mode 100644 index 722c25e6ca0a..000000000000 Binary files a/whitesands/icons/obj/vehicles.dmi and /dev/null differ diff --git a/whitesands/icons/obj/wallmounts.dmi b/whitesands/icons/obj/wallmounts.dmi deleted file mode 100644 index c6abe7b9d21a..000000000000 Binary files a/whitesands/icons/obj/wallmounts.dmi and /dev/null differ diff --git a/whitesands/icons/rooms/box/engine.dmi b/whitesands/icons/rooms/box/engine.dmi deleted file mode 100644 index c7b0546db252..000000000000 Binary files a/whitesands/icons/rooms/box/engine.dmi and /dev/null differ diff --git a/whitesands/icons/turf/decals.dmi b/whitesands/icons/turf/decals.dmi deleted file mode 100644 index 0c0c787fafa0..000000000000 Binary files a/whitesands/icons/turf/decals.dmi and /dev/null differ diff --git a/whitesands/icons/turf/floors.dmi b/whitesands/icons/turf/floors.dmi deleted file mode 100644 index fafe381f9e70..000000000000 Binary files a/whitesands/icons/turf/floors.dmi and /dev/null differ diff --git a/whitesands/icons/turf/floors/carpet.dmi b/whitesands/icons/turf/floors/carpet.dmi deleted file mode 100644 index c7731d595933..000000000000 Binary files a/whitesands/icons/turf/floors/carpet.dmi and /dev/null differ diff --git a/whitesands/icons/turf/floors/linoleum.dmi b/whitesands/icons/turf/floors/linoleum.dmi deleted file mode 100644 index 50bdfe878982..000000000000 Binary files a/whitesands/icons/turf/floors/linoleum.dmi and /dev/null differ diff --git a/whitesands/icons/turf/floors/plating.dmi b/whitesands/icons/turf/floors/plating.dmi deleted file mode 100644 index 2a5dc532830e..000000000000 Binary files a/whitesands/icons/turf/floors/plating.dmi and /dev/null differ diff --git a/whitesands/icons/turf/walls.dmi b/whitesands/icons/turf/walls.dmi deleted file mode 100644 index cf74d73796c8..000000000000 Binary files a/whitesands/icons/turf/walls.dmi and /dev/null differ diff --git a/whitesands/icons/turf/walls/shuttle_wall.dmi b/whitesands/icons/turf/walls/shuttle_wall.dmi deleted file mode 100644 index 9b048fd12780..000000000000 Binary files a/whitesands/icons/turf/walls/shuttle_wall.dmi and /dev/null differ