Player Personal Stash by DDrakov · Pull Request #562 · Triad-Sector/Triad_Sector

DDrakov · 2026-08-27T23:48:10Z

About the PR

Rework how personal stash work, instead of per ships it will be per character. Porting Monolith-Station/Monolith#4424 which is a port from new-frontiers-14/frontier-station-14#4636 (technical details in there as well).
To do :

Add current ship saving contraband tag to the box
Re-sprite boxes
Add one more box for ginormous
Reclaim system needed to be tested
Test data, make sure any written paper, chemical, and guns persist their data.
Function to remove box if unwanted
Make a limit, if player have equal or more than stash limit then they unable to purchase or deposit any.
Fix the contraband removal
Make container recursion checking for contraband

Technicalilty

Need to find a way to fix if there's no invalid prototype it should just close the box or remove it from database.
runtime: Caught exception in "Async Queued Callback" Robust.Shared.GameObjects.EntityCreationException: Attempted to spawn an entity with an invalid prototype: SafetyDepositBoxSmall
To-do test
Non serializeable item such as magazine, injectors and such should be tested.
When box are handed to other player, try to deposit the boxes see what happen
Player A input the box, player B press the deposit. See what happen

Why / Balance

Ship stashes are flawed, this aim to help player have different stash/vault for different characters so that they don't need to organize their own.

Media

Requirements

I have read the guidelines and documentation relevant to this PR.
I have added media to this PR or it does not require an ingame showcase.
I can confirm this PR contains either no AI-generated content, or AI-generated content that meets our guidelines.

How to test

Breaking changes

Changelog

🆑

add: Added safety deposit box for personal keepings

Co-authored-by: Jaeger <80431951+Kilmented@users.noreply.github.com> Co-authored-by: starch <starchpersonal@gmail.com>

github-actions · 2026-08-27T23:48:50Z

RSI Diff Bot; head commit 4254b82 merging into 1a04c8f
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_WF/Objects/Economy/depositboxlarge.rsi

State	Old	New	Status
icon-open			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_WF/Objects/Economy/depositboxmedium.rsi

State	Old	New	Status
icon-open			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_WF/Objects/Economy/depositboxsmall.rsi

State	Old	New	Status
icon-open			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_WF/Structures/Machines/atm/depositatm.rsi

State	Old	New	Status
icon			Added
printing			Added
unshaded			Added

Edit: diff updated after 4254b82

…Heavy variant

Kilmented · 2026-09-05T02:40:35Z

Wayfarer to Wicce's Den to Frontier to Monolith
GG WP

DDrakov · 2026-09-05T02:49:20Z

Wayfarer to Wicce's Den to Frontier to Monolith GG WP

Ironically Monolith got it from Frontier so it'll become longer!

TheRealMasterChief117 · 2026-09-05T11:39:45Z

+      tags:
+      - SavingContraband


You need to make a new system. Contraband items count as save contraband. But if you have a permit, that status is kept, even though it isn't removed on same.

Yeah just realized that thanks for pointing out

TheRealMasterChief117 · 2026-09-06T12:59:17Z

+                if (HasComp<SavingContrabandComponent>(item) && !HasComp<ContrabandPermitItemComponent>(item))
+                    continue; // Triad : If item have contraband component and not contraband permit component then ship.


You need to check who actually owns the permit and if the owner of the deposit actually matches with the permit owner. I'd recommend just making it so you can't put save contraband items into the box with a seperate component, like the limited storage whitelist. Then you just cancel the try insert event if it is not permitted and the permit owner (if any) isn't equal to the storage user

TheRealMasterChief117 · 2026-09-11T01:01:20Z

+    /// <summary>
+    /// The location of this item within the storage container's grid.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]


Suggested change

[DataField, ViewVariables(VVAccess.ReadWrite)]

[DataField]

DataField already implies VVAccess.ReadWrite

TheRealMasterChief117 · 2026-09-11T01:02:51Z

+                    if (TryComp<ItemStorageLocationComponent>(itemEntity, out var locationComp))
+                    {
+                        if (_storage.InsertAt(storage, insertEnt, locationComp.ItemLocation, out _, playSound: false))
+                        {
+                            continue;
+                        }
+                    }


