rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Shared/Interaction
History
VigersRay 9328f4d9cb Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/Shuttles/Systems/ArrivalsSystem.cs
#	Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Shared/Chat/SharedChatSystem.cs
#	Content.Shared/UserInterface/ActivatableUIComponent.cs
#	Resources/Prototypes/Datasets/Names/ai.yml
#	Resources/Prototypes/Datasets/adjectives.yml
#	Resources/Prototypes/Datasets/verbs.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Roles/Jobs/Science/borg.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
#	SpaceStation14.sln
2024-08-28 19:12:01 +03:00
..
Components фикс BlockMovementComponent 2024-08-22 06:51:38 +03:00
Events Melee Executions (#30104) 2024-08-11 13:05:54 +10: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 Fix double interaction popups (#30452) 2024-08-02 11:33:20 +10: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.Clumsy.cs Separated Bonk functionality and component from ClimbSystem and ClimbComponent (#13635) 2023-01-31 17:33:00 -04:00
SharedInteractionSystem.cs Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-08-28 19:12:01 +03:00
SharedInteractionSystem.Relay.cs Update trivial components to use auto comp states (#20539) 2023-09-28 16:20:29 -07:00
SmartEquipSystem.cs Prevent virtual item storage and popups (#30020) 2024-07-15 00:08:39 +10:00