From 45fd3e6d980bc14ff44982df444c50068b699808 Mon Sep 17 00:00:00 2001 From: JunJun Date: Wed, 5 Nov 2025 16:16:48 +0300 Subject: [PATCH] Hand to hand (#365) --- Content.Client/Input/ContentContexts.cs | 1 + .../Options/UI/Tabs/KeyRebindTab.xaml.cs | 1 + Content.Client/Options/UI/Tabs/MiscTab.xaml | 1 + .../Options/UI/Tabs/MiscTab.xaml.cs | 2 + .../OfferItem/OfferItemIndicatorsOverlay.cs | 62 +++++ .../_CorvaxGoob/OfferItem/OfferItemSystem.cs | 44 ++++ .../_CorvaxGoob/OfferItem/OfferItemSystem.cs | 50 ++++ Content.Shared/Corvax/CCCVars/CCCVars.cs | 8 + Content.Shared/Input/ContentKeyFunctions.cs | 1 + .../Alert/Click/AcceptOfferAlertEvent.cs | 8 + .../OfferItem/OfferItemComponent.cs | 26 ++ .../SharedOfferItemSystem.Interactions.cs | 76 ++++++ .../OfferItem/SharedOfferItemSystem.cs | 226 ++++++++++++++++++ .../interaction/offer-item-system.ftl | 23 ++ Resources/Locale/ru-RU/alerts/alerts.ftl | 2 + Resources/Prototypes/Alerts/alerts.yml | 12 + .../Prototypes/Entities/Mobs/Species/base.yml | 1 + .../Interface/Alerts/offer_item.rsi/meta.json | 20 ++ .../Alerts/offer_item.rsi/offer_item.png | Bin 0 -> 1465 bytes .../Misc/give_item.rsi/give_item.png | Bin 0 -> 7276 bytes .../_CorvaxGoob/Misc/give_item.rsi/meta.json | 14 ++ Resources/keybinds.yml | 3 + 22 files changed, 581 insertions(+) create mode 100644 Content.Client/_CorvaxGoob/OfferItem/OfferItemIndicatorsOverlay.cs create mode 100644 Content.Client/_CorvaxGoob/OfferItem/OfferItemSystem.cs create mode 100644 Content.Server/_CorvaxGoob/OfferItem/OfferItemSystem.cs create mode 100644 Content.Shared/_CorvaxGoob/Alert/Click/AcceptOfferAlertEvent.cs create mode 100644 Content.Shared/_CorvaxGoob/OfferItem/OfferItemComponent.cs create mode 100644 Content.Shared/_CorvaxGoob/OfferItem/SharedOfferItemSystem.Interactions.cs create mode 100644 Content.Shared/_CorvaxGoob/OfferItem/SharedOfferItemSystem.cs create mode 100644 Resources/Locale/ru-RU/_CorvaxGoob/interaction/offer-item-system.ftl create mode 100644 Resources/Textures/_CorvaxGoob/Interface/Alerts/offer_item.rsi/meta.json create mode 100644 Resources/Textures/_CorvaxGoob/Interface/Alerts/offer_item.rsi/offer_item.png create mode 100644 Resources/Textures/_CorvaxGoob/Misc/give_item.rsi/give_item.png create mode 100644 Resources/Textures/_CorvaxGoob/Misc/give_item.rsi/meta.json diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs index 2ddddad024..465f0504fd 100644 --- a/Content.Client/Input/ContentContexts.cs +++ b/Content.Client/Input/ContentContexts.cs @@ -88,6 +88,7 @@ namespace Content.Client.Input human.AddFunction(ContentKeyFunctions.Arcade2); human.AddFunction(ContentKeyFunctions.Arcade3); human.AddFunction(ContentKeyFunctions.LanguageChoose); //WL-Changes: Languages + human.AddFunction(ContentKeyFunctions.OfferItem); // CorvaxGoob-OfferItem // actions should be common (for ghosts, mobs, etc) common.AddFunction(ContentKeyFunctions.OpenActionsMenu); diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs index ee72a91fb7..9973dc0d31 100644 --- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs @@ -187,6 +187,7 @@ namespace Content.Client.Options.UI.Tabs AddButton(ContentKeyFunctions.RotateStoredItem); AddButton(ContentKeyFunctions.SaveItemLocation); + AddButton(ContentKeyFunctions.OfferItem); // CorvaxGoob-Offer AddHeader("ui-options-header-interaction-adv"); AddButton(ContentKeyFunctions.SmartEquipBackpack); AddButton(ContentKeyFunctions.SmartEquipBelt); diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml b/Content.Client/Options/UI/Tabs/MiscTab.xaml index c1733e209d..a2c4971b30 100644 --- a/Content.Client/Options/UI/Tabs/MiscTab.xaml +++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml @@ -22,6 +22,7 @@ StyleClasses="LabelKeyText"/> +