rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Shared/Interaction
History
Vigers Ray d853b875eb Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Lobby/LobbyUIController.cs
#	Content.Client/Lobby/UI/CharacterSetupGui.xaml
#	Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs
#	Content.Server/Antag/AntagSelectionSystem.cs
#	Content.Server/GameTicking/GameTicker.Lobby.cs
#	Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
#	Content.Server/Store/Systems/StoreSystem.Ui.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Resources/Maps/_Sunrise/Shuttles/abandoned_outpost.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
2024-11-19 18:34:32 +03:00
..
Components Clumsy system refactor (#31147) 2024-11-16 00:46:01 +01:00
Events Add IsQueuedForDeletion checks to interaction system (#32526) 2024-10-14 15:13:35 +11: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 Decouple interactions from hands, cleanup old events, add new fears (#28393) 2024-05-31 13:26:19 -07: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 'refs/remotes/wizards/master' 2024-10-30 13:26:32 +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