From 2020ee9b663719f3099d8e18b3a5a7fa054d124e Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Fri, 16 Sep 2016 11:51:26 -0400 Subject: [PATCH 1/4] Movable atoms now call Entered() on their loc in New() --- code/game/atoms_movable.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 8cb112ca8f8..2f1da74d9b5 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -19,7 +19,10 @@ glide_size = 8 appearance_flags = TILE_BOUND - +/atom/movable/New(loc) + ..() + if(loc) + loc.Entered(src) /atom/movable/Move(atom/newloc, direct = 0) if(!loc || !newloc) return 0 From ce7e3ee4a5d183fbc4ea5382377d56448588f401 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Fri, 16 Sep 2016 12:00:19 -0400 Subject: [PATCH 2/4] what's loc actually cast as --- code/game/atoms_movable.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 2f1da74d9b5..bd9cf9abfb8 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -22,7 +22,8 @@ /atom/movable/New(loc) ..() if(loc) - loc.Entered(src) + var/atom/movable/A = loc + A.Entered(src) /atom/movable/Move(atom/newloc, direct = 0) if(!loc || !newloc) return 0 From b79e0f81e8ecf89247ca3f7883f0de97cb1a95f4 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Fri, 16 Sep 2016 12:00:27 -0400 Subject: [PATCH 3/4] i'm not sure --- code/game/atoms_movable.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index bd9cf9abfb8..bfb80fd1339 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -22,7 +22,7 @@ /atom/movable/New(loc) ..() if(loc) - var/atom/movable/A = loc + var/atom/A = loc A.Entered(src) /atom/movable/Move(atom/newloc, direct = 0) From f0f64ae75b8dc66479bb163c7837a268b19a2f99 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Fri, 16 Sep 2016 12:31:55 -0400 Subject: [PATCH 4/4] TODO NOT BE DUMB --- code/game/atoms_movable.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index bfb80fd1339..3582a8f846d 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -19,11 +19,10 @@ glide_size = 8 appearance_flags = TILE_BOUND -/atom/movable/New(loc) +/atom/movable/New() ..() if(loc) - var/atom/A = loc - A.Entered(src) + loc.Entered(src) /atom/movable/Move(atom/newloc, direct = 0) if(!loc || !newloc) return 0