diff --git a/code/datums/components/remote_view.dm b/code/datums/components/remote_view.dm index d7e6dad073..0b08010692 100644 --- a/code/datums/components/remote_view.dm +++ b/code/datums/components/remote_view.dm @@ -96,7 +96,7 @@ /datum/component/remote_view/Destroy(force) // Clear item if(host_item) - host_item.zoom = FALSE + host_item.zoom(host_mob) // Feedback if(show_message) host_mob.visible_message(span_filter_notice("[host_item.zoomdevicename ? "[host_mob] looks up from the [host_item.name]" : "[host_mob] lowers the [host_item.name]"].")) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 65955d48bb..a759851154 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -876,6 +876,7 @@ GLOBAL_LIST_EMPTY(blood_overlays_by_type) if(!zoom && can_zoom) M.AddComponent(/datum/component/remote_view, focused_on = M, vconfig_path = /datum/remote_view_config/zoomed_item, managing_item = src, viewsize = viewsize, tileoffset = tileoffset, show_visible_messages = TRUE) return + zoom = FALSE SEND_SIGNAL(src,COMSIG_REMOTE_VIEW_CLEAR) /obj/item/proc/pwr_drain() diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 9d94ef3552..1ebba63838 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -606,6 +606,8 @@ to_chat(user, span_warning("You struggle to hold \the [src] steady!")) if(recoil) + if(recoil > 5) + recoil = 5 //Prevents crashing user client. shake_camera(user, recoil+1, recoil) update_icon()