rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Shared/Interaction
History
VigersRay 31b2d24e30 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Shared/MagicMirror/MagicMirrorComponent.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png
#	Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
#	Resources/migration.yml
2024-07-31 03:54:09 +03:00
..
Components Продвинутые борги (#247) 2024-07-27 10:23:34 +03:00
Events Turn interaction related attempt events into structs (#29168) 2024-06-19 00:30:41 +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 Decouple interactions from hands, cleanup old events, add new fears (#28393) 2024-05-31 13:26:19 -07: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 Продвинутые борги (#247) 2024-07-27 10:23:34 +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-07-31 03:54:09 +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