From 56d4291ef678443d2f706f1bec2478b3ca11f510 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 2 Jul 2021 17:42:34 +0200 Subject: [PATCH] [MIRROR] Reverts Entered() passing dir instead of old loc (#6646) * Reverts Entered() passing dir instead of old loc (#59910) * Reverts Entered() passing dir instead of old loc Co-authored-by: Rohesie --- code/__DEFINES/dcs/signals.dm | 6 +++--- code/datums/ai/monkey/monkey_controller.dm | 2 +- code/datums/components/acid.dm | 2 +- code/datums/components/butchering.dm | 2 +- code/datums/components/chasm.dm | 2 +- code/datums/components/food/edible.dm | 2 +- code/datums/components/infective.dm | 2 +- code/datums/components/rot.dm | 2 +- code/datums/components/singularity.dm | 2 +- code/datums/components/slippery.dm | 4 ++-- code/datums/components/squeak.dm | 2 +- code/datums/components/swarming.dm | 2 +- code/datums/elements/caltrop.dm | 2 +- code/game/area/ai_monitored.dm | 4 ++-- code/game/area/areas.dm | 4 ++-- code/game/atoms.dm | 6 +++--- code/game/atoms_movable.dm | 12 ++++++------ .../objects/effects/effect_system/effects_smoke.dm | 2 +- code/game/objects/items/storage/bags.dm | 2 +- code/game/objects/items/storage/fancy.dm | 2 +- code/game/objects/items/storage/lockbox.dm | 2 +- code/game/objects/items/storage/wallets.dm | 2 +- code/game/turfs/open/_open.dm | 2 +- code/game/turfs/open/floor/mineral_floor.dm | 4 ++-- code/game/turfs/open/lava.dm | 2 +- code/game/turfs/open/space/space.dm | 2 +- code/game/turfs/open/space/transit.dm | 2 +- code/game/turfs/turf.dm | 4 ++-- .../modules/atmospherics/environmental/LINDA_fire.dm | 2 +- .../modules/atmospherics/machinery/atmosmachinery.dm | 2 +- code/modules/events/immovable_rod.dm | 2 +- code/modules/events/spacevine.dm | 2 +- code/modules/holiday/easter.dm | 2 +- code/modules/mining/machine_processing.dm | 2 +- code/modules/mob/living/carbon/human/emote.dm | 2 +- .../simple_animal/hostile/megafauna/colossus.dm | 2 +- code/modules/ruins/icemoonruin_code/hotsprings.dm | 2 +- code/modules/ruins/spaceruin_code/hilbertshotel.dm | 6 +++--- 38 files changed, 54 insertions(+), 54 deletions(-) diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index e43df0a561b..dff12ce03ba 100644 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -139,9 +139,9 @@ #define COMSIG_ATOM_UPDATED_ICON "atom_updated_icon" ///from base of [/atom/proc/smooth_icon]: () #define COMSIG_ATOM_SMOOTHED_ICON "atom_smoothed_icon" -///from base of atom/Entered(): (atom/movable/arrived, direction) +///from base of atom/Entered(): (atom/movable/arrived, atom/old_loc, list/atom/old_locs) #define COMSIG_ATOM_ENTERED "atom_entered" -/// Sent from the atom that just Entered src. From base of atom/Entered(): (/atom/destination, direction) +/// Sent from the atom that just Entered src. From base of atom/Entered(): (/atom/destination, atom/old_loc, list/atom/old_locs) #define COMSIG_ATOM_ENTERING "atom_entering" ///from base of atom/Exit(): (/atom/movable/leaving, direction) #define COMSIG_ATOM_EXIT "atom_exit" @@ -374,7 +374,7 @@ ///from base of area/proc/power_change(): () #define COMSIG_AREA_POWER_CHANGE "area_power_change" -///from base of area/Entered(): (atom/movable/arrived, direction) +///from base of area/Entered(): (atom/movable/arrived, area/old_area) #define COMSIG_AREA_ENTERED "area_entered" ///from base of area/Exited(): (atom/movable/gone, direction) #define COMSIG_AREA_EXITED "area_exited" diff --git a/code/datums/ai/monkey/monkey_controller.dm b/code/datums/ai/monkey/monkey_controller.dm index a4ad9a071a0..9f3643fb11c 100644 --- a/code/datums/ai/monkey/monkey_controller.dm +++ b/code/datums/ai/monkey/monkey_controller.dm @@ -310,7 +310,7 @@ have ways of interacting with a specific mob and control it. var/mob/living/carbon/human/H = thrown_by retaliate(H) -/datum/ai_controller/monkey/proc/on_entered(datum/source, atom/movable/arrived, direction) +/datum/ai_controller/monkey/proc/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) SIGNAL_HANDLER var/mob/living/living_pawn = pawn if(!IS_DEAD_OR_INCAP(living_pawn) && isliving(arrived)) diff --git a/code/datums/components/acid.dm b/code/datums/components/acid.dm index cea68d80641..224f3fd8c50 100644 --- a/code/datums/components/acid.dm +++ b/code/datums/components/acid.dm @@ -201,7 +201,7 @@ /// Handles searing the feet of whoever walks over this without protection. Only active if the parent is a turf. -/datum/component/acid/proc/on_entered(datum/source, atom/movable/arrived, direction) +/datum/component/acid/proc/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) SIGNAL_HANDLER if(!isliving(arrived)) diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm index bed99a64906..3a474837f5b 100644 --- a/code/datums/components/butchering.dm +++ b/code/datums/components/butchering.dm @@ -148,7 +148,7 @@ ) AddElement(/datum/element/connect_loc_behalf, parent, loc_connections) -/datum/component/butchering/recycler/proc/on_entered(datum/source, atom/movable/arrived, direction) +/datum/component/butchering/recycler/proc/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) SIGNAL_HANDLER if(!isliving(arrived)) diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm index 31812adbe63..cac345e7c99 100644 --- a/code/datums/components/chasm.dm +++ b/code/datums/components/chasm.dm @@ -31,7 +31,7 @@ target_turf = target START_PROCESSING(SSobj, src) // process on create, in case stuff is still there -/datum/component/chasm/proc/Entered(datum/source, atom/movable/arrived, direction) +/datum/component/chasm/proc/Entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) SIGNAL_HANDLER START_PROCESSING(SSobj, src) diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm index 54aed42db87..5d3368aeccc 100644 --- a/code/datums/components/food/edible.dm +++ b/code/datums/components/food/edible.dm @@ -439,7 +439,7 @@ Behavior that's still missing from this component that original food items had t ///Ability to feed food to puppers -/datum/component/edible/proc/on_entered(datum/source, atom/movable/arrived, direction) +/datum/component/edible/proc/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) SIGNAL_HANDLER SEND_SIGNAL(parent, COMSIG_FOOD_CROSSED, arrived, bitecount) diff --git a/code/datums/components/infective.dm b/code/datums/components/infective.dm index be19bc421e5..eab7b3c974a 100644 --- a/code/datums/components/infective.dm +++ b/code/datums/components/infective.dm @@ -109,7 +109,7 @@ var/obj/item/I = parent I.permeability_coefficient = old_permeability -/datum/component/infective/proc/try_infect_crossed(datum/source, atom/movable/arrived, direction) +/datum/component/infective/proc/try_infect_crossed(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) SIGNAL_HANDLER if(isliving(arrived)) diff --git a/code/datums/components/rot.dm b/code/datums/components/rot.dm index 2ad6c7abddf..a5545a0caff 100644 --- a/code/datums/components/rot.dm +++ b/code/datums/components/rot.dm @@ -114,7 +114,7 @@ rot_react(source, react_to, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) /// Triggered when something enters the component's parent. -/datum/component/rot/proc/on_entered(datum/source, atom/movable/arrived, direction) +/datum/component/rot/proc/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) SIGNAL_HANDLER rot_react(source, arrived) diff --git a/code/datums/components/singularity.dm b/code/datums/components/singularity.dm index d193f5aa6c3..b5899b426b6 100644 --- a/code/datums/components/singularity.dm +++ b/code/datums/components/singularity.dm @@ -130,7 +130,7 @@ return COMPONENT_CANCEL_BLOB_ACT /// Triggered when something enters the component's parent. -/datum/component/singularity/proc/on_entered(datum/source, atom/movable/arrived, direction) +/datum/component/singularity/proc/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) SIGNAL_HANDLER consume(source, arrived) diff --git a/code/datums/components/slippery.dm b/code/datums/components/slippery.dm index 30eeb1fea78..27ef90ceca8 100644 --- a/code/datums/components/slippery.dm +++ b/code/datums/components/slippery.dm @@ -47,7 +47,7 @@ * source - the source of the signal * AM - the atom/movable that is being slipped. */ -/datum/component/slippery/proc/Slip(datum/source, atom/movable/arrived, direction) +/datum/component/slippery/proc/Slip(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) SIGNAL_HANDLER if(!isliving(arrived)) return @@ -106,7 +106,7 @@ * source - the source of the signal * AM - the atom/movable that slipped on us. */ -/datum/component/slippery/proc/Slip_on_wearer(datum/source, atom/movable/arrived, direction) +/datum/component/slippery/proc/Slip_on_wearer(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) SIGNAL_HANDLER if(holder.body_position == LYING_DOWN && !holder.buckled) diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm index fae56d026c7..ce7478d6990 100644 --- a/code/datums/components/squeak.dm +++ b/code/datums/components/squeak.dm @@ -87,7 +87,7 @@ else steps++ -/datum/component/squeak/proc/play_squeak_crossed(datum/source, atom/movable/arrived, direction) +/datum/component/squeak/proc/play_squeak_crossed(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) SIGNAL_HANDLER if(isitem(arrived)) diff --git a/code/datums/components/swarming.dm b/code/datums/components/swarming.dm index 7c70500cced..5aa18bd96cf 100644 --- a/code/datums/components/swarming.dm +++ b/code/datums/components/swarming.dm @@ -25,7 +25,7 @@ swarm_members = null return ..() -/datum/component/swarming/proc/join_swarm(datum/source, atom/movable/arrived, direction) +/datum/component/swarming/proc/join_swarm(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) SIGNAL_HANDLER var/datum/component/swarming/other_swarm = arrived.GetComponent(/datum/component/swarming) diff --git a/code/datums/elements/caltrop.dm b/code/datums/elements/caltrop.dm index bc0bb8d2b29..2118743b458 100644 --- a/code/datums/elements/caltrop.dm +++ b/code/datums/elements/caltrop.dm @@ -39,7 +39,7 @@ else RegisterSignal(get_turf(target), COMSIG_ATOM_ENTERED, .proc/on_entered) -/datum/element/caltrop/proc/on_entered(datum/source, atom/movable/arrived, direction) +/datum/element/caltrop/proc/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) SIGNAL_HANDLER if(!prob(probability)) diff --git a/code/game/area/ai_monitored.dm b/code/game/area/ai_monitored.dm index 2d2a214d1ff..54b6666fca9 100644 --- a/code/game/area/ai_monitored.dm +++ b/code/game/area/ai_monitored.dm @@ -14,7 +14,7 @@ //Only need to use one camera -/area/ai_monitored/Entered(atom/movable/arrived, direction) +/area/ai_monitored/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() if (ismob(arrived) && motioncameras.len) for(var/X in motioncameras) @@ -22,7 +22,7 @@ cam.newTarget(arrived) return -/area/ai_monitored/Exited(atom/movable/gone, direction) +/area/ai_monitored/Exited(atom/movable/gone, atom/old_loc, list/atom/old_locs) ..() if (ismob(gone) && motioncameras.len) for(var/X in motioncameras) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index c297897ae45..de41338d1ae 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -599,9 +599,9 @@ GLOBAL_LIST_EMPTY(teleportlocs) * * If the area has ambience, then it plays some ambience music to the ambience channel */ -/area/Entered(atom/movable/arrived, direction) +/area/Entered(atom/movable/arrived, area/old_area) set waitfor = FALSE - SEND_SIGNAL(src, COMSIG_AREA_ENTERED, arrived, direction) + SEND_SIGNAL(src, COMSIG_AREA_ENTERED, arrived, old_area) for(var/atom/movable/recipient as anything in arrived.area_sensitive_contents) SEND_SIGNAL(recipient, COMSIG_ENTER_AREA, src) if(!isliving(arrived)) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 1eb18d956a8..0146acd186b 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -1319,9 +1319,9 @@ * * Default behaviour is to send the [COMSIG_ATOM_ENTERED] */ -/atom/Entered(atom/movable/arrived, direction) - SEND_SIGNAL(src, COMSIG_ATOM_ENTERED, arrived, direction) - SEND_SIGNAL(arrived, COMSIG_ATOM_ENTERING, src, direction) +/atom/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) + SEND_SIGNAL(src, COMSIG_ATOM_ENTERED, arrived, old_loc, old_locs) + SEND_SIGNAL(arrived, COMSIG_ATOM_ENTERING, src, old_loc, old_locs) /** * An atom is attempting to exit this atom's contents diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index db6292ea766..ec62865bb5b 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -434,11 +434,11 @@ if(new_locs) // Same here, only if multi-tile. for(var/atom/entered_loc as anything in (new_locs - old_locs)) - entered_loc.Entered(src, direction) + entered_loc.Entered(src, oldloc, old_locs) else - newloc.Entered(src, direction) + newloc.Entered(src, oldloc, old_locs) if(oldarea != newarea) - newarea.Entered(src, direction) + newarea.Entered(src, oldarea) Moved(oldloc, direction, FALSE, old_locs) @@ -634,7 +634,7 @@ for(var/atom/movable/location as anything in get_nested_locs(src) + src) LAZYREMOVE(location.area_sensitive_contents, gone.area_sensitive_contents) -/atom/movable/Entered(atom/movable/arrived, direction) +/atom/movable/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() if(arrived.area_sensitive_contents) for(var/atom/movable/location as anything in get_nested_locs(src) + src) @@ -702,9 +702,9 @@ var/dest_z = (destturf ? destturf.z : null) if (old_z != dest_z) onTransitZ(old_z, dest_z) - destination.Entered(src, movement_dir) + destination.Entered(src, oldloc) if(destarea && old_area != destarea) - destarea.Entered(src, movement_dir) + destarea.Entered(src, old_area) . = TRUE diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index 39bec7c16c9..726f9944c99 100644 --- a/code/game/objects/effects/effect_system/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/effects_smoke.dm @@ -140,7 +140,7 @@ M.emote("cough") return TRUE -/obj/effect/particle_effect/smoke/bad/proc/on_entered(datum/source, atom/movable/arrived, direction) +/obj/effect/particle_effect/smoke/bad/proc/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) SIGNAL_HANDLER if(istype(arrived, /obj/projectile/beam)) var/obj/projectile/beam/beam = arrived diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 8b55bf54b6f..97384c3050b 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -371,7 +371,7 @@ I_copy.layer = FLOAT_LAYER . += I_copy -/obj/item/storage/bag/tray/Entered(atom/movable/arrived, direction) +/obj/item/storage/bag/tray/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() update_appearance() diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 96a7d6259b6..fe462e1e382 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -62,7 +62,7 @@ is_open = TRUE update_appearance() -/obj/item/storage/fancy/Entered(atom/movable/arrived, direction) +/obj/item/storage/fancy/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() is_open = TRUE update_appearance() diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index ef2c0aff337..fa838bc8d71 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -57,7 +57,7 @@ visible_message(span_warning("\The [src] is broken by [user] with an electromagnetic card!")) return -/obj/item/storage/lockbox/Entered(atom/movable/arrived, direction) +/obj/item/storage/lockbox/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() open = TRUE update_appearance() diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm index e0f9a27bee6..38ca6dcfaea 100644 --- a/code/game/objects/items/storage/wallets.dm +++ b/code/game/objects/items/storage/wallets.dm @@ -92,7 +92,7 @@ update_appearance(UPDATE_ICON) update_slot_icon() -/obj/item/storage/wallet/Entered(atom/movable/arrived, direction) +/obj/item/storage/wallet/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() refreshID(removed = FALSE) diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm index b49c42d4920..17b013c0dc2 100644 --- a/code/game/turfs/open/_open.dm +++ b/code/game/turfs/open/_open.dm @@ -131,7 +131,7 @@ . = ..() AddComponent(/datum/component/wet_floor, TURF_WET_SUPERLUBE, INFINITY, 0, INFINITY, TRUE) -/turf/open/indestructible/honk/Entered(atom/movable/arrived, direction) +/turf/open/indestructible/honk/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() if(ismob(arrived)) playsound(src, sound, 50, TRUE) diff --git a/code/game/turfs/open/floor/mineral_floor.dm b/code/game/turfs/open/floor/mineral_floor.dm index 11a08fac460..6aff67a55a1 100644 --- a/code/game/turfs/open/floor/mineral_floor.dm +++ b/code/game/turfs/open/floor/mineral_floor.dm @@ -202,7 +202,7 @@ custom_materials = list(/datum/material/bananium = 500) var/sound_cooldown = 0 -/turf/open/floor/mineral/bananium/Entered(atom/movable/arrived, direction) +/turf/open/floor/mineral/bananium/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() if(.) return @@ -258,7 +258,7 @@ var/last_event = 0 var/active = null -/turf/open/floor/mineral/uranium/Entered(atom/movable/arrived, direction) +/turf/open/floor/mineral/uranium/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() if(.) return diff --git a/code/game/turfs/open/lava.dm b/code/game/turfs/open/lava.dm index d93fe027ffd..4f4ef944eaf 100644 --- a/code/game/turfs/open/lava.dm +++ b/code/game/turfs/open/lava.dm @@ -36,7 +36,7 @@ /turf/open/lava/airless initial_gas_mix = AIRLESS_ATMOS -/turf/open/lava/Entered(atom/movable/arrived, direction) +/turf/open/lava/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) if(burn_stuff(arrived)) START_PROCESSING(SSobj, src) diff --git a/code/game/turfs/open/space/space.dm b/code/game/turfs/open/space/space.dm index d58b1cc1e3a..0327e2113fe 100644 --- a/code/game/turfs/open/space/space.dm +++ b/code/game/turfs/open/space/space.dm @@ -165,7 +165,7 @@ else to_chat(user, span_warning("The plating is going to need some support! Place metal rods first.")) -/turf/open/space/Entered(atom/movable/arrived, direction) +/turf/open/space/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() if(!arrived || src != arrived.loc) return diff --git a/code/game/turfs/open/space/transit.dm b/code/game/turfs/open/space/transit.dm index 92ecfe1eb73..cbe7377d9a3 100644 --- a/code/game/turfs/open/space/transit.dm +++ b/code/game/turfs/open/space/transit.dm @@ -26,7 +26,7 @@ /turf/open/space/transit/east dir = EAST -/turf/open/space/transit/Entered(atom/movable/arrived, direction) +/turf/open/space/transit/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() if(!locate(/obj/structure/lattice) in src) throw_atom(arrived) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 5a2447f7fa3..62cb9a54d82 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -106,7 +106,7 @@ GLOBAL_LIST_EMPTY(station_turfs) visibilityChanged() for(var/atom/movable/content as anything in src) - Entered(content, NONE) + Entered(content, null) var/area/A = loc if(!IS_DYNAMIC_LIGHTING(src) && IS_DYNAMIC_LIGHTING(A)) @@ -343,7 +343,7 @@ GLOBAL_LIST_EMPTY(station_turfs) return TRUE -/turf/open/Entered(atom/movable/arrived, direction) +/turf/open/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) ..() //melting if(isobj(arrived) && air && air.temperature > T0C) diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm index b80dd316f4b..d69f3e5b72c 100644 --- a/code/modules/atmospherics/environmental/LINDA_fire.dm +++ b/code/modules/atmospherics/environmental/LINDA_fire.dm @@ -263,7 +263,7 @@ T.active_hotspot = null return ..() -/obj/effect/hotspot/proc/on_entered(datum/source, atom/movable/arrived, direction) +/obj/effect/hotspot/proc/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) SIGNAL_HANDLER if(isliving(arrived)) var/mob/living/immolated = arrived diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm index a0089338244..c275e9362ef 100644 --- a/code/modules/atmospherics/machinery/atmosmachinery.dm +++ b/code/modules/atmospherics/machinery/atmosmachinery.dm @@ -474,7 +474,7 @@ A.addMember(src) SSair.add_to_rebuild_queue(src) -/obj/machinery/atmospherics/Entered(atom/movable/arrived, direction) +/obj/machinery/atmospherics/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) if(istype(arrived, /mob/living)) var/mob/living/L = arrived L.ventcrawl_layer = piping_layer diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm index 85f9bd3dd23..7d9b40f97ed 100644 --- a/code/modules/events/immovable_rod.dm +++ b/code/modules/events/immovable_rod.dm @@ -122,7 +122,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 if((atom_crossed_over.density || isliving(atom_crossed_over)) && !QDELETED(atom_crossed_over)) Bump(atom_crossed_over) -/obj/effect/immovablerod/proc/on_entering_atom(datum/source, atom/destination, direction) +/obj/effect/immovablerod/proc/on_entering_atom(datum/source, atom/destination, atom/old_loc, list/atom/old_locs) SIGNAL_HANDLER if(destination.density && isturf(destination)) Bump(destination) diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 9b8e2238f02..31864ed2769 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -479,7 +479,7 @@ for(var/datum/spacevine_mutation/SM in SV.mutations) SM.on_birth(SV) - location.Entered(SV, NONE) + location.Entered(SV, null) return SV /datum/spacevine_controller/proc/VineDestroyed(obj/structure/spacevine/S) diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index 7d97e330c23..42f406bade6 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -114,7 +114,7 @@ . = ..() countEggs() -/obj/item/storage/basket/easter/Entered(atom/movable/arrived, direction) +/obj/item/storage/basket/easter/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() countEggs() diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 3be06b89041..2ed91bbb50d 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -48,7 +48,7 @@ * target - the atom that just moved onto the `source` turf. * oldLoc - the old location that `target` was at before moving onto `source`. */ -/obj/machinery/mineral/proc/pickup_item(datum/source, atom/movable/target, direction) +/obj/machinery/mineral/proc/pickup_item(datum/source, atom/movable/target, atom/old_loc, list/atom/old_locs) SIGNAL_HANDLER return diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 20549ebbd6f..6444ae35449 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -192,7 +192,7 @@ update_body() if(isturf(loc)) var/turf/T = loc - T.Entered(src, NONE) + T.Entered(src, null) //Ayy lmao diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index de5cd1b905c..0c900bf365a 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -766,7 +766,7 @@ SKYRAT REMOVAL EDIT END*/ holder_animal = loc START_PROCESSING(SSobj, src) -/obj/structure/closet/stasis/Entered(atom/movable/arrived, direction) +/obj/structure/closet/stasis/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) if(isliving(arrived) && holder_animal) var/mob/living/L = arrived L.notransform = 1 diff --git a/code/modules/ruins/icemoonruin_code/hotsprings.dm b/code/modules/ruins/icemoonruin_code/hotsprings.dm index 0b6be7e9d49..6bba1917aae 100644 --- a/code/modules/ruins/icemoonruin_code/hotsprings.dm +++ b/code/modules/ruins/icemoonruin_code/hotsprings.dm @@ -17,7 +17,7 @@ GLOBAL_LIST_EMPTY(cursed_minds) planetary_atmos = TRUE initial_gas_mix = ICEMOON_DEFAULT_ATMOS -/turf/open/water/cursed_spring/Entered(atom/movable/arrived, direction) +/turf/open/water/cursed_spring/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() if(!isliving(arrived)) return diff --git a/code/modules/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/ruins/spaceruin_code/hilbertshotel.dm index c34b9cdd7bb..14b7c6a13ac 100644 --- a/code/modules/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/ruins/spaceruin_code/hilbertshotel.dm @@ -262,7 +262,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) icon_state = base_icon_state return ..() -/turf/open/space/bluespace/Entered(atom/movable/arrived, direction) +/turf/open/space/bluespace/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() if(parentSphere && arrived.forceMove(get_turf(parentSphere))) do_sparks(3, FALSE, get_turf(arrived)) @@ -359,7 +359,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) var/datum/turf_reservation/reservation var/turf/storageTurf -/area/hilbertshotel/Entered(atom/movable/arrived, direction) +/area/hilbertshotel/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() if(istype(arrived, /obj/item/hilbertshotel)) relocate(arrived) @@ -447,7 +447,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) var/roomNumber var/obj/item/hilbertshotel/parentSphere -/obj/item/abstracthotelstorage/Entered(atom/movable/arrived, direction) +/obj/item/abstracthotelstorage/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() if(ismob(arrived)) var/mob/M = arrived