Jan 2023 merge [IDB IGNORE] [MDB IGNORE]#382
Merged
PsyCommando merged 965 commits intoPersistentSS13:devfrom Jan 17, 2023
Merged
Jan 2023 merge [IDB IGNORE] [MDB IGNORE]#382PsyCommando merged 965 commits intoPersistentSS13:devfrom
PsyCommando merged 965 commits intoPersistentSS13:devfrom
Conversation
Readding records cabinets.
Added a check on afterattack, and properly deleted failed parcels if anything fails during its creation. Added extra logging and crash where relevant to help troubleshoot any problems with that.
* A bunch of closets' attackby would return FALSE even if they did handle the attack, which made things inserted into them also attempt to run their afterattack. * Fixed coffins from eating the return value of its attackby proc
wrapping_paper_needed_for_obj() was moved to the atom level as suggested, and renamed wrapping_paper_needed_to_wrap().
Seems like some things were either lost in my stash and never commited or I overwrote them during rebase. Because a lot of things were just broken with interactions. * Added proper cooldown on wrapping. * Added pre-check when wrapping mobs to prevent wrapping yourself and prevent going through the whole process of wrapping a human to get told it didn't work. * Added more checks to writing a note on the package
Seems like that was part of whatever happened with the rebase.
Tags wouldn't get added at al to the history for some reasons. And it was missing sanitize calls on tags entered by the users and via OnTopic.
Leftovers from unwrapping would spawn in nullspace, and not take on the right color. Also there was a bad cast going on in place_cuttings.
Added dummy states to template icons to try to address a bad icon runtime.
Fixes oil smelling like blood.
Desperado - Fix disconnected pipes + blastdoors button
Remade wrapping paper and parcels/gifts
Adding clotting agent.
Updates heart pulse on death.
Fix chemical dispenser beaker overlays
Staging update from stable.
Updating dev from staging/stable
Added vestigal underlay system to human icons for tails.
Readds the randomize body button.
NataKilar
force-pushed
the
jan-2023-merge
branch
from
2c71f18 to
d588516
Compare
NataKilar
force-pushed
the
jan-2023-merge
branch
from
d588516 to
b7fd66a
Compare
PsyCommando
approved these changes
Jan 17, 2023
Collaborator
PsyCommando
left a comment
PsyCommando
left a comment
There was a problem hiding this comment.
I think most of it is fine!
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
8 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.
Merges us to Nebula Jan. 2023. Off the top of my head the following large adjustments were made
There's a few things that haven't been totally addressed, namely the changes to the ambient light system. This may or may not require adjustments to Kleibkhar.
This also includes some changes to the JSON serialization system. JSON serialization now supports wrappers, and will now only serialize one copy of an object per JSON branch in a single row. This prevents potential infinite loops from occurring. In addition, JSON serialization now keeps its own reverse map so that only a single copy of each object is deserialized, even if it has been serialized in multiple places.