diff --git a/Content.Shared/ADT/CCVar/CCVars.cs b/Content.Shared/ADT/CCVar/CCVars.cs index b7fb04c4215..f8ede560988 100644 --- a/Content.Shared/ADT/CCVar/CCVars.cs +++ b/Content.Shared/ADT/CCVar/CCVars.cs @@ -18,5 +18,24 @@ public sealed class SimpleStationCCVars CVarDef.Create("silicon.npcupdatetime", 1.5f, CVar.SERVERONLY); #endregion Silicons + /* + * Jetpack + */ + #region Jetpack System + + /// + /// When true, Jetpacks can be enabled anywhere, even in gravity. + /// + public static readonly CVarDef JetpackEnableAnywhere = + CVarDef.Create("jetpack.enable_anywhere", false, CVar.REPLICATED); + + /// + /// When true, jetpacks can be enabled on grids that have zero gravity. + /// + public static readonly CVarDef JetpackEnableInNoGravity = + CVarDef.Create("jetpack.enable_in_no_gravity", true, CVar.REPLICATED); + + #endregion + } diff --git a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs index 548594c01f7..565cffccd6e 100644 --- a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs +++ b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs @@ -1,9 +1,11 @@ using Content.Shared.Actions; +using Content.Shared.ADT.CCVar; using Content.Shared.Gravity; using Content.Shared.Interaction.Events; using Content.Shared.Movement.Components; using Content.Shared.Movement.Events; using Content.Shared.Popups; +using Robust.Shared.Configuration; using Robust.Shared.Containers; using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Systems; @@ -20,6 +22,7 @@ public abstract class SharedJetpackSystem : EntitySystem [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly SharedPhysicsSystem _physics = default!; [Dependency] private readonly ActionContainerSystem _actionContainer = default!; + [Dependency] private readonly IConfigurationManager _config = default!; public override void Initialize() { @@ -127,8 +130,13 @@ private bool CanEnableOnGrid(EntityUid? gridUid) { // No and no again! Do not attempt to activate the jetpack on a grid with gravity disabled. You will not be the first or the last to try this. // https://discord.com/channels/310555209753690112/310555209753690112/1270067921682694234 - return gridUid == null || - (!HasComp(gridUid)); + + // ADT Tweak start + if (gridUid == null || !TryComp(gridUid, out var comp)) + return true; + + return !comp.Enabled; + // ADT Tweak End } private void OnJetpackGetAction(EntityUid uid, JetpackComponent component, GetItemActionsEvent args) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl index 43b0b42f5b7..101851216e6 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl @@ -10,7 +10,7 @@ ent-ADTClothingUniformJumpskirtTurtleneckBlueshield = юбка-водолазк ent-ADTClothingUniformJumpskirtTurtleneckBlack = чёрная водолазка с юбкой - .desc = { ent-ADTClothingUniformTurtleneckBlack.desc } + .desc = Любимая одежда книжного червя. .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/mandarin.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/mandarin.ftl index bab19c65744..3395847fc55 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/mandarin.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/mandarin.ftl @@ -20,8 +20,8 @@ ent-ADTMandarinSeeds = пакет семян мандарина .desc = Ох, скорей бы выросли! .suffix = Новый год # семяна -seeds-mandarin-name = мандарина -seeds-mandarin-display-name = мандарина +seeds-mandarin-name = мандарин +seeds-mandarin-display-name = мандарин # сок reagent-name-juice-mandarin = мандариновый сок reagent-desc-juice-mandarin = И вкусно, и богато витамином C. Чего ещё желать? diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml index 4e5a44e00c8..1aac341659b 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml @@ -37,6 +37,7 @@ types: Shock: -5 Caustic: -5 + Heat: -5 # healingBeginSound: # path: "/Audio/Items/Medical/ointment_begin.ogg" # healingEndSound: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shotgunsawn.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shotgunsawn.yml index 0295a8b8818..068cccfd357 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shotgunsawn.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shotgunsawn.yml @@ -9,4 +9,4 @@ - tool: Sawing doAfter: 2 - node: shotgunsawn - entity: WeaponShotgunSawnEmpty # Makes the sawn-off spawn empty. At max they're losing 2 shells. \ No newline at end of file + entity: WeaponShotgunSawn # ADT Tweak: WeaponShotgunSawnEmpty -> WeaponShotgunSawn, Makes the sawn-off spawn empty. At max they're losing 2 shells. \ No newline at end of file