From 3112bef850ae7b9844526cf87d26d7b98968be09 Mon Sep 17 00:00:00 2001 From: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com> Date: Wed, 14 Jun 2023 22:15:11 +0200 Subject: [PATCH] Throw mode changes client cursor when activated (#21219) * throwmode cursor changing * do not make PRs at 4 am --- code/modules/mob/living/carbon/carbon.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 603ddf43bb6..576dbb6fab8 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -629,16 +629,24 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven if(I) SEND_SIGNAL(I, COMSIG_CARBON_TOGGLE_THROW, in_throw_mode) +#define THROW_MODE_ICON 'icons/effects/cult_target.dmi' + /mob/living/carbon/proc/throw_mode_off() in_throw_mode = FALSE if(throw_icon) //in case we don't have the HUD and we use the hotkey throw_icon.icon_state = "act_throw_off" + if(client?.mouse_pointer_icon == THROW_MODE_ICON) + client.mouse_pointer_icon = initial(client.mouse_pointer_icon) /mob/living/carbon/proc/throw_mode_on() SIGNAL_HANDLER //This signal is here so we can turn throw mode back on via carp when an object is caught in_throw_mode = TRUE if(throw_icon) throw_icon.icon_state = "act_throw_on" + if(client?.mouse_pointer_icon == initial(client.mouse_pointer_icon)) + client.mouse_pointer_icon = THROW_MODE_ICON + +#undef THROW_MODE_ICON /mob/proc/throw_item(atom/target) return