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.

Sign up for GitHub

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

Jump to bottom

[IDB IGNORE] [MDB IGNORE] Staging r5 #3679

Merged
merged 666 commits into from
Mar 9, 2024
Merged

[IDB IGNORE] [MDB IGNORE] Staging r5 #3679

merged 666 commits into from
Mar 9, 2024

Conversation

MistakeNot4892
Copy link
Contributor

No description provided.

@MistakeNot4892 MistakeNot4892 added this to the r5 milestone Feb 12, 2024
@MistakeNot4892 MistakeNot4892 added do not merge This PR is on hold, do not merge it. ❄️frozen❄️ Do not merge until the dev freeze is over. labels Feb 12, 2024
MistakeNot4892 and others added 27 commits February 17, 2024 22:18
@MistakeNot4892
Fixes offset attack animations.
53de587
@MistakeNot4892
Rearranging blood logic and collapsing some procs to /mob/living.
01cc081
@MistakeNot4892 @comma
Non-secret modes should be available again.
470856e
@out-of-phaze
Fix mispath in plate map migration
b491780
@out-of-phaze
Merge pull request #3692 from MistakeNot4892/tweak/clean
d367af7 
Reworks/condenses clean() and clean_blood().
@MistakeNot4892
Merge pull request #3698 from out-of-phaze/fix/plate-migrate
4a609a1 
Fix mispath in plate map migration
@MistakeNot4892
Reworking/cleaning up utensils.
10c9fd4
@MistakeNot4892
Reimplements simple_animal damage handling.
d476bb6
@out-of-phaze
Merge pull request #3695 from MistakeNot4892/tweak/blood
cd4707c 
Condensing blood code.
@out-of-phaze
Merge pull request #3696 from MistakeNot4892/feature/logs
f1ef93f 
Adding logs and trees.
@NebulaSS13Bot
Automatic changelog generation for PR #3696 [ci skip]
68389d5
@MistakeNot4892
Small mobs can ride simple animals, for science.
34fc05d 
Adding some target resolution to grabcode for riders to use to direct mounts.

Expanding simplemob riding a bit so that hostile mobs will respond to riders.
@NebulaSS13Bot
Automatic changelog generation [ci skip]
4722c67
@MistakeNot4892
Merge branch 'stable' of github.com:NebulaSS13/Nebula into dev
cb0bdcd
@MistakeNot4892
Merge pull request #3708 from MistakeNot4892/dev
b34399a 
Dev update from stable.
@MistakeNot4892 @comma
Merged /turf/exterior/open and /turf/simulated/open.
e1a6d00
@MistakeNot4892 @comma
Fluid reagents are now turf reagents.
771abfa
@MistakeNot4892 @comma
Refining fluid overlays.
a962f4d
@MistakeNot4892 @comma
Adding null checking to reagents checks due to /datum/reagents/Destro…
8e4e2a5 
…y() now calling on_reagent_change().
@NebulaSS13Bot
Automatic changelog generation [ci skip]
d4a9c9e
@MistakeNot4892
Fixes erroneous set_flooded() arg.
8b79764
@MistakeNot4892
Converts fluid source/fluids lists to linear instead of assoc.
5268e65
@MistakeNot4892
Aggregates fluid list removals.
94328e9
@MistakeNot4892
Adjust fluid sleep and update handling.
965b194
@MistakeNot4892
Fixes runtime in blood touch_turf.
a4f3403
@MistakeNot4892
Puddles will wake up neighbors.
f361a33
@MistakeNot4892
Removes erroneous comment.
7820b9d
MistakeNot4892 and others added 29 commits March 8, 2024 09:19
@MistakeNot4892
Converting nymph UI to the decl system.
b24044f
@MistakeNot4892
Tweaking attack selector icons.
5483b9a
@MistakeNot4892
Moving crit markers into their own icon file.
2319ee7
@out-of-phaze
Merge pull request #3677 from MistakeNot4892/rework/hud_style_decls
7a228fa 
[IDB IGNORE] UI style is now handled by a decl system.
@MistakeNot4892
Default emotes now use a static list.
1a72c0e
@MistakeNot4892
Targeted emotes will now take the closest target and can be targetted…
bd14a57 
… with a partial string.
@MistakeNot4892
Emote key uniqueness is now enforced.
15fe646
@MistakeNot4892
Porting various adjustments and improvements to emotes from Polaris.
36c199e
@MistakeNot4892
Standardizing emote tokens.
5b4b63a
@out-of-phaze
Merge pull request #3756 from MistakeNot4892/feature/woodshovel
01f7dce 
Splitting some small changes out of trench PR.
@MistakeNot4892
Reworking stack crafting to use a decl system.
4c98be7
@MistakeNot4892
Refining recipes to decls PR.
5bc8524
@MistakeNot4892
Tidying/cleaning up/normalizing recipe definitions.
7da57a8
@MistakeNot4892
Simplifying recipe decls where autogen is possible.
4b123f0
@MistakeNot4892
Tidies canister names.
8a7c005
@MistakeNot4892
Refining crafting UI and value gen.
a24da97
@MistakeNot4892
Optimizing the recipe check.
021b8aa
@MistakeNot4892
Converting/readding brick recipes.
18212a8
@MistakeNot4892
Addressing PR feedback.
3679d98
@out-of-phaze
Merge pull request #3690 from MistakeNot4892/tweak/default_emotes
6055bc6 
Updating the emote system
@NebulaSS13Bot
Automatic changelog generation [ci skip]
45a405d
@MistakeNot4892
Moving various /turf/simulated functions down to /turf.
d41db8b
@MistakeNot4892
Replacing various typechecks on /turf/simulated.
2cae089
@MistakeNot4892
Further commit for /turf/simulated removal.
86375b0
@out-of-phaze @comma
Update integration/unit tests to latest stable 515
6bed12b
@out-of-phaze @comma
Readd latency to transmitters in unit tests
60d63c4
@out-of-phaze @comma
Fix dangling ref in custom_setup geartweak
824be4e
@out-of-phaze
Merge pull request #3754 from MistakeNot4892/rework/stackcrafting
28f4811 
[MDB IGNORE] Reworking stack crafting to use a decl system.
@out-of-phaze
Merge pull request #3714 from MistakeNot4892/rework/openspace
479cef5 
Dismantles /turf/simulated.
@MistakeNot4892 MistakeNot4892 merged commit b1e0e80 into staging Mar 9, 2024
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
do not merge This PR is on hold, do not merge it. ❄️frozen❄️ Do not merge until the dev freeze is over.
Projects
None yet
Milestone
r5
Development

Successfully merging this pull request may close these issues.
4 participants
@MistakeNot4892 @out-of-phaze @NebulaSS13Bot @PsiOmegaDelta