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

Fixes gravity surge event affecting capsule shelters on maps without gravity generators (#18742)

Browse Source 
* Fixes survival pods being affected by gravity events in some cases

* applies to admeme event as well!

* perhaps this is better logic actually

* Wait, it's probably a lot better to do this with flags...

* Whoops, thought I saved this change!
This commit is contained in:
Ryumi
2025-11-11 21:45:05 +01:00
committed by GitHub
parent 7331a57268
commit 94deb1ab18
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/gravity.dm
+4
View File
@@ -36,6 +36,8 @@
GG.charge_count = 10
else
for(var/area/A in world)
if(A.flags & AREA_ALWAYS_HAS_GRAVITY)
continue
if(A.z in zLevels)
A.gravitychange(GLOB.gravity_is_on)
@@ -54,6 +56,8 @@
did_anything = TRUE
else
for(var/area/A in world)
if(A.flags & AREA_ALWAYS_HAS_GRAVITY)
continue
if(A.z in zLevels)
A.gravitychange(GLOB.gravity_is_on)
did_anything = TRUE
code/modules/gamemaster/event2/events/everyone/gravity.dm
+2 -2
View File
@@ -23,12 +23,12 @@
/datum/event2/event/gravity/start()
for(var/area/A in world)
if(A.z in get_location_z_levels(space_only = TRUE))
if(!(A.flags & AREA_ALWAYS_HAS_GRAVITY) && A.z in get_location_z_levels(space_only = TRUE))
A.gravitychange(FALSE)
/datum/event2/event/gravity/end()
for(var/area/A in world)
if(A.z in get_location_z_levels(space_only = TRUE))
if(!(A.flags & AREA_ALWAYS_HAS_GRAVITY) && A.z in get_location_z_levels(space_only = TRUE))
A.gravitychange(TRUE)
command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.", "Gravity Restored")
code/modules/mining/shelter_atoms_vr.dm
+2 -1
View File
@@ -6,11 +6,12 @@ GLOBAL_LIST_EMPTY(unique_deployable)
dynamic_lighting = TRUE
requires_power = FALSE
has_gravity = TRUE
flags = AREA_ALWAYS_HAS_GRAVITY
/area/survivalpod/dorms
name = "\improper Emergency Shelter Dorm"
icon_state = "away1"
flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING | AREA_ALWAYS_HAS_GRAVITY
/area/survivalpod/dorms/bathroom
name = "\improper Emergency Shelter Bathroom"