Solving future merge conflicts#5699

Open

Kocma-san wants to merge 24 commits intoFluffy-Frontier:masterfrom

Kocma-san:solving-future-merge-conflicts

Commits on Nov 8, 2025

Revert "Return free Nova loadout (#5038)"
Kocma-san
committed
Revert "Safety Coverage (#5000)"
Kocma-san
committed
Add: Donator Item for thedragmeme (#4379)

authored and
Kocma-san
committed
Adds donator item for BonkaiTheRoris (#4471)

authored and
Kocma-san
committed
Adds a donor item for ActualVanguard (#4468)

authored and
Kocma-san
committed
Add: Starfruit & Donator Item for Snailomi (#4505)

authored and
Kocma-san
committed
Fixes DrpMstr's donator item not being available to them in the loadout (#4552)

authored and
Kocma-san
committed
Adds donor items for thedragmeme (#4574)

authored and
Kocma-san
committed
Adds new drinks and foods, giving starfruit functionality (#4580)

authored and
Kocma-san
committed
Donator items for Sciamach (#4661)

authored and
Kocma-san
committed
Adds donor item for jaklz (#4689)

SomrNetwork
authored and
Kocma-san
committed
Adds donator item for BonkaiTheRoris: plushie edition (#4707)

authored and
Kocma-san
committed
Adds donation reward for Sharkoink (#4721)

SomrNetwork
authored and
Kocma-san
committed
Adds two donator items. (#4737)

authored and
Kocma-san
committed
Adds a ckey to Koru's donator items (#4808)

FlufflesTheDog
authored and
Kocma-san
committed
Adds 3 dono items for spookyrotini (#4883)

TheSS13Melon
authored and
Kocma-san
committed
[DONATOR ITEM] Ahab's Spear Retool Kit (#5046)

authored and
Kocma-san
committed
Un-whitelists Sciira's donator plush (#5204)

FlufflesTheDog
authored and
Kocma-san
committed
[SEMI-MODULAR] Red security is back. All hail red security. (#5126)

authored and
Kocma-san
committed
[MDB Ignore] Updates visuals for the loadout menu (#90399)

SmArtKar
authored and
Kocma-san
committed
Kaynite clothes (#5447)

authored and
Kocma-san
committed
Kaynite donor item loadout fix (#5504)

dmnaru
authored and
Kocma-san
committed
Deadmon Donator Ecologist Set (#5478)

authored and
Kocma-san
committed
Fix all our broken grep checks

FlufflesTheDog
authored and
Kocma-san
committed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

Solving future merge conflicts#5699

Solving future merge conflicts#5699
Kocma-san wants to merge 24 commits intoFluffy-Frontier:masterfrom
Kocma-san:solving-future-merge-conflicts

Commits on Nov 8, 2025

Revert "Return free Nova loadout (#5038)"

Revert "Safety Coverage (#5000)"

Add: Donator Item for thedragmeme (#4379)

Adds donator item for BonkaiTheRoris (#4471)

Adds a donor item for ActualVanguard (#4468)

Add: Starfruit & Donator Item for Snailomi (#4505)

Fixes DrpMstr's donator item not being available to them in the loadout (#4552)

Adds donor items for thedragmeme (#4574)

Adds new drinks and foods, giving starfruit functionality (#4580)

Donator items for Sciamach (#4661)

Adds donor item for jaklz (#4689)

Adds donator item for BonkaiTheRoris: plushie edition (#4707)

Adds donation reward for Sharkoink (#4721)

Adds two donator items. (#4737)

Adds a ckey to Koru's donator items (#4808)

Adds 3 dono items for spookyrotini (#4883)

[DONATOR ITEM] Ahab's Spear Retool Kit (#5046)

Un-whitelists Sciira's donator plush (#5204)

[SEMI-MODULAR] Red security is back. All hail red security. (#5126)

[MDB Ignore] Updates visuals for the loadout menu (#90399)

Kaynite clothes (#5447)

Kaynite donor item loadout fix (#5504)

Deadmon Donator Ecologist Set (#5478)

Fix all our broken grep checks