Upstream merge again#452
Merged
PsyCommando merged 345 commits intoPersistentSS13:devfrom Apr 13, 2023
Merged
Conversation
Make ambience a lazylist
Fix strata spawning in unsuitable environments
Fix \improper in UI titles
Make close_uis (and datum/Destroy) faster during init
Remove redundant sector name from navpoint names
Fix BLOCK_HEAD_HAIR making hair bald instead of short
Fix closets that start open containing objects
Make async tests await subsystems properly
Pass holder instead of my_atom and metabolism_class
Fix data and arguments for on_leaving_metabolism
Fix ship sensor power and density
Add testing for + fix away site pipe leaks
Staging update from stable
Fix material processors breaking on (shuttle) move
Fix runtime from invalid explosion_act severity
Adding various variant ammo types.
Standardizing trader paths.
PsyCommando
added
💾 serialization
* Added /datum/map_template/persistent for handling map templates that are saved and shouldn't be loaded again when a save is detected.
PsyCommando
force-pushed
the
upstream-merge-again
branch
4 times, most recently
from
eb0987f to
8379907
Compare
* Fill all the border edges with a filler turf, since they're gonna get replaced at runtime with the right turf. * Defined the level data to use the automated transition border system. * Tweak kleibkhar map transition borders * Give names to level_data_spawner and etc
Unit test shouldn't load map again * Unit tests would load "main sites" again when spawning templates for testing. * Moved build_main_sites proc. Fixed level loading/saving * Changed the algorithm assigning z-levels on load to fill-in the unused z-level gaps after load with "dynamic" levels. * Saves level_data types for each z-levels in the z-level map so they can be properly setup on load. (This wouldn't be needed on the latest iteration of the exoplanet pr, but since we're still generating planets inside overmap markers, we have to do this) * For the time being uses the player_level list to grab z-levels to order post-load. Since using station levels was just not a viable way of doing this. * Updated unit test for extra text2path. * Updated sql scripts to generate the new column in the zlevel table. * Fixed random_maps forcefully changing a level's base turf for no reasons. * Extra comments
SaveExists() shouldn't crash in case of no db connections, since it's a query from a subsystem and not directly trying to access the DB. It also prevents us from determining what to load on startup.
PsyCommando
force-pushed
the
upstream-merge-again
branch
from
1dfdeba to
a091415
Compare
Fixed the kleibkhar shuttle The supply shuttle on kleibkhar would fail unit tests for various strange reasons. * Excluded docking controllers subtypes from being spawned by the unit test deleting and creating everything. Since it would spawn a duplicate of the docking controller with the same id_tag as the supply shuttle's. * Tweaked the offsite area for the supply shuttle, so the shuttle cannot be vented to space, and a docking controller is installed there. * Add offsite shuttle dock's area to the test exempt areas
* It'll all get overwritten by the new map, but since we're stuck with it, I updated it too. * fix old outreach duplicate apc
PsyCommando
force-pushed
the
upstream-merge-again
branch
from
a091415 to
f85393e
Compare
NataKilar
approved these changes
Apr 12, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
SSmapping.station_levellist can be marked as saved. Everything in theSSmapping.player_levelslist is checked whether it should save or not. That makes a lot more sense consideringstation_levelsis used for a bunch of other unrelated things that we may not want all our saved levels to be subjected to..(Also, just a little sidenote, but, I think eventually the whole "dynamic" levels stuff will need to be revisited, because it's going to cause problem in it's current state. One of the bigger issues is that SSpersistence works in parallel with SSmapping when setting up levels, when they probably should cooperate more. Especially regarding dynamically loaded z-levels.)