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

[MIRROR] Builds logic that manages turfs contained inside an area [MDB IGNORE] (#17379)

Browse Source 
* Builds logic that manages turfs contained inside an area

* Mirror Conflict

* Modular!

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
This commit is contained in:
SkyratBot
2022-11-16 20:42:22 +01:00
committed by GitHub
parent bd4e73411d
commit 24eb8217c0
45 changed files with 299 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/arrivals.dm
+1 -1
View File
@@ -36,7 +36,7 @@
areas = list()
var/list/new_latejoin = list()
for(var/area/shuttle/arrival/A in GLOB.sortedAreas)
for(var/area/shuttle/arrival/A in GLOB.areas)
for(var/obj/structure/chair/C in A)
new_latejoin += C
if(!console)
code/modules/shuttle/emergency.dm
+3 -3
View File
@@ -481,7 +481,7 @@
if(time_left <= 50 && !sound_played) //4 seconds left:REV UP THOSE ENGINES BOYS. - should sync up with the launch
sound_played = 1 //Only rev them up once.
var/list/areas = list()
for(var/area/shuttle/escape/E in GLOB.sortedAreas)
for(var/area/shuttle/escape/E in GLOB.areas)
areas += E
hyperspace_sound(HYPERSPACE_WARMUP, areas)
@@ -493,7 +493,7 @@
//now move the actual emergency shuttle to its transit dock
var/list/areas = list()
for(var/area/shuttle/escape/E in GLOB.sortedAreas)
for(var/area/shuttle/escape/E in GLOB.areas)
areas += E
hyperspace_sound(HYPERSPACE_LAUNCH, areas)
enterTransit()
@@ -512,7 +512,7 @@
if(SHUTTLE_ESCAPE)
if(sound_played && time_left <= HYPERSPACE_END_TIME)
var/list/areas = list()
for(var/area/shuttle/escape/E in GLOB.sortedAreas)
for(var/area/shuttle/escape/E in GLOB.areas)
areas += E
hyperspace_sound(HYPERSPACE_END, areas)
if(time_left <= PARALLAX_LOOP_TIME)
code/modules/shuttle/on_move.dm
+4
View File
@@ -171,7 +171,9 @@ All ShuttleMove procs go here
return TRUE
contents -= oldT
turfs_to_uncontain += oldT
underlying_old_area.contents += oldT
underlying_old_area.contained_turfs += oldT
oldT.transfer_area_lighting(src, underlying_old_area)
//The old turf has now been given back to the area that turf originaly belonged to
@@ -179,7 +181,9 @@ All ShuttleMove procs go here
parallax_movedir = old_dest_area.parallax_movedir
old_dest_area.contents -= newT
old_dest_area.turfs_to_uncontain += newT
contents += newT
contained_turfs += newT
newT.transfer_area_lighting(old_dest_area, src)
return TRUE
code/modules/shuttle/shuttle.dm
+2
View File
@@ -673,7 +673,9 @@
if(!oldT || !istype(oldT.loc, area_type))
continue
var/area/old_area = oldT.loc
old_area.turfs_to_uncontain += oldT
underlying_area.contents += oldT
underlying_area.contained_turfs += oldT
oldT.transfer_area_lighting(old_area, underlying_area)
oldT.empty(FALSE)