diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index d977bb4f56d..0834f28d008 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -3,12 +3,12 @@ internals_req_access = list(ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY) internal_damage_threshold = 50 armor = list("melee" = 30, "bullet" = 30, "laser" = 15, "energy" = 20, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) - mouse_pointer = 'icons/mecha/mecha_mouse.dmi' + mouse_pointer = 'icons/effects/mouse_pointers/mecha_mouse.dmi' destruction_sleep_duration = 40 exit_delay = 40 /obj/mecha/combat/restore_equipment() - mouse_pointer = 'icons/mecha/mecha_mouse.dmi' + mouse_pointer = 'icons/effects/mouse_pointers/mecha_mouse.dmi' . = ..() /obj/mecha/combat/proc/max_ammo() //Max the ammo stored for Nuke Ops mechs, or anyone else that calls this diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm index 334aaad8b63..2707e5b9439 100644 --- a/code/game/mecha/mecha_defense.dm +++ b/code/game/mecha/mecha_defense.dm @@ -151,7 +151,7 @@ log_message("EMP detected", LOG_MECHA, color="red") if(istype(src, /obj/mecha/combat)) - mouse_pointer = 'icons/mecha/mecha_mouse-disable.dmi' + mouse_pointer = 'icons/effects/mouse_pointers/mecha_mouse-disable.dmi' occupant?.update_mouse_pointer() if(!equipment_disabled && occupant) //prevent spamming this message with back-to-back EMPs to_chat(occupant, "Error -- Connection to equipment control unit has been lost.") diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 110b959dda1..277edd59347 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -232,7 +232,7 @@ /obj/effect/proc_holder/horror active = FALSE - ranged_mousepointer = 'icons/effects/cult_target.dmi' + ranged_mousepointer = 'icons/effects/mouse_pointers/cult_target.dmi' var/datum/action/innate/cult/blood_spell/attached_action /obj/effect/proc_holder/horror/Destroy() diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm index 03fe9b2c429..f1f4b77a739 100644 --- a/code/modules/antagonists/cult/cult_comms.dm +++ b/code/modules/antagonists/cult/cult_comms.dm @@ -239,7 +239,7 @@ /obj/effect/proc_holder/cultmark active = FALSE - ranged_mousepointer = 'icons/effects/cult_target.dmi' + ranged_mousepointer = 'icons/effects/mouse_pointers/cult_target.dmi' var/datum/action/innate/cult/master/cultmark/attached_action /obj/effect/proc_holder/cultmark/Destroy() @@ -272,7 +272,7 @@ var/area/A = get_area(target) attached_action.cooldown = world.time + attached_action.base_cooldown addtimer(CALLBACK(attached_action.owner, /mob.proc/update_action_buttons_icon), attached_action.base_cooldown) - C.cult_team.blood_target_image = image('icons/effects/cult_target.dmi', target, "glow", ABOVE_MOB_LAYER) + C.cult_team.blood_target_image = image('icons/effects/mouse_pointers/cult_target.dmi', target, "glow", ABOVE_MOB_LAYER) C.cult_team.blood_target_image.appearance_flags = RESET_COLOR C.cult_team.blood_target_image.pixel_x = -target.pixel_x C.cult_team.blood_target_image.pixel_y = -target.pixel_y @@ -351,7 +351,7 @@ var/area/A = get_area(target) cooldown = world.time + base_cooldown addtimer(CALLBACK(owner, /mob.proc/update_action_buttons_icon), base_cooldown) - C.cult_team.blood_target_image = image('icons/effects/cult_target.dmi', target, "glow", ABOVE_MOB_LAYER) + C.cult_team.blood_target_image = image('icons/effects/mouse_pointers/cult_target.dmi', target, "glow", ABOVE_MOB_LAYER) C.cult_team.blood_target_image.appearance_flags = RESET_COLOR C.cult_team.blood_target_image.pixel_x = -target.pixel_x C.cult_team.blood_target_image.pixel_y = -target.pixel_y @@ -412,7 +412,7 @@ /obj/effect/proc_holder/pulse active = FALSE - ranged_mousepointer = 'icons/effects/throw_target.dmi' + ranged_mousepointer = 'icons/effects/mouse_pointers/throw_target.dmi' var/datum/action/innate/cult/master/pulse/attached_action /obj/effect/proc_holder/pulse/Destroy() diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index 16e939058cd..d07060b7673 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -383,7 +383,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) /obj/effect/proc_holder/ranged_ai/override_machine active = FALSE - ranged_mousepointer = 'icons/effects/override_machine_target.dmi' + ranged_mousepointer = 'icons/effects/mouse_pointers/override_machine_target.dmi' enable_text = "You tap into the station's powernet. Click on a machine to animate it, or use the ability again to cancel." disable_text = "You release your hold on the powernet." @@ -466,7 +466,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) /obj/effect/proc_holder/ranged_ai/overload_machine active = FALSE - ranged_mousepointer = 'icons/effects/overload_machine_target.dmi' + ranged_mousepointer = 'icons/effects/mouse_pointers/overload_machine_target.dmi' enable_text = "You tap into the station's powernet. Click on a machine to detonate it, or use the ability again to cancel." disable_text = "You release your hold on the powernet." diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm index c557a207b99..52310187939 100644 --- a/code/modules/cargo/centcom_podlauncher.dm +++ b/code/modules/cargo/centcom_podlauncher.dm @@ -445,8 +445,8 @@ force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.adm /datum/centcom_podlauncher/proc/updateCursor(var/launching) //Update the moues of the user if (holder) //Check to see if we have a client if (launching) //If the launching param is true, we give the user new mouse icons. - holder.mouse_up_icon = 'icons/effects/supplypod_target.dmi' //Icon for when mouse is released - holder.mouse_down_icon = 'icons/effects/supplypod_down_target.dmi' //Icon for when mouse is pressed + holder.mouse_up_icon = 'icons/effects/mouse_pointers/supplypod_target.dmi' //Icon for when mouse is released + holder.mouse_down_icon = 'icons/effects/mouse_pointers/supplypod_down_target.dmi' //Icon for when mouse is pressed holder.mouse_pointer_icon = holder.mouse_up_icon //Icon for idle mouse (same as icon for when released) holder.click_intercept = src //Create a click_intercept so we know where the user is clicking else diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index c22a22c979e..4ffc83005eb 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -389,7 +389,7 @@ active = FALSE datum/action/spell_action/action = null desc = "Wrap something or someone in a cocoon. If it's a living being, you'll also consume them, allowing you to lay eggs." - ranged_mousepointer = 'icons/effects/wrap_target.dmi' + ranged_mousepointer = 'icons/effects/mouse_pointers/wrap_target.dmi' action_icon = 'icons/mob/actions/actions_animal.dmi' action_icon_state = "wrap_0" action_background_icon_state = "bg_alien" diff --git a/code/modules/spells/spell_types/blind.dm b/code/modules/spells/spell_types/blind.dm index 387bcbd80ce..aaccefc745d 100644 --- a/code/modules/spells/spell_types/blind.dm +++ b/code/modules/spells/spell_types/blind.dm @@ -9,7 +9,7 @@ message = "Your eyes cry out in pain!" cooldown_min = 50 //12 deciseconds reduction per rank starting_spells = list("/obj/effect/proc_holder/spell/targeted/inflict_handler/blind", "/obj/effect/proc_holder/spell/targeted/genetic/blind") - ranged_mousepointer = 'icons/effects/blind_target.dmi' + ranged_mousepointer = 'icons/effects/mouse_pointers/blind_target.dmi' action_icon_state = "blind" active_msg = "You prepare to blind a target..." diff --git a/code/modules/spells/spell_types/mind_transfer.dm b/code/modules/spells/spell_types/mind_transfer.dm index c14f5d83b44..723fdb20b4f 100644 --- a/code/modules/spells/spell_types/mind_transfer.dm +++ b/code/modules/spells/spell_types/mind_transfer.dm @@ -8,7 +8,7 @@ invocation_type = "whisper" range = 1 cooldown_min = 200 //100 deciseconds reduction per rank - ranged_mousepointer = 'icons/effects/mindswap_target.dmi' + ranged_mousepointer = 'icons/effects/mouse_pointers/mindswap_target.dmi' action_icon_state = "mindswap" active_msg = "You prepare to swap minds with a target..." /// For how long is the caster stunned for after the spell diff --git a/code/modules/spells/spell_types/pointed.dm b/code/modules/spells/spell_types/pointed.dm index 75060b78491..bb1608c5902 100644 --- a/code/modules/spells/spell_types/pointed.dm +++ b/code/modules/spells/spell_types/pointed.dm @@ -1,6 +1,6 @@ /obj/effect/proc_holder/spell/pointed name = "pointed spell" - ranged_mousepointer = 'icons/effects/throw_target.dmi' + ranged_mousepointer = 'icons/effects/mouse_pointers/throw_target.dmi' action_icon_state = "projectile" /// Message showing to the spell owner upon deactivating pointed spell. var/deactive_msg = "You dispel the magic..." diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm index 4b9cb9b64bc..136258fe9c0 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -173,7 +173,7 @@ /obj/vehicle/sealed/car/clowncar/proc/EnterCannonMode() - mouse_pointer = 'icons/mecha/mecha_mouse.dmi' + mouse_pointer = 'icons/effects/mouse_pointers/mecha_mouse.dmi' cannonmode = TRUE cannonbusy = FALSE for(var/mob/living/L in return_controllers_with_flag(VEHICLE_CONTROL_DRIVE)) diff --git a/icons/effects/blind_target.dmi b/icons/effects/blind_target.dmi deleted file mode 100644 index 792d90dfbbb..00000000000 Binary files a/icons/effects/blind_target.dmi and /dev/null differ diff --git a/icons/effects/compromise_target.dmi b/icons/effects/compromise_target.dmi deleted file mode 100644 index 3baa48c9c98..00000000000 Binary files a/icons/effects/compromise_target.dmi and /dev/null differ diff --git a/icons/effects/mouse_pointers/blind_target.dmi b/icons/effects/mouse_pointers/blind_target.dmi new file mode 100644 index 00000000000..1d33fc7a4c2 Binary files /dev/null and b/icons/effects/mouse_pointers/blind_target.dmi differ diff --git a/icons/effects/cult_target.dmi b/icons/effects/mouse_pointers/cult_target.dmi similarity index 100% rename from icons/effects/cult_target.dmi rename to icons/effects/mouse_pointers/cult_target.dmi diff --git a/icons/mecha/mecha_mouse-disable.dmi b/icons/effects/mouse_pointers/mecha_mouse-disable.dmi similarity index 100% rename from icons/mecha/mecha_mouse-disable.dmi rename to icons/effects/mouse_pointers/mecha_mouse-disable.dmi diff --git a/icons/mecha/mecha_mouse.dmi b/icons/effects/mouse_pointers/mecha_mouse.dmi similarity index 100% rename from icons/mecha/mecha_mouse.dmi rename to icons/effects/mouse_pointers/mecha_mouse.dmi diff --git a/icons/effects/mindswap_target.dmi b/icons/effects/mouse_pointers/mindswap_target.dmi similarity index 100% rename from icons/effects/mindswap_target.dmi rename to icons/effects/mouse_pointers/mindswap_target.dmi diff --git a/icons/effects/overload_machine_target.dmi b/icons/effects/mouse_pointers/overload_machine_target.dmi similarity index 100% rename from icons/effects/overload_machine_target.dmi rename to icons/effects/mouse_pointers/overload_machine_target.dmi diff --git a/icons/effects/override_machine_target.dmi b/icons/effects/mouse_pointers/override_machine_target.dmi similarity index 100% rename from icons/effects/override_machine_target.dmi rename to icons/effects/mouse_pointers/override_machine_target.dmi diff --git a/icons/effects/supplypod_down_target.dmi b/icons/effects/mouse_pointers/supplypod_down_target.dmi similarity index 100% rename from icons/effects/supplypod_down_target.dmi rename to icons/effects/mouse_pointers/supplypod_down_target.dmi diff --git a/icons/effects/supplypod_target.dmi b/icons/effects/mouse_pointers/supplypod_target.dmi similarity index 100% rename from icons/effects/supplypod_target.dmi rename to icons/effects/mouse_pointers/supplypod_target.dmi diff --git a/icons/effects/throw_target.dmi b/icons/effects/mouse_pointers/throw_target.dmi similarity index 100% rename from icons/effects/throw_target.dmi rename to icons/effects/mouse_pointers/throw_target.dmi diff --git a/icons/effects/wrap_target.dmi b/icons/effects/mouse_pointers/wrap_target.dmi similarity index 100% rename from icons/effects/wrap_target.dmi rename to icons/effects/mouse_pointers/wrap_target.dmi diff --git a/icons/effects/vanguard_target.dmi b/icons/effects/vanguard_target.dmi deleted file mode 100644 index 5220c325e53..00000000000 Binary files a/icons/effects/vanguard_target.dmi and /dev/null differ diff --git a/icons/effects/visor_reticule.dmi b/icons/effects/visor_reticule.dmi deleted file mode 100644 index e99d01ef7ab..00000000000 Binary files a/icons/effects/visor_reticule.dmi and /dev/null differ diff --git a/icons/effects/volt_target.dmi b/icons/effects/volt_target.dmi deleted file mode 100644 index 43ff78599c0..00000000000 Binary files a/icons/effects/volt_target.dmi and /dev/null differ