diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 7c797fd72d..c74628a4ea 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -157,9 +157,7 @@ var/const/enterloopsanity = 100 if(ismob(A)) var/mob/M = A - if(!M.lastarea) - M.lastarea = get_area(M.loc) - if(M.lastarea.has_gravity == 0) + if(M.lastarea?.has_gravity == 0) inertial_drift(M) if(M.flying) //VORESTATION Edit Start. This overwrites the above is_space without touching it all that much. inertial_drift(M) diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index f830643e00..898a1fe826 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -996,14 +996,6 @@ if(wearer.transforming || !wearer.canmove) return - if(locate(/obj/effect/stop/, wearer.loc)) - for(var/obj/effect/stop/S in wearer.loc) - if(S.victim == wearer) - return - - if(!wearer.lastarea) - wearer.lastarea = get_area(wearer.loc) - if((istype(wearer.loc, /turf/space)) || (wearer.lastarea.has_gravity == 0)) if(!wearer.Process_Spacemove(0)) return 0 diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 425bf37c3e..41b52d37ea 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1299,9 +1299,7 @@ default behaviour is: //actually throw it! src.visible_message("[src] has thrown [item].") - if(!src.lastarea) - src.lastarea = get_area(src.loc) - if((istype(src.loc, /turf/space)) || (src.lastarea.has_gravity == 0)) + if((istype(src.loc, /turf/space)) || (src.lastarea?.has_gravity == 0)) src.inertia_dir = get_dir(target, src) step(src, inertia_dir) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index c5238b26b0..52b87e011d 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -45,6 +45,7 @@ dead_mob_list += src else living_mob_list += src + lastarea = get_area(src) hook_vr("mob_new",list(src)) //VOREStation Code update_transform() // Some mobs may start bigger or smaller than normal. return ..() diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index e98522ac00..314186936b 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -511,8 +511,6 @@ if(!new_character) new_character = new(T) - new_character.lastarea = get_area(T) - if(ticker.random_players) new_character.gender = pick(MALE, FEMALE) client.prefs.real_name = random_name(new_character.gender)