cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 17:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix forced gravity component (#40790)

Browse Source 
How many of these i will have to fix
This commit is contained in:
AnturK
2018-10-09 20:36:53 +02:00
committed by Tad Hardesty
parent faaf3b5b0b
commit dd448b00a4
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/datums/components/forced_gravity.dm
View File

@@ -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)
return gravity_check(null, parent, gravs)

3
code/game/area/areas.dm
View File

@@ -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