fish-station/Content.Shared/Interaction
Vigers Ray b378fdc706 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/Stylesheets/StyleNano.cs
#	Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
#	Content.Server/Nutrition/EntitySystems/FoodSystem.cs
#	Content.Shared/Follower/FollowerSystem.cs
#	Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/PAI/SharedPAISystem.cs
#	Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
#	Resources/Locale/en-US/_strings/access/components/genpop.ftl
#	Resources/Locale/en-US/_strings/doors/components/turnstile.ftl
#	Resources/Locale/en-US/_strings/power/battery.ftl
#	Resources/Locale/en-US/_strings/store/pai-catalog.ftl
#	Resources/Locale/en-US/_strings/tools/simple-tool-usage.ftl
#	Resources/Locale/en-US/_strings/ui/controls.ftl
#	Resources/Locale/en-US/_strings/weapons/ranged/upgrades.ftl
#	Resources/Prototypes/Access/misc.yml
#	Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
#	Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Entities/Mobs/Player/dragon.yml
#	Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
#	Resources/Prototypes/Entities/Objects/Fun/toys.yml
#	Resources/Prototypes/Entities/Objects/Misc/paper.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
#	Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
#	Resources/Prototypes/Loadouts/role_loadouts.yml
#	Resources/Prototypes/Recipes/Lathes/Packs/science.yml
#	Resources/Prototypes/Research/industrial.yml
#	Resources/Prototypes/Species/vox.yml
#	Resources/Prototypes/Store/currency.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/ai_factions.yml
#	Resources/Prototypes/borg_types.yml
#	Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json
#	Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/locked.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json
#	Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png
#	Resources/Textures/Structures/Wallmounts/posters.rsi/poster4_contraband.png
#	Resources/migration.yml
2025-04-28 01:29:55 +03:00
..
Components Clumsy system refactor (#31147) 2024-11-16 00:46:01 +01:00
Events Cargo Mail System (#35429) 2025-03-07 14:51:08 +01:00
ActivateInWorldEvent.cs Decouple interactions from hands, cleanup old events, add new fears (#28393) 2024-05-31 13:26:19 -07:00
AfterInteract.cs Продвинутые борги (#247) 2024-07-27 10:23:34 +03:00
BeforeInteract.cs Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
InteractHand.cs Питомцы (#391) 2025-01-11 07:53:23 +03:00
InteractionPopupSystem.cs Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-11-15 14:52:30 +03:00
InteractUsing.cs Remove IInteractUsing (#9718) 2022-07-14 04:42:54 -07:00
ITargetedInteractEventArgs.cs Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
RangedInteract.cs Remove IAfterInteract (#9715) 2022-07-14 21:45:31 +10:00
RotateToFaceSystem.cs Partial buckling refactor (#29031) 2024-06-20 01:14:18 +10:00
SharedInteractionSystem.Blocking.cs фикс BlockMovementComponent 2024-08-22 06:51:38 +03:00
SharedInteractionSystem.cs Merge remote-tracking branch 'space-wizards/master' 2025-04-28 01:29:55 +03:00
SharedInteractionSystem.Relay.cs Update trivial components to use auto comp states (#20539) 2023-09-28 16:20:29 -07:00
SmartEquipSystem.cs Fix quick-swap stacks of items (#32560) 2024-10-02 15:27:01 +10:00