From dd448b00a4e02b6cd45e6637cd8bc4cb480a0953 Mon Sep 17 00:00:00 2001 From: AnturK Date: Tue, 9 Oct 2018 20:36:53 +0200 Subject: [PATCH] Fix forced gravity component (#40790) How many of these i will have to fix --- code/datums/components/forced_gravity.dm | 6 +++--- code/game/area/areas.dm | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code/datums/components/forced_gravity.dm b/code/datums/components/forced_gravity.dm index 100bcf781c0..7f609c49457 100644 --- a/code/datums/components/forced_gravity.dm +++ b/code/datums/components/forced_gravity.dm @@ -5,9 +5,9 @@ /datum/component/forced_gravity/Initialize(forced_value = 1) if(!isatom(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(COMSIG_ATOM_HAS_GRAVITY, .proc/gravity_check) + RegisterSignal(parent, COMSIG_ATOM_HAS_GRAVITY, .proc/gravity_check) if(isturf(parent)) - RegisterSignal(COMSIG_TURF_HAS_GRAVITY, .proc/turf_gravity_check) + RegisterSignal(parent, COMSIG_TURF_HAS_GRAVITY, .proc/turf_gravity_check) gravity = forced_value @@ -17,4 +17,4 @@ gravs += gravity /datum/component/forced_gravity/proc/turf_gravity_check(datum/source, atom/checker, list/gravs) - return gravity_check(parent, gravs) \ No newline at end of file + return gravity_check(null, parent, gravs) \ No newline at end of file diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 10650153d62..2f9c9163192 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -463,8 +463,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) var/max_grav for(var/i in forced_gravity) max_grav = max(max_grav, i) - if(max_grav) - return max_grav + return max_grav if(isspaceturf(T)) // Turf never has gravity return 0