Suggested change

if (TryComp<ItemStorageLocationComponent>(itemEntity, out var locationComp))

{

if (_storage.InsertAt(storage, insertEnt, locationComp.ItemLocation, out _, playSound: false))

{

continue;

}

}

if (TryComp<ItemStorageLocationComponent>(itemEntity, out var locationComp)

&& _storage.InsertAt(storage, insertEnt, locationComp.ItemLocation, out _, playSound: false))

{

continue;

}

This should be cleaner

TheRealMasterChief117 · 2026-09-11T01:03:42Z

+                if (!TryComp<ItemStorageLocationComponent>(item, out var locationComp))
+                {
+                    locationComp = EnsureComp<ItemStorageLocationComponent>(item);
+                }


Suggested change

if (!TryComp<ItemStorageLocationComponent>(item, out var locationComp))

{

locationComp = EnsureComp<ItemStorageLocationComponent>(item);

}

var locationComp = EnsureComp<ItemStorageLocationComponent>(item);

EnsureComp ensures a component exists and gets it, if not it returns the component and adds it
So this try comp check is useless

This reverts commit 6c8ea06.

DDrakov · 2026-09-13T01:55:32Z

Just need to finish the box sprite, everything should be ready for review

TheRealMasterChief117 · 2026-09-13T17:57:24Z

   CLIENT: 2.261s [ERRO] Guidebook: Tag: GuideEntityEmbed 
 Arguments: Entity="SafetyDepositBoxSmall" /> Exception: 
  Stack Trace:
     at Robust.UnitTesting.Pool.TestPair`2.ReportErrorLogs() in /home/runner/work/Triad_Sector/Triad_Sector/RobustToolbox/Robust.UnitTesting/Pool/TestPair.Recycle.cs:line 28
   at Robust.UnitTesting.Pool.TestPair`2.OnCleanDispose() in /home/runner/work/Triad_Sector/Triad_Sector/RobustToolbox/Robust.UnitTesting/Pool/TestPair.Recycle.cs:line 99
   at Robust.UnitTesting.Pool.TestPair`2.OnCleanDispose() in /home/runner/work/Triad_Sector/Triad_Sector/RobustToolbox/Robust.UnitTesting/Pool/TestPair.Recycle.cs:line 107
   at Robust.UnitTesting.Pool.TestPair`2.CleanReturnAsync() in /home/runner/work/Triad_Sector/Triad_Sector/RobustToolbox/Robust.UnitTesting/Pool/TestPair.Recycle.cs:line 125
   at Content.IntegrationTests.Tests.Guidebook.GuideEntryPrototypeTests.ValidatePrototypeContents() in /home/runner/work/Triad_Sector/Triad_Sector/Content.IntegrationTests/Tests/Guidebook/GuideEntryPrototypeTests.cs:line 40

TheRealMasterChief117 · 2026-09-13T18:53:00Z

Did some changes:

Attempted to fix the storage arbitrage test fail
Contraband permit items are now initalized on deposit box init, so the permit item actually gets the correct mind and owner UIDs.
Code cleanup for your contraband permit system that you made in the safety deposit box so there's no copypaste, and made it check mind UIDs rather than the actual player's
Moved the safety deposit box YML files to our namespace. We don't need another folder with only one thing inside of it

TheRealMasterChief117 · 2026-09-13T20:08:24Z

Works (trying to save permit with another character)

DDrakov · 2026-09-13T23:36:13Z

I'll finish up the sprites and some personal tweak then probably ready for quick review again

