diff --git a/Content.Shared/Clothing/SharedMagbootsSystem.cs b/Content.Shared/Clothing/SharedMagbootsSystem.cs index 4feaa6eb80..12c0ddba4a 100644 --- a/Content.Shared/Clothing/SharedMagbootsSystem.cs +++ b/Content.Shared/Clothing/SharedMagbootsSystem.cs @@ -26,10 +26,10 @@ public abstract class SharedMagbootsSystem : EntitySystem SubscribeLocalEvent>(AddToggleVerb); SubscribeLocalEvent>(OnSlipAttempt); SubscribeLocalEvent(OnGetActions); - SubscribeLocalEvent(OnToggleAction); + SubscribeLocalEvent(OnToggleMagboots); } - private void OnToggleAction(EntityUid uid, MagbootsComponent component, ToggleActionEvent args) + private void OnToggleMagboots(EntityUid uid, MagbootsComponent component, ToggleMagbootsEvent args) { if (args.Handled) return; @@ -89,3 +89,5 @@ public abstract class SharedMagbootsSystem : EntitySystem args.Actions.Add(component.ToggleAction); } } + +public sealed class ToggleMagbootsEvent : InstantActionEvent {} diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index ec9c3c14ff..fc301e482c 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -243,7 +243,7 @@ uplink-hardsuit-syndie-name = Syndicate Hardsuit uplink-hardsuit-syndie-desc = The Syndicate's well known armored blood red hardsuit, capable of space walks and bullet resistant. uplink-clothing-shoes-boots-mag-syndie-name = Blood-red Magboots -uplink-clothing-shoes-boots-mag-syndie-desc = A pair of magnetic boots that will keep you on the ground if the gravity fails or is sabotaged, giving you a mobility advantage. If activated with gravity they will protect from slips, but they will slow you down. +uplink-clothing-shoes-boots-mag-syndie-desc = A pair of boots that prevent slipping and, in zero gravity, allow you to move normally, at the cost of a slight slowdown. Additionally, they have jetpack functionality and come fueled, but don't last for long. uplink-eva-syndie-name = Syndicate EVA Bundle uplink-eva-syndie-desc = A simple EVA suit that offers no protection other than what's needed to survive in space. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 50a86ab80b..b3abfad1b2 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1050,7 +1050,7 @@ description: uplink-clothing-shoes-boots-mag-syndie-desc productEntity: ClothingShoesBootsMagSyndie cost: - Telecrystal: 2 + Telecrystal: 4 categories: - UplinkArmor diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index 00658d0825..974752637f 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -18,7 +18,7 @@ name: action-name-magboot-toggle description: action-decription-magboot-toggle itemIconStyle: NoItem - event: !type:ToggleActionEvent + event: !type:ToggleMagbootsEvent - type: ClothingSpeedModifier walkModifier: 0.85 sprintModifier: 0.8 @@ -54,7 +54,7 @@ name: action-name-magboot-toggle description: action-decription-magboot-toggle itemIconStyle: NoItem - event: !type:ToggleActionEvent + event: !type:ToggleMagbootsEvent - type: ClothingSpeedModifier walkModifier: 1 sprintModifier: 1 @@ -84,25 +84,73 @@ parent: ClothingShoesBase id: ClothingShoesBootsMagSyndie name: blood-red magboots - description: Reverse-engineered magnetic boots that have a heavy magnetic pull. Property of Gorlex Marauders. + description: Reverse-engineered magnetic boots that have a heavy magnetic pull and integrated thrusters. components: - - type: Sprite - sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi - state: icon - - type: Clothing - sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi - - type: Magboots - toggleAction: - icon: { sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi, state: icon } - iconOn: Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png - name: action-name-magboot-toggle - description: action-decription-magboot-toggle - itemIconStyle: NoItem - event: !type:ToggleActionEvent - - type: ClothingSpeedModifier - walkModifier: 0.85 - sprintModifier: 0.8 - enabled: false - - type: Tag - tags: - - WhitelistChameleon + - type: Sprite + sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi + state: icon + - type: Clothing + sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi + - type: Magboots + toggleAction: + icon: { sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi, state: icon } + iconOn: Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png + name: action-name-magboot-toggle + description: action-decription-magboot-toggle + itemIconStyle: NoItem + event: !type:ToggleMagbootsEvent + - type: ClothingSpeedModifier + walkModifier: 0.95 + sprintModifier: 0.9 + enabled: false + - type: GasTank + toggleAction: + name: action-name-internals-toggle + description: action-description-internals-toggle + icon: + sprite: Interface/Alerts/internals.rsi + state: internal2 + iconOn: + sprite: Interface/Alerts/internals.rsi + state: internal1 + event: !type:ToggleActionEvent + useDelay: 1 + outputPressure: 42.6 + air: + # 2 minutes of thrust + volume: 0.75 + temperature: 293.15 + moles: + - 0.153853429 # oxygen + - 0.153853429 # nitrogen + - type: ActivatableUI + key: enum.SharedGasTankUiKey.Key + - type: UserInterface + interfaces: + - key: enum.SharedGasTankUiKey.Key + type: GasTankBoundUserInterface + - type: Explosive + explosionType: Default + maxIntensity: 20 + - type: Jetpack + moleUsage: 0.00085 + toggleAction: + icon: + sprite: Objects/Tanks/Jetpacks/blue.rsi + state: icon + iconOn: + sprite: Objects/Tanks/Jetpacks/blue.rsi + state: icon-on + name: action-name-jetpack-toggle + description: action-description-jetpack-toggle + useDelay: 1.0 + event: !type:ToggleJetpackEvent + - type: InputMover + toParent: true + - type: MovementSpeedModifier + weightlessAcceleration: 1 + weightlessFriction: 0.3 + weightlessModifier: 1.2 + - type: Tag + tags: + - WhitelistChameleon