Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes binocs destroying while zoomed FOR REAL #4577

Closed
wants to merge 2 commits into from
Closed

Fixes binocs destroying while zoomed FOR REAL #4577

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
071d782
Initial
morrowwolf Oct 2, 2023
d05d3b2
OK far less cursed now (not great but hey)
morrowwolf Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions code/game/objects/items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,15 +828,16 @@ cases. Override_icon_state should be a list.*/
INVOKE_ASYNC(user, TYPE_PROC_REF(/atom, visible_message), SPAN_NOTICE("[user] looks up from [zoom_device]."),
SPAN_NOTICE("You look up from [zoom_device]."))
zoom = !zoom

COOLDOWN_START(user, zoom_cooldown, 20)
SEND_SIGNAL(user, COMSIG_LIVING_ZOOM_OUT, src)
SEND_SIGNAL(src, COMSIG_ITEM_UNZOOM, user)
UnregisterSignal(src, list(
COMSIG_ITEM_DROPPED,
COMSIG_ITEM_UNWIELD,
COMSIG_PARENT_QDELETING,
))
UnregisterSignal(user, COMSIG_MOB_MOVE_OR_LOOK)
user.UnregisterSignal(src, COMSIG_PARENT_QDELETING)
//General reset in case anything goes wrong, the view will always reset to default unless zooming in.
if(user.client)
user.client.change_view(world_view_size, src)
Expand Down Expand Up @@ -867,9 +868,9 @@ cases. Override_icon_state should be a list.*/
RegisterSignal(src, list(
COMSIG_ITEM_DROPPED,
COMSIG_ITEM_UNWIELD,
COMSIG_PARENT_QDELETING,
), PROC_REF(unzoom_dropped_callback))
RegisterSignal(user, COMSIG_MOB_MOVE_OR_LOOK, PROC_REF(zoom_handle_mob_move_or_look))
user.RegisterSignal(src, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/mob/living, zoomable_item_destroyed))

zoom_initial_mob_dir = user.dir

Expand All @@ -896,6 +897,17 @@ cases. Override_icon_state should be a list.*/
SPAN_NOTICE("You peer through \the [zoom_device]."))
zoom = !zoom

/mob/living/proc/zoomable_item_destroyed(datum/destroying_zoomable)
SIGNAL_HANDLER

SEND_SIGNAL(src, COMSIG_LIVING_ZOOM_OUT, destroying_zoomable)
SEND_SIGNAL(destroying_zoomable, COMSIG_ITEM_UNZOOM, src)

if(client)
client.change_view(world_view_size, destroying_zoomable)
client.pixel_x = 0
client.pixel_y = 0

/obj/item/proc/get_icon_state(mob/user_mob, slot)
var/mob_state
var/item_state_slot_state = LAZYACCESS(item_state_slots, slot)
Expand Down