Ed
7328f3449c
Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream
...
# Conflicts:
# Content.IntegrationTests/Tests/EntityTest.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Procedural/DungeonSystem.Rooms.cs
# Content.Server/Procedural/RoomFillComponent.cs
# Content.Server/Procedural/RoomFillSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Projectiles/SharedProjectileSystem.cs
# Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/migration.yml
2025-02-16 11:58:47 +03:00
metalgearsloth
e971d6e077
Revert engine reverties ( #34968 )
2025-02-08 17:17:55 +11:00
Errant
fc80a18c35
Revert "Storage UI V2 ( #33045 )"
...
This reverts commit fd25dac720
2025-02-05 14:13:06 +01:00
metalgearsloth
fd25dac720
Storage UI V2 ( #33045 )
2025-01-27 21:29:51 +11:00
Ed
109edeb4b5
Modular weapon crafting WIP ( #611 )
...
* data initalizing
* modular assembling
* grips and blades sprites
* first prototypes
* jewerly decoration
* disassemble modular weapon
* grip start stats
* blade modifiers
* inhand sprites generation
* resprites inhand, add sickle, add attempt modify size
* auto inhand sprite parsing
* icon default parsing
* spear blade
* mace ball
* sword blade
* sharedization + autonetwork hotswipe
* wielding sprite support!
* iron long grip
* wielded sickle, fix ERROR sprite if state not added
* Update grips.yml
* wielded spear + ruby rework
* wielding damage bonus modifier
* modular size fix
* fix storedOffset rotation
* parts offset
* fix inheriting modifiers
* some bugfix and balance tweaks
* DPS Meter
* fix dividing by zero
* rebalance
* replace baseknife to modular knife. Delete ice knife spell
* sickle and mace modular replace
* modular spear & sword replacement. add wielded icons
* Update CP14DPSMeterSystem.cs
* back to serverization
* grip disassemble drop again
* clothing sprite generation code
* back slot long grips and mace
* remove jewerly slot, add more clothing states
* finish clothing states
* shovel modular
* YEEEEE
* anvil modular craft
* bugfixes
* more integration check fixes
2024-11-29 01:31:42 +03:00
Leon Friedrich
12841da9a1
Fix storage UI interactions ( #28291 )
...
* Fix storage UI interactions
* Add VV support
2024-05-26 12:11:37 +10:00
exincore
c8cc806a8f
feat(inventory): Add secondary smart-equip star ( #25696 )
...
* feat(inventory): Add secondary quick-remove star
* style: Fix end of file newline
* feat(inventory): Change secondary smart-equip star to silver star
* feat(inventory): Decrease secondary quick-equip star luminosity to better match the primary
2024-03-02 18:57:42 -05:00
Psychpsyo
a747e6dda4
Plates & Cash gridinv visuals ( #24075 )
2024-01-14 11:44:17 -05:00
Nemanja
9de4c40c29
Miscellaneous inventory tweaks ( #22371 )
...
* pt 1
* Miscellaneous gridinv UX
2023-12-12 00:49:37 -07:00
Nemanja
8112f84c33
Mark the last item stored in storage for smart-equip ( #22236 )
...
* mark the last item stored in grid inventory
* shift
2023-12-08 12:43:57 -06:00
Nemanja
b01f0b5f82
add tooltip with entity name on inventory hover ( #22203 )
2023-12-07 21:38:07 -05:00
Nemanja
c047f19fdc
Inventory sprite rotation ( #22201 )
2023-12-07 11:59:16 +11:00
Nemanja
9ca84ac3fb
Grid inventory fixes ( #22161 )
...
* Gridinv fixes
* eek
* oh yeah this too
* eek
2023-12-05 16:38:10 -07:00
Nemanja
cc8984d096
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 :)
2023-12-04 16:04:39 -07:00
