cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Attempts to fix an issue with gravity generators triggering CI failures [MDB IGNORE] (#22588)

Browse Source 
* Attempts to fix an issue with gravity generators triggering CI failures

* Update forced_gravity.dm

* Update forced_gravity.dm

* Update gravity.dm

---------

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-07-19 15:26:25 -04:00
committed by GitHub
co-authored by Bloop
parent 9ca698b679
commit 2e40d3fac0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/elements/forced_gravity.dm
+3 -3
View File
@@ -6,7 +6,7 @@
///whether we will override the turf if it forces no gravity
var/ignore_turf_gravity
/datum/element/forced_gravity/Attach(datum/target, gravity = 1, ignore_turf_gravity = FALSE, can_override = FALSE) ////TODO : SKYRAT EDIT - TEMP CI FIX
/datum/element/forced_gravity/Attach(datum/target, gravity = 1, ignore_turf_gravity = FALSE, can_override = FALSE)
. = ..()
if(!isatom(target))
return ELEMENT_INCOMPATIBLE
@@ -18,9 +18,9 @@
src.gravity = gravity
src.ignore_turf_gravity = ignore_turf_gravity
RegisterSignal(target, COMSIG_ATOM_HAS_GRAVITY, PROC_REF(gravity_check), override = can_override) ////TODO : SKYRAT EDIT - TEMP CI FIX
RegisterSignal(target, COMSIG_ATOM_HAS_GRAVITY, PROC_REF(gravity_check), override = can_override)
if(isturf(target))
RegisterSignal(target, COMSIG_TURF_HAS_GRAVITY, PROC_REF(turf_gravity_check), override = can_override) ////TODO : SKYRAT EDIT - TEMP CI FIX
RegisterSignal(target, COMSIG_TURF_HAS_GRAVITY, PROC_REF(turf_gravity_check), override = can_override)
ADD_TRAIT(target, TRAIT_FORCED_GRAVITY, our_ref)
code/datums/proximity_monitor/fields/gravity.dm
+1 -1
View File
@@ -15,7 +15,7 @@
return
if(HAS_TRAIT(target, TRAIT_FORCED_GRAVITY))
return
target.AddElement(/datum/element/forced_gravity, gravity_value, can_override = TRUE) //TODO : SKYRAT EDIT - TEMP CI FIX
target.AddElement(/datum/element/forced_gravity, gravity_value, can_override = TRUE)
modified_turfs[target] = gravity_value
/datum/proximity_monitor/advanced/gravity/cleanup_field_turf(turf/target)