juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,092 Commits 57 Branches 0 Tags
c6cc4daa3fe5dde7ee8058ddea3554157e15b272
Commit Graph

184 Commits

Author SHA1 Message Date
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
lzk
b8806759fd make opening storage on verb or on interact not silent (#35413) 
* make storage make sound

* remove

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com>

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com>
 2025-02-22 18:01:33 -08:00
Kyle Tyo
c8dce26dbb Replace obsolete FromMap calls with ToCoordinates (#35304) 2025-02-20 23:03:42 +11: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
SpaceManiac
4122310735 Fix 38 non-obsolete warnings (#33794) 2025-02-11 20:59:50 +11: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
4173d96d83 Merge remote-tracking branch 'upstream/staging' into ed-22-12-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.IntegrationTests/Tests/ResearchTest.cs
#	Resources/Prototypes/Entities/Objects/Decoration/flora.yml
#	Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml
#	Resources/Prototypes/Maps/Pools/default.yml
 2024-12-22 15:48:30 +03:00
slarticodefast
908e476643 Fix admins not being able to health scan slimes (#33884) 2024-12-18 01:12:35 +01:00
godisdeadLOL
06071a5d8a Secret stash wrench anchoring fix (#31779) 
* secret stash wrench fix

* fix

* cleanup

---------

Co-authored-by: YourUsername <you@example.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-12-14 00:00:45 +01:00
Ed
cd736e4fd4 Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Maps/oasis.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/audio.yml
 2024-12-11 14:49:02 +03:00
keronshb
82528dce37 Adds Store on Collide and Wand of the Locker (#33710) 
* Adds wand of locker and locker projectile

* Adds IsOpen method to check if storage is open

* Adds store on collide

* Adds Store On Collide to Wizard Locker

* Adds Lock API

* Adds locking support

* Adds resist override and custom visual layers

* Fixes decursed states, adds comment for a future visualizer

* adds locker wand visuals and descriptions

* shrinks locker radius, moves TODO for throw support

* Adds whitelist and moves storage and lock logic into their own methods

* Adds support to disable store on collide after the first open. Fixes prediction issues with disabling.

* Adds wand of locker to the grimoire

* Adds wizard access prototype

* Adds Wizard to universal access

* Moves Lock on collide to on collide method

* Comments

* Changes layer order

* Fixes prediction issues when locking.

* Adds Wiz access to universal ID
 2024-12-04 17:49:54 +01:00
Ed
677e5194d6 Merge remote-tracking branch 'upstream/master' into ed-20-11-2024-upstream-sync 
# Conflicts:
#	Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
#	Content.Server/Traits/TraitSystem.cs
#	Content.Shared/CCVar/CCVars.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Resources/Maps/box.yml
#	Resources/Maps/core.yml
 2024-11-23 01:48:24 +03:00
SlamBamActionman
89392e2424 Remove drag & drop dropping items from containers (#32706) 
* Initial commit

* Update based on maintainer discussion

* Forgot to remove this woops
 2024-11-20 12:00:38 +11:00
Ed
ae3cbd6092 Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream 
# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Temperature/Systems/TemperatureSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
 2024-10-29 11:16:56 +03:00
beck-thompson
15290486dc Fix: Plushies no longer delete items when recycled (#32838) 
fix
 2024-10-18 14:58:07 +02:00
Callmore
7039f87bd4 Fix saving prefered quick store item locations (#32480) 
this was just copypasted without any context wasn't it
 2024-10-16 23:00:52 -05:00
Ed
dc47bb2283 Merge remote-tracking branch 'upstream/stable' into ed-15-10-2024-upstream 
# Conflicts:
#	Content.Server/Station/Systems/StationSpawningSystem.cs
 2024-10-15 15:25:44 +03:00
beck-thompson
327466a6e2 Plushies can now have pAIs stuffed into them (v2)! (#30805) 
* First commit

* I forgot silly me

* Actually added comments

* spellin

* fixes

* more blacklists

* Minor fixes

* Speech Verb also changes now

* Simple name stuff

* Other fixes

* remove one line of whitespace

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-10-09 20:01:32 +02:00
Ed
1df3ed177b Merge remote-tracking branch 'upstream/master' into ed-27-09-2024-upstream 
# Conflicts:
#	Content.Server/Explosion/EntitySystems/TriggerSystem.cs
 2024-09-27 10:22:05 +03:00
metalgearsloth
f46f5e2835 Fix storage area pickup sound playing multiple times (#32397) 2024-09-27 17:09:17 +10:00
Dvir
50395e25cf Allow AreaInsert pickups for one item (#32153) 
Update SharedStorageSystem.cs
 2024-09-24 16:23:48 +02:00
ShadowCommander
3fc9f96b75 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-19 17:42:49 +10:00
Ed
ca656b3c10 Merge remote-tracking branch 'upstream/master' into ed-29-08-2024 
# Conflicts:
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Maps/reach.yml
 2024-08-29 14:32:09 +03:00
slarticodefast
8f4ee7ac96 Make storage implant closable using the action again (#31381) 2024-08-24 11:31:02 +10:00
Ed
d9336781f1 Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream 
# Conflicts:
#	Content.Shared/Inventory/InventorySystem.Equip.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
 2024-08-12 14:40:15 +03:00
ShadowCommander
2f77d0d4f3 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 12:29:44 +10:00
beck-thompson
ad18c6e9a5 Secret stash refractor (#29396) 
* First commit

* Will do this in another PR!

* maybe?

* Moved stuff to ToolOpenableSystem because its smarter and cooler
 2024-08-09 09:51:58 +10:00
Plykiya
190ceda02e 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-08 13:39:46 +02:00
Ed
97939f6e3e Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream 
# Conflicts:
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
 2024-08-08 12:29:20 +03:00
Leon Friedrich
b4dfeec696 Add more storage admin logs & fix some interaction validation (#30725) 2024-08-07 10:15:41 +10:00
Ed
dd580c68c9 Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Resources/Prototypes/Accents/word_replacements.yml
 2024-08-05 15:28:42 +03:00
slarticodefast
bb2981400c replace all uses of TryGetContainingContainer with non-obsolete overload (#30583) 
* replace all uses of TryGetContainerContainer with non-obsolete overload

* rerun
 2024-08-04 15:38:53 +10:00
Cojoke
247222beab Remove Walking out of Containers while You can't Walk (#30391) 
* Require Standing to Exit Containers

* whoops, forgot a not

* You can't walk out if cuffed

* GUAH(requested stuff)

* bwomp(tiny cleanup)
 2024-07-30 09:53:44 -04:00
Ed
2367085160 Merge remote-tracking branch 'upstream/master' into ed-23-07-2024-upstream 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Client/Clothing/ClientClothingSystem.cs
#	Content.Client/Hands/Systems/HandsSystem.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Hands/Components/HandsComponent.cs
#	Content.Shared/Inventory/InventoryComponent.cs
#	Content.Shared/Storage/StorageComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Entities/Mobs/Player/human.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/saltern.yml
 2024-07-23 12:24:42 +03:00
Plykiya
edd9bb6e74 Quieter bag sounds (#30225) 
Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-22 12:54:15 +03:00
Crude Oil
6c6ae35cf8 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-07-20 22:49:48 -07:00
Ed
028c1ee478 Merge remote-tracking branch 'upstream/master' into ed-15-07-2024-upstream 2024-07-15 12:58:23 +03:00
ShadowCommander
bdf7293cfb Clean itemmapper (#29983) 
* File scoped namespace

* Format file

* Fix param name in doc comment

* Reflow doc comment

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-07-14 13:27:39 +10:00
ShadowCommander
162348e02d Change whitelist to pass when null (#29981) 2024-07-13 13:43:07 +10:00
Ed
dbdb81381b Merge remote-tracking branch 'upstream/master' into ed-30-06-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/lobbyscreens.yml
 2024-06-30 11:18:30 +03:00
ShadowCommander
afe9f3ae85 Fix ItemMapper whitelist mispredict when inserting or removing items (#29461) 
* Fix ItemMapper whitelist mispredict when inserting or removing items

Makes the ItemMapper MapLayerData available on client so that the client
can predict whether an inserted/removed item changes the visibility of
a sprite layer.

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-06-30 14:34:06 +10:00
DrSmugleaf
58efe4fdd1 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-06-27 00:11:51 +10:00
Ed
3a910a7f7f Merge remote-tracking branch 'upstream/master' into ed-21-06-2024-upstream-sync 
# Conflicts:
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/train.yml
 2024-06-21 18:30:31 +03:00
Tayrtahn
0b3459268a Add logging to SharedStorageSystem prototype indexing failure (#29273) 2024-06-21 10:16:43 +10:00
Ed
8ff09f552b Merge remote-tracking branch 'upstream/master' into ed-13-06-2024-upstream2 
# Conflicts:
#	Content.Client/Guidebook/GuidebookSystem.cs
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Shared/Guidebook/GuideEntry.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Maps/arenas.yml
#	Resources/Prototypes/Maps/atlas.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/debug.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/reach.yml
#	Resources/Prototypes/Maps/saltern.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/lobbyscreens.yml
 2024-06-13 12:35:00 +03:00