]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Grid Inventory (#21931)
authorNemanja <98561806+EmoGarbage404@users.noreply.github.com>
Mon, 4 Dec 2023 23:04:39 +0000 (18:04 -0500)
committerGitHub <noreply@github.com>
Mon, 4 Dec 2023 23:04:39 +0000 (16:04 -0700)
commitcc8984d0962175d7d4d6a851ef6449c9ec89c986
treeae3b233506ad92aa29f2807bd552815c26fb11b2
parent4221ed2d4b9722b01fcb3984945684bfaaef70ba
Grid Inventory (#21931)

* Grid Inventory

* oh boy we keep cracking on

* auto insertion is kinda working? gross, too!

* pieces and proper layouts

* fix the sprites

* mousing over grid pieces... finally

* dragging deez nuts all over the screen

* eek!

* dragging is 90% less horrendous

* auto-rotating

* flatten

* Rotation at last

* fix rotation and change keybind for removing items.

* rebinding and keybinding

* wow! look at that! configurable with a button! cool!

* dragging is a bit cooler, eh?

* hover insert, my beloved

* add some grids for storage, fix 1x1 storages, fix multiple inputs at once

* el navigation

* oh yeah some stuff i forgor

* more fixes and QOL stuff

* the griddening

* the last of it (yippee)

* sloth review :)
99 files changed:
Content.Client/Input/ContentContexts.cs
Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
Content.Client/Storage/StorageBoundUserInterface.cs
Content.Client/Storage/Systems/StorageSystem.cs
Content.Client/Storage/UI/StorageUIController.cs [deleted file]
Content.Client/Storage/UI/StorageWindow.cs [deleted file]
Content.Client/UserInterface/Systems/Hotbar/HotbarUIController.cs
Content.Client/UserInterface/Systems/Hotbar/Widgets/HotbarGui.xaml
Content.Client/UserInterface/Systems/Hotbar/Widgets/HotbarGui.xaml.cs
Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs [new file with mode: 0644]
Content.Client/UserInterface/Systems/Storage/Controls/StorageContainer.cs [new file with mode: 0644]
Content.Client/UserInterface/Systems/Storage/StorageUIController.cs [new file with mode: 0644]
Content.IntegrationTests/Tests/StorageTest.cs
Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
Content.Server/Storage/EntitySystems/StorageSystem.Fill.cs
Content.Shared/CCVar/CCVars.cs
Content.Shared/ContainerHeld/ContainerHeldSystem.cs
Content.Shared/Input/ContentKeyFunctions.cs
Content.Shared/Item/ItemComponent.cs
Content.Shared/Item/ItemSizePrototype.cs
Content.Shared/Item/SharedItemSystem.cs
Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
Content.Shared/Storage/ItemStorageLocation.cs [new file with mode: 0644]
Content.Shared/Storage/StorageComponent.cs
Content.Shared/Storage/StorageHelpers.cs [new file with mode: 0644]
Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
Resources/Prototypes/Catalog/Fills/Boxes/general.yml
Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
Resources/Prototypes/Catalog/Fills/Boxes/science.yml
Resources/Prototypes/Catalog/Fills/Boxes/security.yml
Resources/Prototypes/Catalog/Fills/Items/belt.yml
Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
Resources/Prototypes/Entities/Clothing/Back/duffel.yml
Resources/Prototypes/Entities/Clothing/Back/satchel.yml
Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
Resources/Prototypes/Entities/Clothing/Belt/belts.yml
Resources/Prototypes/Entities/Clothing/Belt/quiver.yml
Resources/Prototypes/Entities/Clothing/Belt/waist_bags.yml
Resources/Prototypes/Entities/Clothing/Head/hats.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
Resources/Prototypes/Entities/Debugging/item.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml
Resources/Prototypes/Entities/Objects/Fun/candy_bucket.yml
Resources/Prototypes/Entities/Objects/Fun/crayons.yml
Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml
Resources/Prototypes/Entities/Objects/Misc/box.yml
Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
Resources/Prototypes/Entities/Objects/Misc/medalcase.yml
Resources/Prototypes/Entities/Objects/Misc/paper.yml
Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml
Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml
Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml
Resources/Prototypes/Entities/Objects/Specific/Research/rped.yml
Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
Resources/Prototypes/Entities/Objects/Tools/matches.yml
Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml
Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
Resources/Prototypes/Entities/Structures/Storage/ore_box.yml
Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
Resources/Prototypes/XenoArch/Effects/utility_effects.yml
Resources/Prototypes/item_size.yml
Resources/Textures/Interface/Default/Storage/back.png [new file with mode: 0644]
Resources/Textures/Interface/Default/Storage/exit.png [new file with mode: 0644]
Resources/Textures/Interface/Default/Storage/piece_bottom.png [new file with mode: 0644]
Resources/Textures/Interface/Default/Storage/piece_bottomLeft.png [new file with mode: 0644]
Resources/Textures/Interface/Default/Storage/piece_bottomRight.png [new file with mode: 0644]
Resources/Textures/Interface/Default/Storage/piece_center.png [new file with mode: 0644]
Resources/Textures/Interface/Default/Storage/piece_left.png [new file with mode: 0644]
Resources/Textures/Interface/Default/Storage/piece_right.png [new file with mode: 0644]
Resources/Textures/Interface/Default/Storage/piece_top.png [new file with mode: 0644]
Resources/Textures/Interface/Default/Storage/piece_topLeft.png [new file with mode: 0644]
Resources/Textures/Interface/Default/Storage/piece_topRight.png [new file with mode: 0644]
Resources/Textures/Interface/Default/Storage/sidebar_bottom.png [new file with mode: 0644]
Resources/Textures/Interface/Default/Storage/sidebar_fat.png [new file with mode: 0644]
Resources/Textures/Interface/Default/Storage/sidebar_mid.png [new file with mode: 0644]
Resources/Textures/Interface/Default/Storage/sidebar_top.png [new file with mode: 0644]
Resources/Textures/Interface/Default/Storage/tile_blocked.png [new file with mode: 0644]
Resources/Textures/Interface/Default/Storage/tile_empty.png [new file with mode: 0644]
Resources/keybinds.yml