Commit Graph

54 Commits

Author SHA1 Message Date
Michael Shaw 94dcefd803
Revert `Storage UI V2` (#2950)
* Revert `Storage UI V2`

Storage UI v2 has been a buggy and infuriating mess to use.
This idea needs additional polish before it is ready. I think we should
go ahead and remove it until that point, to alleviate further
aggrevation.

Signed-off-by: Michael Shaw <michaelsshaw44@gmail.com>

* storage: remove unused cvars

---------

Signed-off-by: Michael Shaw <michaelsshaw44@gmail.com>
2025-02-10 22:55:39 +00:00
metalgearsloth a525587dcb Storage sidebar fix (#34680) 2025-01-28 05:01:41 +00:00
metalgearsloth 767b43fd26 Storage UI V2 (#33045) 2025-01-28 04:52:58 +00:00
slarticodefast 1cb39e3f6b Fix admins not being able to health scan slimes (#33884) 2024-12-21 10:16:33 +00:00
SlamBamActionman a6604276b0 Remove drag & drop dropping items from containers (#32706)
* Initial commit

* Update based on maintainer discussion

* Forgot to remove this woops
2024-12-07 16:31:52 +00:00
deltanedas 91dbd3084a
early merge of fix item locations (#1996)
this was just copypasted without any context wasn't it

Co-authored-by: Callmore <22885888+Callmore@users.noreply.github.com>
2024-10-12 13:44:34 +00:00
metalgearsloth 9c313b57b4 Fix storage area pickup sound playing multiple times (#32397) 2024-10-02 12:06:37 +01:00
Dvir be03b28240 Allow AreaInsert pickups for one item (#32153)
Update SharedStorageSystem.cs
2024-10-02 11:33:58 +01:00
ShadowCommander bb1b50866c Move PlaceableSurfaceComponent usages to PlaceableSurfaceSystem (#28384)
* Move placeable check to PlaceableSurfaceSystem

This check stops entities from being inserted into a storage entity
when it has a PlaceableSurfaceComponent.

The entity is instead placed on top of the entity like a table.

* Move SetPlaceable to PlaceableSurfaceSystem

* Update to transform system and consolidate code

* Fix interaction with storage that has a placeable component

* deadlock

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-09-22 02:45:06 +01:00
slarticodefast 8ad57fff88 Make storage implant closable using the action again (#31381) 2024-08-27 00:43:25 +01:00
ShadowCommander a6e61f9f52 Add a component that inserts the held item when no interaction happens on the stored item (#29823)
* Insert when held item has no interaction with stored item

* Decouple inserting on failure

* Add component that stores the used entity when no interaction happened

* Add prediction
2024-08-11 14:50:15 +01:00
Plykiya fcff7ab1c2 Add BreakOnDropItem, update do afters, remove unnecessary declarations (#30361)
* Add BreakOnDropItem, update do afters, remove unnecessary declarations

* bola

* Changed my mind about the nuke

* gennies too

* Make the comments more clear.

* Sorry for the trailing commas

* Revert "Sorry for the trailing commas"

This reverts commit e60fd9a30977393df3344948e6d5c0ce035723cd.

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-08-09 19:03:54 +01:00
Leon Friedrich f93bc2853a Add more storage admin logs & fix some interaction validation (#30725) 2024-08-09 18:58:36 +01:00
slarticodefast 54fbf9c0e5 replace all uses of TryGetContainingContainer with non-obsolete overload (#30583)
* replace all uses of TryGetContainerContainer with non-obsolete overload

* rerun
2024-08-09 18:24:46 +01:00
Plykiya cd2fd77dbd Quieter bag sounds (#30225)
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-08-09 17:53:47 +01:00
Crude Oil b8af5b195c Add ability to show stack visuals on closed containers (#29309)
* add ability to show stack visuals on closed containers

* remove container stack visuals logic from sharedstoragesystem

* improve comments a bit

* move logic for open/closed containers into itemcountersystem

* move behavior to storage component

* remove unused import

* remove old comment

* fix comments

* fix wrong property name

* Update Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs

* Rename variable for clarity

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2024-08-09 17:52:22 +01:00
DrSmugleaf 914f397035
Fix storages bugging out if an open storage has its component removed (#29485)
* Fix storages bugging out if an open storage has its component removed

* Fix error on close
2024-07-25 01:50:40 +02:00
Tayrtahn d5fccc9935
Add logging to SharedStorageSystem prototype indexing failure (#29273) 2024-07-25 00:39:28 +02:00
Leon Friedrich 7d903800a8
Add closing storage UIs to StorageInteractionTest (#28633) 2024-06-08 20:23:33 +02:00
Plykiya b2931f9a33
Replace obsolete EntityWhitelist IsValid usages (#28465)
* Replace obsolete whitelist is valid with whitelist system

* Consistency

* Fix logic

* Bork

* I figured out how to get whitelists on the client lol

* test fail

* woops

* HELP ME FUNCTIONS

* Fix errors

* simplify

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-06-06 21:44:41 +02:00
Nemanja bacd52c991
Decouple interactions from hands, cleanup old events, add new fears (#28393)
* ok basic shit

* second part

* pretend it isn't real it can't hurt you.

* 👁️ 👁️

* shadowcommander review
2024-06-01 18:00:07 +02:00
DrSmugleaf 8833e0b046
Fix not networking whitelist and blacklist in storage component (#28238) 2024-06-01 16:57:32 +02:00
Leon Friedrich 768f48bd4f
Improve InteractionSystem range & BUI checks (#27999)
* Improve InteractionSystem range & BUI checks

* Ghost fixes

* AAA

* Fix test

* fix nullable

* revert to broadcast event

* Fixes for eengine PR

* Ah buckle code

* )
2024-06-01 16:56:23 +02:00
DrSmugleaf 471726b6e5
Fix whatever the fuck is going on in storage system slightly (#28236)
* Fix whatever the fuck is going on in storage system slightly

* Fix inverted check

* h

* Add silent bool

* Silent
2024-06-01 16:55:46 +02:00
Leon Friedrich 74308b008f
Use non-generic `TryComp()` for metadata & transform (#28133) 2024-06-01 16:53:51 +02:00
Kara b6a31003d2
Open slot storage keybind can now also close the UI (#27962) 2024-05-18 13:58:53 +02:00
ShadowCommander 1548f9b9ad
Fix collection modified error when locking storage (#27913) 2024-05-18 13:52:29 +02:00
Sphiral 0e8f05c61e
Make storage UI close upon being locked (#27810)
* make storage close on lock

* formatting and comments

* Update Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs

Co-authored-by: ShadowCommander <shadowjjt@gmail.com>

* Apply suggestions from code review

Co-authored-by: ShadowCommander <shadowjjt@gmail.com>

* Swap to foreach instead of for

Co-authored-by: Kara <lunarautomaton6@gmail.com>

---------

Co-authored-by: ShadowCommander <shadowjjt@gmail.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2024-05-18 13:35:40 +02:00
Tayrtahn 6269c14392
Make UseDelay SetLength do EnsureComp (#27601)
Make UseDelay.SetLength do EnsureComp
2024-05-07 04:18:40 +02:00
metalgearsloth 1d63b4cfcb
Content update for UI prediction (#27214)
* Content update for UI refactor

* Big update

* Sharing

* Remaining content updates

* First big update

* Prototype updates

* AUGH

* Fix UI comp ref

* Cleanup

- Fix predicted message, fix item slots, fix interaction range check.

* Fix regressions

* Make this predictive

idk why it wasn't.

* Fix slime merge

* Merge conflict

* Fix merge

(cherry picked from commit 5896e6875266b22c565009b5d45f60ceb981d90a)
2024-05-03 00:15:32 +02:00
Tayrtahn 07bfdf787a
Expand UseDelay to support multiple delays per entity; fix bible healing and bag pickup (#27234)
* Upgraded UseDelay to support multiple delays per entity

* Implement secondary delay for bibles.
Also some improvements to make it work nicely.

* Documentation is good

* Reserve the previous change; now Storage uses the special ID and Bible uses the default.

* .0

* Added VV support to UseDelayInfo

* Serialize better

* No register, just setlength

(cherry picked from commit b292905216948e0c85b04e8ef65a5291dd868eee)
2024-05-03 00:11:26 +02:00
Plykiya 1b3a4007b1
Fix for inventory and belt not opening (#27179)
Co-authored-by: Plykiya <plykiya@protonmail.com>
(cherry picked from commit 6ad039d0f9a13a3bcedf400b3b89f2eb186631ec)
2024-04-21 23:36:43 +02:00
DrSmugleaf f0f410348c
Move storage binds and slot click handling to shared (#27135)
(cherry picked from commit 3c6722bd6fca55cfdee8dced11379641b443d542)
2024-04-21 23:31:37 +02:00
metalgearsloth 8bd58f68b5
More storage tweaks (#25970)
- Fix some prediction stuff.
- Fix some jank.
- UseDelay.
- Cap.

(cherry picked from commit b2b1926eccbae918c8d9702cfba40e54d1f4d870)
2024-04-21 23:20:53 +02:00
DrSmugleaf 5acb97a858
Fix storage fill giving no reason for failing (#27122)
(cherry picked from commit 45df595c1513bed2c31209101afc7574ded29cfe)
2024-04-21 23:18:19 +02:00
deltanedas 76199f9ff0
biggest gridinv update OF ALL TIME (#25834)
* add SaveItemLocation keybind

* make item direction public to avoid having to change between Angle for no reason

* add item location saving

* show

* Added a better save keybind, made it draw saved positions, and trying to save in a position it has already been saved in removes that position.

* w

* code style

* Make taken spots appear blue

* style

* !

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: notquitehadouken <tripwiregamer@gmail.com>
Co-authored-by: I.K <45953835+notquitehadouken@users.noreply.github.com>
(cherry picked from commit 6863a7cc26f815ec9089003e8735777cea927d0f)
2024-04-07 14:08:49 +02:00
nikthechampiongr ad5628777b
Simplify DoAfterArgs behavior for movement and distance checks (#25226)
* Merge BreakOnWeightlessMove and BreakOnMove. Provide different theshold for weightless movement.

* Adjust WeightlessMovementThresholds. Put a thing I forgot to put in the doafterargs.

* Make DoAfterArgs only use OnMove to determine whether to check for
movement and MoveThreshold to determine the threshold regardless of
weightlessness. Gave DistanceThreshold a default value which will always
be checked now.

* Fix issue introduced by merge.

* Use interaction system for determining whether a distance is within range

* Fix incorrect doafter args introduced by previous merge.
Forgor to commit these.

* Exorcise ghost.

The execution system should have been deleted when I merged previously.
For a reason I cannot comprehend it came back, but only the execution
system.

* Exorcise ghost Pt. 2

* Allow for movement check to be overriden in zero g and adjust doafter args where needed.

You can now override checking for movement in zero g with the BreakOnWeightlessMove bool. By default it will check.
The following doafters were made to ignore the movement check in zero g:
- Healing yourself with healing items,
- Removing embedded projectiles,
- Using tools like welders and crowbars

* Adjust distance for cuffing/uncuffing to work. Make injections not break on weightless movement.

* Fix evil incorrect and uneeded comments

(cherry picked from commit 362d56981fd7654f6ebec36f16cc8fabdd04b6a7)
2024-03-24 00:03:28 +01:00
SlamBamActionman 285804d4dd
Fix recycled containers deleting items inside them (#26045)
* Removes items from containers in reclaimers

* Made it into an event instead

* Sloth review comment

* Fix indentation and rename field

(cherry picked from commit d7484ae9f57477a5ec5c575e3077aa94c0564db6)
2024-03-24 00:02:10 +01:00
Krunklehorn 1fb8bad18f
Weight based AreaInsert and Dumpable delay, a janitor qol tweak (#24899)
Weight based delay, retuned average, fixed comments

(cherry picked from commit c775410370a650aa51a1feda99f45cefda0c811e)
2024-03-07 01:17:27 +01:00
Debug d8df4327ec
Fix PseudoItems (#821)
* Fix PseudoItem

* Add pain

* Cancel attack events
2024-02-12 21:52:49 +01:00
metalgearsloth 62c2728e38
Fix storage state (#23852)
slughands

(cherry picked from commit 24f8da8f0ce01b3523434e954d4d71e8193e75b5)
2024-01-26 22:22:41 +01:00
metalgearsloth 404ac576b8
Fix storagecomp serialization (#23780)
* Fix storagecomp serialization

* Fix state

(cherry picked from commit b22c9aa5e265994f87c9a3f41a95e0aef611b61d)
2024-01-26 22:17:53 +01:00
Nemanja 57d762185c
Allow storage to specify a default orientation for stored items. (#23594)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit a448e5fa567e8e781b9b3093376312cc9f654533)
2024-01-26 21:47:41 +01:00
Debug e644725860
Fix missing imports 2024-01-22 18:55:26 +01:00
Leon Friedrich 46f411ef85
Cache ItemSizePrototype in StorageSystem (#22611)
(cherry picked from commit 364ecae94f66dc0a4e87760def5203cca4745cee)
2024-01-22 18:44:26 +01:00
Debug 18f0af1f68
Implement gridinv, proper (#703)
* Implement gridinv, 1500 squashed commits :elp:

* Me when

* Linter errors

* Fix katana belts
2024-01-21 19:58:28 +01:00
Debug 985b2f96f9
Prevent pseudoitems from being transferred between bags (#553)
* Update PseudoItemSystem.cs

* Rider full cleanup

* Also abort in sharedstorage

* Make the comp shared

* Why drop the bags?
2023-12-29 20:38:03 +01:00
Leon Friedrich adee2a7465 Fix various errors/exceptions (#22841)
* Fix entity storage localization

* Fix HumanoidAppearanceComponent resolve

* Fix null reference exceptions

* Fix duplicate key error

* Fix artifact error spam

* actually maybe this is what its meant to do

* Fix entities playing sounds on deletion
2023-12-22 23:25:06 +01:00
deltanedas 40ec5595be open bag in combat mode (#22512)
* open bag in combat mode

* !!!!!

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-16 20:23:25 +01:00
metalgearsloth b1ee2d48ff Unrevert audio (#21330)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-12-02 20:16:36 +01:00