Welcome to My Tarkov Stash (#4424)

553a72c

Co-authored-by: Jaeger <80431951+Kilmented@users.noreply.github.com> Co-authored-by: starch <starchpersonal@gmail.com>

github-actions Bot added S: Untriaged size/L C# YML Sprites FTL Changes to localization files Docs Improvements or additions to documentation/guidebooks UI labels Aug 27, 2026

DDrakov added 4 commits August 28, 2026 18:20

Changing the tags

a3143c7

Picky edit

29710a5

Merge branch 'main' into feat/tarkov-stash

93e8b56

MIGRATION

b18f867

github-actions Bot added DB Migration size/XL and removed size/L labels Aug 30, 2026

DDrakov added 7 commits August 30, 2026 11:24

[FIX] Data is now unhardcoded and added one more deposit box that is …

3b5c537

…Heavy variant

[ADD] Triad Comment

935d0b6

[ADD] implement new UI to the deposit

4320280

[FIX] improved UI design

fe2ee77

Fixed the UI again

292519d

[FIX] updated more UI to look generic like the others

425f3c3

Added some comment

9df84fd

TheRealMasterChief117 reviewed Sep 5, 2026

View reviewed changes

Fix contrband save

31d8e84

TheRealMasterChief117 reviewed Sep 6, 2026

View reviewed changes

Trying to store rotation

c6dbc51

Remove redundancy

8e1c895

TheRealMasterChief117 reviewed Sep 11, 2026

View reviewed changes

DDrakov added 6 commits September 11, 2026 19:20

Added SHI company

6c8ea06

Revert "Added SHI company"

7b6235d

This reverts commit 6c8ea06.

Add remove function and some fixes

c9e9bb5

Merge branch 'main' into feat/tarkov-stash

8e8f74f

Addressed changes

3b60166

Max Limit

be2e05a

DDrakov changed the title ~~DRAFT : Rework Player Stash~~ Rework Player Stash Sep 12, 2026

DDrakov added 2 commits September 13, 2026 08:40

Spew out error if there's an illegal item

836c540

Reset delay component

325b413

DDrakov marked this pull request as ready for review September 13, 2026 01:55

Fixed typo

fe04d67

DDrakov changed the title ~~Rework Player Stash~~ Player Personal Stash Sep 13, 2026

TheRealMasterChief117 reviewed Sep 13, 2026

View reviewed changes

Comment thread Resources/ServerInfo/_NF/Guidebook/SafetyDepositBox.xml Outdated

TheRealMasterChief117 added 2 commits September 13, 2026 13:59

fix test fail

2b6a5ec

maybe fix arbirage

0a28887

TheRealMasterChief117 added 6 commits September 13, 2026 15:07

un

4708bd9

How was this even removed

1ab124d

Update safety_deposit_box.yml

8144cda

Change the order to fix it

7ec0c01

Update SafetyDepositBoxSystem.cs

5f6e2e5

aam

4254b82

		if (HasComp<SavingContrabandComponent>(item) && !HasComp<ContrabandPermitItemComponent>(item))
		continue; // Triad : If item have contraband component and not contraband permit component then ship.

Conversation

DDrakov commented Aug 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

About the PR

Technicalilty

Why / Balance

Media

Requirements

How to test

Breaking changes

Uh oh!

github-actions Bot commented Aug 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Kilmented commented Sep 5, 2026

Uh oh!

DDrakov commented Sep 5, 2026

Uh oh!

TheRealMasterChief117 Sep 5, 2026

Choose a reason for hiding this comment

Uh oh!

DDrakov Sep 5, 2026

Choose a reason for hiding this comment

Uh oh!

TheRealMasterChief117 Sep 6, 2026

Choose a reason for hiding this comment

Uh oh!

TheRealMasterChief117 Sep 11, 2026

Choose a reason for hiding this comment

Uh oh!

TheRealMasterChief117 Sep 11, 2026

Choose a reason for hiding this comment

Uh oh!

TheRealMasterChief117 Sep 11, 2026

Choose a reason for hiding this comment

Uh oh!

DDrakov commented Sep 13, 2026

Uh oh!

TheRealMasterChief117 commented Sep 13, 2026

Uh oh!

Uh oh!

TheRealMasterChief117 commented Sep 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

TheRealMasterChief117 commented Sep 13, 2026

Uh oh!

DDrakov commented Sep 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

DDrakov commented Aug 27, 2026 •

edited

Loading

github-actions Bot commented Aug 27, 2026 •

edited

Loading

TheRealMasterChief117 commented Sep 13, 2026 •

edited

Loading