Ed
9d6e023bd0
Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2
...
# Conflicts:
# Content.Client/Administration/AdminNameOverlay.cs
# Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
# Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
# Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
# Content.Client/SubFloor/SubFloorHideSystem.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/Cloning/CloningSystem.cs
# Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs
# Content.Server/GameTicking/Rules/ParadoxCloneRuleSystem.cs
# Content.Server/Roles/ParadoxCloneRoleComponent.cs
# Content.Shared.Database/LogType.cs
# Content.Shared/CCVar/CCVars.Interface.cs
# Content.Shared/Cloning/CloningEvents.cs
# Content.Shared/Cloning/CloningSettingsPrototype.cs
# Content.Shared/Humanoid/NamingSystem.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Light/Components/SunShadowCycleComponent.cs
# Content.Shared/Storage/StorageComponent.cs
# Resources/Changelog/Admin.yml
# Resources/Changelog/Changelog.yml
# Resources/Credits/GitHub.txt
# Resources/Locale/en-US/paradox-clone/role.ftl
# Resources/Maps/bagel.yml
# Resources/Maps/loop.yml
# Resources/Prototypes/Chemistry/mixing_types.yml
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Entities/Effects/puddle.yml
# Resources/Prototypes/Entities/Mobs/Player/clone.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
# Resources/Prototypes/Entities/Objects/Devices/pda.yml
# Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/Prototypes/Objectives/paradoxClone.yml
# Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
# Resources/Textures/Clothing/Eyes/Glasses/jensen.rsi/equipped-EYES-arachnid.png
2025-03-31 12:41:37 +03:00
metalgearsloth
0c98ad8b38
Fix 1x1 storage windows ( #35985 )
2025-03-29 19:57:28 +01:00
Ed
07e0606ecf
Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream
...
# Conflicts:
# Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
# Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
2025-02-23 23:07:55 +03:00
metalgearsloth
cf38814515
General storage fixes ( #34845 )
...
* Fix storage stars
* Fix some more storage bugs
- Fix positions not saving.
- Fix the 1-tick delay between parent and child storage UIs opening / closing.
- Fix BackButton being visible sometimes when it shouldn't be.
* milon is a furry
2025-02-17 19:24:34 +11:00
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
Errant
d6a9ddd9e0
Revert "Storage sidebar fix ( #34680 )"
...
This reverts commit 3e091c4dfa
2025-02-05 14:12:52 +01:00
metalgearsloth
3e091c4dfa
Storage sidebar fix ( #34680 )
2025-01-28 10:09:52 +11: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
Nemanja
868b6c202d
fix orphaned storage grid pieces getting stuck to the cursor ( #27960 )
...
* fix orphaned storage grid pieces getting stuck to the cursor
* instead of denying it, update it smartly
2024-05-17 00:51:28 -07:00
deltanedas
6863a7cc26
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 >
2024-03-28 17:31:47 +11: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
metalgearsloth
b22c9aa5e2
Fix storagecomp serialization ( #23780 )
...
* Fix storagecomp serialization
* Fix state
2024-01-09 03:47:51 -07: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
736300d505
keybinds for opening bag/belt & context logic for opening storage window ( #22238 )
...
* keybinds for opening bag/belt & context logic for opening storage window
* no error por favor
2023-12-08 12:43:37 -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
TemporalOroboros
f98322ad5d
T shaped pickaxe and grid UI fix ( #22197 )
2023-12-06 19:52:57 -05: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
