Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging r3 staging to stable. [IDB IGNORE] [MDB IGNORE] #3417

Merged
merged 1,941 commits into from
Oct 10, 2023
Merged

Conversation

MistakeNot4892
Copy link
Contributor

Opening for 24h to get any comments/objections.

PsyCommando and others added 30 commits June 21, 2023 11:46
Since random planetoid are always runtime generated, made it return true always instead of checking the length of mappaths.
It's easier to override now. And there's a bit less redundancy.
Since loaf requested it, I made exoplanet only generate one z level for now.
Added new step to unit test to test generating all exoplanet templates and planetoid templates.
Since we added a unit test for planet templates, we don't need the planet templates to get loaded for every single tests.
Also added log output when testing planet setup and loading a planet template.
Forgot to strip the key values of the template list
Since mapped planets cannot have their level_data registered to their plantoid_data yet during template level load, moved the code that starts planetoid processing over to ssmapping and made it be called via the roundstart hook.
Planet processing is basically just daycycle handling, so it doesn't really have any impact on the game currently.
* Renamed /datum/map/proc/build_exoplanets() to build_planets()
* Fixed case in logged strings.
* Skipped template categories on ss unit test init are now stored in a static list.
* Tweaked a comment.
* Repathed signs so their type path matches the base icons and features they share better.
* Signs item now holds the original sign structure type instead of creating a look-alike sign when placed.
* Separated sign icons into their own icon files to make diffs easier in the future.
* Improved how laminated diplomas work, so now they keep their diploma data even after being uninstalled from the wall.
* Simplified the process of placing a sign on a wall. So it works like everything else. No more prompt asking for a direction, it places it depending on what wall you're clicking on.
It's a lot easier to keep the fonts used for each types of pen when they're stored as tool properties, so did that. The  font types also now are defines.
Since extensions cannot be cloned using the Clone() proc, I've made a work around where extensions have a proc called ``copy_from`` which copies data to an existing extension, solving the problem of extensions always needing to have a holder on creation, which prevent us from using Clone().
* The copy_from proc uses PopulateClone to actually populate the copied data, so this can be easily refactored in the future to use the base Clone system if we want.
* Added a copy_extension proc to copy an extension of the given base type over to another atom. Useful for things like labels and scent and etc..
Placing and removing a sign now also carries over labels, forensics evidences, and scent.
* Some maps just took the sign subtype and slapped an icon on it. Changed it so they use the right sign subtype.
* Some maps defined new contents for the signs, so defined a subtype for those instead of having that in the map, and causing inconsistencies.
Unit tests would crash when instantiating the abstract base types that diplomas inherit from.
[IDB IGNORE] July 2023 staging
@MistakeNot4892 MistakeNot4892 added this to the r3 milestone Oct 8, 2023
MistakeNot4892 and others added 4 commits October 9, 2023 09:13
Modernize unsim air comparisons and allow Test_ZAS_Connection for nonsim turfs
Nanoblood bags are now a blood bag subtype.
Tweaking nymph name and stat entry.
@out-of-phaze
Copy link
Member

I would at least like #3379 and #3420 in first, to avoid having to retarget them to staging.

@MistakeNot4892 MistakeNot4892 merged commit 878d824 into stable Oct 10, 2023
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants