diff --git a/code/datums/components/materials/machine_shim.dm b/code/datums/components/materials/machine_shim.dm index 3fd070e858..64295dfe31 100644 --- a/code/datums/components/materials/machine_shim.dm +++ b/code/datums/components/materials/machine_shim.dm @@ -15,7 +15,7 @@ // Mob host_mob = parent RegisterSignal(host_mob, COMSIG_LIVING_LIFE, PROC_REF(on_mob_action)) - RegisterSignal(host_mob, COMSIG_MOVABLE_MOVED, PROC_REF(on_mob_action)) + RegisterSignal(host_mob, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(on_mob_action)) RegisterSignal(host_mob, COMSIG_MOB_LOGOUT, PROC_REF(on_mob_logout)) // Machine @@ -34,7 +34,7 @@ linked_machine.in_use = FALSE linked_machine = null // Mob - UnregisterSignal(host_mob, COMSIG_MOVABLE_MOVED) + UnregisterSignal(host_mob, COMSIG_MOVABLE_ATTEMPTED_MOVE) UnregisterSignal(host_mob, COMSIG_LIVING_LIFE) UnregisterSignal(host_mob, COMSIG_MOB_LOGOUT) host_mob.reset_perspective() // Required, because our machine may have been operating a remote view diff --git a/code/datums/components/recursive_move.dm b/code/datums/components/recursive_move.dm index 4549240012..2abc1136da 100644 --- a/code/datums/components/recursive_move.dm +++ b/code/datums/components/recursive_move.dm @@ -83,12 +83,12 @@ //Parent at top of heirarchy moved. /datum/component/recursive_move/proc/top_moved(var/atom/movable/am, var/atom/new_loc, var/atom/old_loc) SIGNAL_HANDLER - SEND_SIGNAL(holder, COMSIG_MOVABLE_MOVED, old_loc, new_loc) + SEND_SIGNAL(holder, COMSIG_MOVABLE_ATTEMPTED_MOVE, old_loc, new_loc) //One of the parents other than the top parent moved. /datum/component/recursive_move/proc/heirarchy_changed(var/atom/old_loc, var/atom/movable/am, var/atom/new_loc) SIGNAL_HANDLER - SEND_SIGNAL(holder, COMSIG_MOVABLE_MOVED, old_loc, new_loc) + SEND_SIGNAL(holder, COMSIG_MOVABLE_ATTEMPTED_MOVE, old_loc, new_loc) //Rebuild our list of parents reset_parents() setup_parents() @@ -130,4 +130,4 @@ /obj/item/bananapeel/test/Initialize(mapload) . = ..() AddComponent(/datum/component/recursive_move) - RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(shmove)) + RegisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(shmove)) diff --git a/code/datums/components/remote_view.dm b/code/datums/components/remote_view.dm index 540b5ba341..894f9ddb51 100644 --- a/code/datums/components/remote_view.dm +++ b/code/datums/components/remote_view.dm @@ -53,7 +53,7 @@ RegisterSignal(host_mob, COMSIG_MOB_HANDLE_HUD_DARKSIGHT, PROC_REF(handle_hud_darkvision)) // Recursive move component fires this, we only want it to handle stuff like being inside a paicard when releasing turf lock if(isturf(focused_on)) - RegisterSignal(host_mob, COMSIG_MOVABLE_MOVED, PROC_REF(handle_recursive_moved)) + RegisterSignal(host_mob, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(handle_recursive_moved)) // Focus on remote view remote_view_target = focused_on if(host_mob != remote_view_target) // Some items just offset our view, so we set ourselves as the view target, don't double dip if so! @@ -88,7 +88,7 @@ if(settings.will_blind) UnregisterSignal(host_mob, COMSIG_LIVING_STATUS_BLIND) if(isturf(remote_view_target)) - UnregisterSignal(host_mob, COMSIG_MOVABLE_MOVED) + UnregisterSignal(host_mob, COMSIG_MOVABLE_ATTEMPTED_MOVE) if(settings.will_death) UnregisterSignal(host_mob, COMSIG_MOB_DEATH) // Handle relayed movement @@ -419,13 +419,13 @@ . = ..() // Items can be nested deeply, so we need to update on any parent reorganization or actual move. host_mob.AddComponent(/datum/component/recursive_move) - RegisterSignal(host_mob, COMSIG_MOVABLE_MOVED, PROC_REF(handle_recursive_moved)) // Doesn't need override, basetype only ever registers this signal if we're looking at a turf + RegisterSignal(host_mob, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(handle_recursive_moved)) // Doesn't need override, basetype only ever registers this signal if we're looking at a turf // Check our inmob state if(ismob(find_topmost_atom())) needs_to_decouple = TRUE /datum/component/remote_view/mob_holding_item/Destroy(force) - UnregisterSignal(host_mob, COMSIG_MOVABLE_MOVED) + UnregisterSignal(host_mob, COMSIG_MOVABLE_ATTEMPTED_MOVE) . = ..() /datum/component/remote_view/mob_holding_item/handle_status_effects(datum/source, amount, ignore_canstun) diff --git a/code/datums/elements/topturfcrossed.dm b/code/datums/elements/topturfcrossed.dm index 43f9eba561..11381898fa 100644 --- a/code/datums/elements/topturfcrossed.dm +++ b/code/datums/elements/topturfcrossed.dm @@ -14,11 +14,11 @@ /datum/component/topturfcrossed/RegisterWithParent() our_owner.AddComponent(/datum/component/recursive_move) // Required if we want to be useful at all - RegisterSignal(our_owner, COMSIG_MOVABLE_MOVED, PROC_REF(handle_location_change)) + RegisterSignal(our_owner, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(handle_location_change)) update_turf_signals(get_turf(our_owner)) /datum/component/topturfcrossed/UnregisterFromParent() - UnregisterSignal(our_owner, COMSIG_MOVABLE_MOVED) + UnregisterSignal(our_owner, COMSIG_MOVABLE_ATTEMPTED_MOVE) update_turf_signals(null) /datum/component/topturfcrossed/proc/handle_location_change(datum/source, atom/old_loc, atom/new_loc) diff --git a/code/datums/observation/helpers.dm b/code/datums/observation/helpers.dm index 40a2dce2fa..747e72bf1a 100644 --- a/code/datums/observation/helpers.dm +++ b/code/datums/observation/helpers.dm @@ -1,6 +1,6 @@ /* /atom/movable/proc/recursive_move(var/atom/movable/am, var/old_loc, var/new_loc) - SEND_SIGNAL(src, COMSIG_MOVABLE_MOVED, old_loc, new_loc) + SEND_SIGNAL(src, COMSIG_MOVABLE_ATTEMPTED_MOVE, old_loc, new_loc) */ /atom/movable/proc/move_to_destination(var/atom/movable/am, var/old_loc, var/new_loc) var/turf/T = get_turf(new_loc) @@ -16,10 +16,10 @@ /* /proc/register_all_movement(var/event_source, var/datum/listener) - listener.RegisterSignal(event_source, COMSIG_MOVABLE_MOVED, /atom/movable/proc/recursive_move) + listener.RegisterSignal(event_source, COMSIG_MOVABLE_ATTEMPTED_MOVE, /atom/movable/proc/recursive_move) //GLOB.dir_set_event.register(event_source, listener, /atom/proc/recursive_dir_set) /proc/unregister_all_movement(var/event_source, var/datum/listener) - listener.UnregisterSignal(event_source, COMSIG_MOVABLE_MOVED) + listener.UnregisterSignal(event_source, COMSIG_MOVABLE_ATTEMPTED_MOVE) //GLOB.dir_set_event.unregister(event_source, listener, /atom/proc/recursive_dir_set) */ diff --git a/code/datums/observation/moved.dm b/code/datums/observation/moved.dm index 7b0da012e7..d7670b09dc 100644 --- a/code/datums/observation/moved.dm +++ b/code/datums/observation/moved.dm @@ -31,21 +31,21 @@ GLOBAL_DATUM_INIT(moved_event, /decl/observ/moved, new) /* /atom/movable/Entered(var/atom/movable/am, atom/old_loc) . = ..() - am.RegisterSignal(src,COMSIG_MOVABLE_MOVED, /atom/movable/proc/recursive_move, override = TRUE) + am.RegisterSignal(src,COMSIG_MOVABLE_ATTEMPTED_MOVE, /atom/movable/proc/recursive_move, override = TRUE) /atom/movable/Exited(var/atom/movable/am, atom/old_loc) . = ..() - am.UnregisterSignal(src,COMSIG_MOVABLE_MOVED) + am.UnregisterSignal(src,COMSIG_MOVABLE_ATTEMPTED_MOVE) */ // Entered() typically lifts the moved event, but in the case of null-space we'll have to handle it. /atom/movable/Move() var/old_loc = loc . = ..() if(. && !loc) - SEND_SIGNAL(src,COMSIG_MOVABLE_MOVED, old_loc, null) + SEND_SIGNAL(src,COMSIG_MOVABLE_ATTEMPTED_MOVE, old_loc, null) /atom/movable/forceMove(atom/destination, direction, movetime) // pass movetime through var/old_loc = loc . = ..() if(. && !loc) - SEND_SIGNAL(src,COMSIG_MOVABLE_MOVED, old_loc, null) + SEND_SIGNAL(src,COMSIG_MOVABLE_ATTEMPTED_MOVE, old_loc, null) diff --git a/code/game/atom/_atom.dm b/code/game/atom/_atom.dm index 73c6ef01b0..1e13b87c07 100644 --- a/code/game/atom/_atom.dm +++ b/code/game/atom/_atom.dm @@ -471,7 +471,7 @@ /atom/Entered(atom/movable/AM, atom/old_loc) . = ..() - SEND_SIGNAL(AM, COMSIG_MOVABLE_MOVED, old_loc, AM.loc) + SEND_SIGNAL(AM, COMSIG_MOVABLE_ATTEMPTED_MOVE, old_loc, AM.loc) SEND_SIGNAL(src, COMSIG_ATOM_ENTERED, AM, old_loc) SEND_SIGNAL(AM, COMSIG_ATOM_ENTERING, src, old_loc) diff --git a/code/game/machinery/machinery_power.dm b/code/game/machinery/machinery_power.dm index a4b6d0fffe..e08f285f1d 100644 --- a/code/game/machinery/machinery_power.dm +++ b/code/game/machinery/machinery_power.dm @@ -73,7 +73,7 @@ // Do not do power stuff in New/Initialize until after ..() /obj/machinery/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(update_power_on_move)) + RegisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(update_power_on_move)) AddComponent(/datum/component/recursive_move) var/power = POWER_CONSUMPTION REPORT_POWER_CONSUMPTION_CHANGE(0, power) @@ -83,7 +83,7 @@ /obj/machinery/Destroy() /* if(ismovable(loc)) - UnregisterSignal(loc, COMSIG_MOVABLE_MOVED) // Unregister just in case + UnregisterSignal(loc, COMSIG_MOVABLE_ATTEMPTED_MOVE) // Unregister just in case */ var/power = POWER_CONSUMPTION REPORT_POWER_CONSUMPTION_CHANGE(power, 0) @@ -96,9 +96,9 @@ update_power_on_move(src, old_loc, loc) /* No if(ismovable(old_loc)) // Unregister recursive movement. - UnregisterSignal(old_loc, COMSIG_MOVABLE_MOVED) + UnregisterSignal(old_loc, COMSIG_MOVABLE_ATTEMPTED_MOVE) if(ismovable(loc)) // Register for recursive movement (if the thing we're inside moves) - RegisterSignal(loc, COMSIG_MOVABLE_MOVED, PROC_REF(update_power_on_move), override = TRUE) + RegisterSignal(loc, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(update_power_on_move), override = TRUE) */ /obj/machinery/proc/update_power_on_move(atom/movable/mover, atom/old_loc, atom/new_loc) diff --git a/code/game/mecha/equipment/tools/shield_omni.dm b/code/game/mecha/equipment/tools/shield_omni.dm index a15261bac2..ca497c1148 100644 --- a/code/game/mecha/equipment/tools/shield_omni.dm +++ b/code/game/mecha/equipment/tools/shield_omni.dm @@ -77,7 +77,7 @@ /obj/item/shield_projector/rectangle/mecha/Initialize(mapload) . = ..() my_mech = loc - RegisterSignal(my_mech, COMSIG_MOVABLE_MOVED, /obj/item/shield_projector/proc/update_shield_positions) + RegisterSignal(my_mech, COMSIG_MOVABLE_ATTEMPTED_MOVE, /obj/item/shield_projector/proc/update_shield_positions) my_mech.AddComponent(/datum/component/recursive_move) update_shift(my_mech) @@ -89,7 +89,7 @@ shift_y = round(y_dif, 1) /obj/item/shield_projector/rectangle/mecha/Destroy() - UnregisterSignal(my_mech, COMSIG_MOVABLE_MOVED) + UnregisterSignal(my_mech, COMSIG_MOVABLE_ATTEMPTED_MOVE) my_mech = null . = ..() diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 8123bbea85..fa11398d8a 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -13,7 +13,6 @@ opacity = 1 //Opaque. Menacing. anchored = TRUE //No pulling around. unacidable = TRUE //And no deleting hoomans inside - flags = REMOTEVIEW_ON_ENTER layer = MOB_LAYER //Icon draw layer infra_luminosity = 15 //Byond implementation is bugged. var/initial_icon = null //Mech type for resetting icon. Only used for reskinning kits (see custom items) diff --git a/code/game/objects/items/devices/communicator/phone.dm b/code/game/objects/items/devices/communicator/phone.dm index a0e5e3cc40..f7938facc3 100644 --- a/code/game/objects/items/devices/communicator/phone.dm +++ b/code/game/objects/items/devices/communicator/phone.dm @@ -349,7 +349,7 @@ video_source = comm.camera comm.visible_message(span_danger("[icon2html(src,viewers(src))] New video connection from [comm].")) update_active_camera_screen() - RegisterSignal(video_source, COMSIG_MOVABLE_MOVED, PROC_REF(update_active_camera_screen)) + RegisterSignal(video_source, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(update_active_camera_screen)) video_source.AddComponent(/datum/component/recursive_move) update_icon() @@ -357,7 +357,7 @@ // Parameters: reason - the text reason to print for why it ended // Description: Ends the video call by clearing video_source /obj/item/communicator/proc/end_video(var/reason) - UnregisterSignal(video_source, COMSIG_MOVABLE_MOVED) + UnregisterSignal(video_source, COMSIG_MOVABLE_ATTEMPTED_MOVE) show_static() video_source = null diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index c68830b840..38fb41a3f8 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -40,14 +40,14 @@ GLOBAL_LIST_EMPTY(GPS_list) /obj/item/gps/proc/update_holder() if(holder && loc != holder) - UnregisterSignal(holder, COMSIG_MOVABLE_MOVED) + UnregisterSignal(holder, COMSIG_MOVABLE_ATTEMPTED_MOVE) //GLOB.dir_set_event.unregister(holder, src) holder.client?.screen -= compass holder = null if(istype(loc, /mob)) holder = loc - RegisterSignal(holder, COMSIG_MOVABLE_MOVED, PROC_REF(update_compass), override = TRUE) + RegisterSignal(holder, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(update_compass), override = TRUE) holder.AddComponent(/datum/component/recursive_move) //GLOB.dir_set_event.register(holder, src, PROC_REF(update_compass)) diff --git a/code/game/objects/items/devices/tvcamera.dm b/code/game/objects/items/devices/tvcamera.dm index 69a8be4943..4e50da983c 100644 --- a/code/game/objects/items/devices/tvcamera.dm +++ b/code/game/objects/items/devices/tvcamera.dm @@ -154,7 +154,7 @@ /obj/item/tvcamera/proc/update_feed() if(camera.status) - SEND_SIGNAL(camera, COMSIG_MOVABLE_MOVED) // Forward the movement signal + SEND_SIGNAL(camera, COMSIG_MOVABLE_ATTEMPTED_MOVE) // Forward the movement signal //Assembly by roboticist diff --git a/code/game/objects/items/weapons/id cards/cards.dm b/code/game/objects/items/weapons/id cards/cards.dm index 94c4868c38..c40c9d56cb 100644 --- a/code/game/objects/items/weapons/id cards/cards.dm +++ b/code/game/objects/items/weapons/id cards/cards.dm @@ -280,7 +280,7 @@ if(isrobot(loc?.loc)) R = loc.loc registered_name = R.braintype - RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(check_loc)) + RegisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(check_loc)) /obj/item/card/id/cargo/miner/borg/proc/check_loc(atom/movable/mover, atom/old_loc, atom/new_loc) SIGNAL_HANDLER @@ -297,7 +297,7 @@ /obj/item/card/id/cargo/miner/borg/Destroy() if(R) - UnregisterSignal(src, COMSIG_MOVABLE_MOVED) + UnregisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE) R = null last_robot_loc = null . = ..() diff --git a/code/game/objects/items/weapons/id cards/id_stacks.dm b/code/game/objects/items/weapons/id cards/id_stacks.dm index 4ef7c16d3b..b37342aae5 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks.dm +++ b/code/game/objects/items/weapons/id cards/id_stacks.dm @@ -306,7 +306,7 @@ if(isrobot(loc?.loc)) R = loc.loc registered_name = R.braintype - RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(check_loc)) + RegisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(check_loc)) /obj/item/card/id/exploration/borg/proc/check_loc(atom/movable/mover, atom/old_loc, atom/new_loc) SIGNAL_HANDLER @@ -323,7 +323,7 @@ /obj/item/card/id/exploration/borg/Destroy() if(R) - UnregisterSignal(src, COMSIG_MOVABLE_MOVED) + UnregisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE) R = null last_robot_loc = null . = ..() diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 6a859d7ab6..619d7c554c 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -209,11 +209,11 @@ /obj/item/storage/bag/ore/equipped(mob/user) ..() user.AddComponent(/datum/component/recursive_move) - RegisterSignal(user, COMSIG_MOVABLE_MOVED, /obj/item/storage/bag/ore/proc/autoload, user) + RegisterSignal(user, COMSIG_MOVABLE_ATTEMPTED_MOVE, /obj/item/storage/bag/ore/proc/autoload, user) /obj/item/storage/bag/ore/dropped(mob/user) ..() - UnregisterSignal(user, COMSIG_MOVABLE_MOVED) + UnregisterSignal(user, COMSIG_MOVABLE_ATTEMPTED_MOVE) /obj/item/storage/bag/ore/proc/autoload(mob/user) SIGNAL_HANDLER diff --git a/code/game/objects/structures/crates_lockers/__closets.dm b/code/game/objects/structures/crates_lockers/__closets.dm index 7ecd9415e1..2d5a139f21 100644 --- a/code/game/objects/structures/crates_lockers/__closets.dm +++ b/code/game/objects/structures/crates_lockers/__closets.dm @@ -8,6 +8,7 @@ w_class = ITEMSIZE_HUGE layer = UNDER_JUNK_LAYER blocks_emissive = EMISSIVE_BLOCK_GENERIC + flags = REMOTEVIEW_ON_ENTER var/opened = 0 var/sealed = 0 diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm index 0f7d8c6d6e..ef4715009b 100644 --- a/code/modules/admin/modify_robot.dm +++ b/code/modules/admin/modify_robot.dm @@ -228,7 +228,7 @@ target.module.modules.Add(add_item) target.module.contents.Add(add_item) spawn(0) - SEND_SIGNAL(add_item, COMSIG_MOVABLE_MOVED) + SEND_SIGNAL(add_item, COMSIG_MOVABLE_ATTEMPTED_MOVE) target.hud_used?.update_robot_modules_display() if(istype(add_item, /obj/item/stack/)) var/obj/item/stack/item_with_synth = add_item diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/pat_module_vr.dm b/code/modules/clothing/spacesuits/rig/modules/specific/pat_module_vr.dm index 7c29692490..957376e72d 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/pat_module_vr.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/pat_module_vr.dm @@ -39,7 +39,7 @@ var/mob/living/carbon/human/H = holder.wearer to_chat(H,span_notice("You activate the P.A.T. module.")) H.AddComponent(/datum/component/recursive_move) - RegisterSignal(H, COMSIG_MOVABLE_MOVED, /obj/item/rig_module/pat_module/proc/boop) + RegisterSignal(H, COMSIG_MOVABLE_ATTEMPTED_MOVE, /obj/item/rig_module/pat_module/proc/boop) /obj/item/rig_module/pat_module/deactivate() if(!..()) @@ -47,7 +47,7 @@ var/mob/living/carbon/human/H = holder.wearer to_chat(H,span_notice("Your disable the P.A.T. module.")) - UnregisterSignal(H, COMSIG_MOVABLE_MOVED) + UnregisterSignal(H, COMSIG_MOVABLE_ATTEMPTED_MOVE) /obj/item/rig_module/pat_module/proc/boop(var/mob/living/carbon/human/user,var/turf/To,var/turf/Tn) SIGNAL_HANDLER diff --git a/code/modules/holomap/station_holomap.dm b/code/modules/holomap/station_holomap.dm index fa5426db41..a9426572e5 100644 --- a/code/modules/holomap/station_holomap.dm +++ b/code/modules/holomap/station_holomap.dm @@ -110,7 +110,7 @@ watching_mob = user watching_mob.AddComponent(/datum/component/recursive_move) - RegisterSignal(watching_mob, COMSIG_MOVABLE_MOVED, /obj/machinery/station_map/proc/checkPosition) + RegisterSignal(watching_mob, COMSIG_MOVABLE_ATTEMPTED_MOVE, /obj/machinery/station_map/proc/checkPosition) //GLOB.dir_set_event.register(watching_mob, src, /obj/machinery/station_map/proc/checkPosition) RegisterSignal(watching_mob, COMSIG_OBSERVER_DESTROYED, /obj/machinery/station_map/proc/stopWatching) update_use_power(USE_POWER_ACTIVE) @@ -141,7 +141,7 @@ var/mob/M = watching_mob spawn(5) //we give it time to fade out M.client.images -= holomap_datum.station_map - UnregisterSignal(watching_mob, COMSIG_MOVABLE_MOVED) + UnregisterSignal(watching_mob, COMSIG_MOVABLE_ATTEMPTED_MOVE) //GLOB.dir_set_event.unregister(watching_mob, src) UnregisterSignal(watching_mob, COMSIG_OBSERVER_DESTROYED) watching_mob = null diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm index a8cdfcb235..fee9cb54ea 100644 --- a/code/modules/integrated_electronics/subtypes/output.dm +++ b/code/modules/integrated_electronics/subtypes/output.dm @@ -449,11 +449,11 @@ /obj/item/integrated_circuit/output/holographic_projector/Initialize(mapload) . = ..() AddComponent(/datum/component/recursive_move) - RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(on_moved)) /obj/item/integrated_circuit/output/holographic_projector/Destroy() destroy_hologram() - UnregisterSignal(src, COMSIG_MOVABLE_MOVED) + UnregisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE) return ..() /obj/item/integrated_circuit/output/holographic_projector/do_work() diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm index bd3ab7afd2..6662848c00 100644 --- a/code/modules/mob/living/bot/secbot.dm +++ b/code/modules/mob/living/bot/secbot.dm @@ -214,19 +214,19 @@ playsound(src, pick(preparing_arrest_sounds), 50) // Register to be told when the target moves target.AddComponent(/datum/component/recursive_move) - RegisterSignal(target, COMSIG_MOVABLE_MOVED, /mob/living/bot/secbot/proc/target_moved) + RegisterSignal(target, COMSIG_MOVABLE_ATTEMPTED_MOVE, /mob/living/bot/secbot/proc/target_moved) // Callback invoked if the registered target moves /mob/living/bot/secbot/proc/target_moved(atom/movable/moving_instance, atom/old_loc, atom/new_loc) SIGNAL_HANDLER if(get_dist(get_turf(src), get_turf(target)) >= 1) awaiting_surrender = INFINITY // Done waiting! - UnregisterSignal(moving_instance, COMSIG_MOVABLE_MOVED) + UnregisterSignal(moving_instance, COMSIG_MOVABLE_ATTEMPTED_MOVE) /mob/living/bot/secbot/resetTarget() ..() if(target) - UnregisterSignal(target, COMSIG_MOVABLE_MOVED) + UnregisterSignal(target, COMSIG_MOVABLE_ATTEMPTED_MOVE) awaiting_surrender = 0 attacked = FALSE walk_to(src, 0) diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules.dm index d28b004e2e..41b577274f 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules.dm @@ -402,7 +402,7 @@ /obj/item/reagent_containers/glass/beaker/large/borg/Initialize(mapload) . = ..() R = loc.loc - RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(check_loc)) + RegisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(check_loc)) /obj/item/reagent_containers/glass/beaker/large/borg/proc/check_loc(atom/movable/mover, atom/old_loc, atom/new_loc) SIGNAL_HANDLER @@ -418,7 +418,7 @@ hud_layerise() /obj/item/reagent_containers/glass/beaker/large/borg/Destroy() - UnregisterSignal(src, COMSIG_MOVABLE_MOVED) + UnregisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE) R = null last_robot_loc = null . = ..() diff --git a/code/modules/mob/living/silicon/robot/robot_simple_items.dm b/code/modules/mob/living/silicon/robot/robot_simple_items.dm index d55f881966..2f06fbc85e 100644 --- a/code/modules/mob/living/silicon/robot/robot_simple_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_simple_items.dm @@ -1123,7 +1123,7 @@ /obj/item/reagent_containers/glass/bucket/cyborg/Initialize(mapload) . = ..() R = loc.loc - RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(check_loc)) + RegisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(check_loc)) /obj/item/reagent_containers/glass/bucket/cyborg/proc/check_loc(atom/movable/mover, atom/old_loc, atom/new_loc) if(old_loc == R || old_loc == R.module) @@ -1138,7 +1138,7 @@ hud_layerise() /obj/item/reagent_containers/glass/bucket/cyborg/Destroy() - UnregisterSignal(src, COMSIG_MOVABLE_MOVED) + UnregisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE) R = null last_robot_loc = null ..() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index e2c6c0c696..58903bc24b 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -308,7 +308,7 @@ var/datum/component/remote_view/remote_comp = GetComponent(/datum/component/remote_view) if(remote_comp?.looking_at_target_already(loc)) return FALSE - if(isitem(loc) || isbelly(loc)) // Requires more careful handling than structures because they are held by mobs + if(isitem(loc) || isbelly(loc) || ismecha(loc)) // Requires more careful handling than structures because they are held by mobs AddComponent(/datum/component/remote_view/mob_holding_item, focused_on = loc, vconfig_path = /datum/remote_view_config/inside_object) return TRUE if(loc.flags & REMOTEVIEW_ON_ENTER) // Handle atoms that begin a remote view upon entering them. diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm index 4308e704d3..f126f2906d 100644 --- a/code/modules/nifsoft/software/13_soulcatcher.dm +++ b/code/modules/nifsoft/software/13_soulcatcher.dm @@ -445,7 +445,7 @@ forceMove(get_turf(parent_human)) parent_human.AddComponent(/datum/component/recursive_move) - RegisterSignal(parent_human, COMSIG_MOVABLE_MOVED, /mob/observer/eye/ar_soul/proc/human_moved) + RegisterSignal(parent_human, COMSIG_MOVABLE_ATTEMPTED_MOVE, /mob/observer/eye/ar_soul/proc/human_moved) //Time to play dressup if(brainmob.client.prefs) @@ -459,7 +459,7 @@ /mob/observer/eye/ar_soul/Destroy() if(parent_human) //It's POSSIBLE they've been deleted before the NIF somehow - UnregisterSignal(parent_human, COMSIG_MOVABLE_MOVED) + UnregisterSignal(parent_human, COMSIG_MOVABLE_ATTEMPTED_MOVE) parent_human = null return ..() diff --git a/code/modules/paperwork/paper_sticky.dm b/code/modules/paperwork/paper_sticky.dm index f51c01d118..afa6e20d00 100644 --- a/code/modules/paperwork/paper_sticky.dm +++ b/code/modules/paperwork/paper_sticky.dm @@ -98,7 +98,7 @@ /obj/item/paper/sticky/Initialize(mapload) . = ..() AddComponent(/datum/component/recursive_move) - RegisterSignal(src, COMSIG_MOVABLE_MOVED, /obj/item/paper/sticky/proc/reset_persistence_tracking) + RegisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE, /obj/item/paper/sticky/proc/reset_persistence_tracking) /obj/item/paper/sticky/proc/reset_persistence_tracking() SIGNAL_HANDLER @@ -108,7 +108,7 @@ /obj/item/paper/sticky/Destroy() reset_persistence_tracking() - UnregisterSignal(src, COMSIG_MOVABLE_MOVED) + UnregisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE) . = ..() /obj/item/paper/sticky/update_icon() diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index ce37c256f3..ab81542091 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -231,10 +231,10 @@ . = ..() AddComponent(/datum/component/recursive_move) AddComponent(/datum/component/hose_connector/input) - RegisterSignal(src, COMSIG_MOVABLE_MOVED, /obj/item/reagent_containers/spray/chemsprayer/hosed/proc/update_hose) + RegisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE, /obj/item/reagent_containers/spray/chemsprayer/hosed/proc/update_hose) /obj/item/reagent_containers/spray/chemsprayer/hosed/Destroy() - UnregisterSignal(src, COMSIG_MOVABLE_MOVED) + UnregisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE) . = ..() /obj/item/reagent_containers/spray/chemsprayer/hosed/proc/update_hose(atom/source, atom/oldloc, direction, forced, list/old_locs, momentum_change) diff --git a/code/modules/shieldgen/directional_shield.dm b/code/modules/shieldgen/directional_shield.dm index eb29d1e830..da73c5aaa1 100644 --- a/code/modules/shieldgen/directional_shield.dm +++ b/code/modules/shieldgen/directional_shield.dm @@ -101,7 +101,7 @@ /obj/item/shield_projector/Initialize(mapload) START_PROCESSING(SSobj, src) AddComponent(/datum/component/recursive_move) - RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(moved_event)) + RegisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(moved_event)) if(always_on) spawn(0) if(!QDELETED(src)) @@ -111,7 +111,7 @@ /obj/item/shield_projector/Destroy() destroy_shields() STOP_PROCESSING(SSobj, src) - UnregisterSignal(src, COMSIG_MOVABLE_MOVED) + UnregisterSignal(src, COMSIG_MOVABLE_ATTEMPTED_MOVE) return ..() /obj/item/shield_projector/proc/moved_event() diff --git a/code/modules/tgui/modules/appearance_changer.dm b/code/modules/tgui/modules/appearance_changer.dm index 5345d32790..24acb83258 100644 --- a/code/modules/tgui/modules/appearance_changer.dm +++ b/code/modules/tgui/modules/appearance_changer.dm @@ -95,7 +95,7 @@ . = ..() if(owner == user || !customize_usr) close_ui() - UnregisterSignal(owner, COMSIG_MOVABLE_MOVED) + UnregisterSignal(owner, COMSIG_MOVABLE_ATTEMPTED_MOVE) SEND_SIGNAL(owner, COMSIG_HUMAN_DNA_FINALIZED) // Update any components using our saved appearance owner = null last_camera_turf = null @@ -672,7 +672,7 @@ return if(!ui) owner.AddComponent(/datum/component/recursive_move) - RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(update_active_camera_screen), TRUE) + RegisterSignal(owner, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(update_active_camera_screen), TRUE) // Register map objects user.client.register_map_obj(cam_screen) for(var/plane in cam_plane_masters) @@ -1139,7 +1139,7 @@ /datum/tgui_module/appearance_changer/body_designer/proc/make_fake_owner() // checks for monkey to tell if on the menu if(owner) - UnregisterSignal(owner, COMSIG_MOVABLE_MOVED) + UnregisterSignal(owner, COMSIG_MOVABLE_ATTEMPTED_MOVE) QDEL_NULL(owner) owner = new(src) owner.set_species(SPECIES_LLEILL) @@ -1147,11 +1147,11 @@ owner.invisibility = INVISIBILITY_ABSTRACT // Add listeners back owner.AddComponent(/datum/component/recursive_move) - RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(update_active_camera_screen), TRUE) + RegisterSignal(owner, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(update_active_camera_screen), TRUE) /datum/tgui_module/appearance_changer/body_designer/proc/load_record_to_body(var/datum/transhuman/body_record/current_project) if(owner) - UnregisterSignal(owner, COMSIG_MOVABLE_MOVED) + UnregisterSignal(owner, COMSIG_MOVABLE_ATTEMPTED_MOVE) QDEL_NULL(owner) owner = current_project.produce_human_mob(src,FALSE,FALSE,"Designer [rand(999)]") // Update some specifics from the current record @@ -1165,7 +1165,7 @@ owner.custom_species = current_project.speciesname // Add listeners back owner.AddComponent(/datum/component/recursive_move) - RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(update_active_camera_screen), TRUE) + RegisterSignal(owner, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(update_active_camera_screen), TRUE) /datum/tgui_module/appearance_changer/self_deleting /datum/tgui_module/appearance_changer/self_deleting/tgui_close(mob/user) diff --git a/code/modules/tgui/modules/camera.dm b/code/modules/tgui/modules/camera.dm index e1e6ed9572..fa78a8fad8 100644 --- a/code/modules/tgui/modules/camera.dm +++ b/code/modules/tgui/modules/camera.dm @@ -95,7 +95,7 @@ /datum/tgui_module/camera/Destroy() if(active_camera) - UnregisterSignal(active_camera, COMSIG_MOVABLE_MOVED) + UnregisterSignal(active_camera, COMSIG_MOVABLE_ATTEMPTED_MOVE) active_camera = null last_camera_turf = null QDEL_NULL(cam_screen_tg) @@ -164,11 +164,11 @@ var/list/cameras = get_available_cameras(ui.user) var/obj/machinery/camera/C = cameras["[ckey(c_tag)]"] if(active_camera) - UnregisterSignal(active_camera, COMSIG_MOVABLE_MOVED) + UnregisterSignal(active_camera, COMSIG_MOVABLE_ATTEMPTED_MOVE) if(C) active_camera = C active_camera.AddComponent(/datum/component/recursive_move) - RegisterSignal(active_camera, COMSIG_MOVABLE_MOVED, PROC_REF(update_active_camera_screen)) + RegisterSignal(active_camera, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(update_active_camera_screen)) playsound(tgui_host(), get_sfx("terminal_type"), 25, FALSE) update_active_camera_screen() return TRUE @@ -193,10 +193,10 @@ if(target) if(active_camera) - UnregisterSignal(active_camera, COMSIG_MOVABLE_MOVED) + UnregisterSignal(active_camera, COMSIG_MOVABLE_ATTEMPTED_MOVE) active_camera = target active_camera.AddComponent(/datum/component/recursive_move) - RegisterSignal(active_camera, COMSIG_MOVABLE_MOVED, PROC_REF(update_active_camera_screen)) + RegisterSignal(active_camera, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(update_active_camera_screen)) playsound(tgui_host(), get_sfx("terminal_type"), 25, FALSE) update_active_camera_screen() . = TRUE @@ -290,7 +290,7 @@ // Turn off the console if(length(concurrent_users) == 0 && is_living) if(active_camera) - UnregisterSignal(active_camera, COMSIG_MOVABLE_MOVED) + UnregisterSignal(active_camera, COMSIG_MOVABLE_ATTEMPTED_MOVE) active_camera = null last_camera_turf = null playsound(tgui_host(), 'sound/machines/terminal_off.ogg', 25, FALSE)