Мехи (#415)

* initial commit

* some sprites

* mech weapons

* syndi mechs to nuke ops uplink

* some loadouts to Nanotrasen mechs

* spawn mark filled mechs

* construction graphs

* researchable mechs

* i forgor

* locale changes

* aaa

* minor translate(big, later)

* fix items in hands

* fix

* upd translate

* translate electronics

* translate mech weapons

* translate

* translate const

* fix rsi

* fix

* fix

---------

Co-authored-by: NULL882 <gost6865@yandex.ru>
Co-authored-by: VigersRay <vigersray@gmail.com>

Content.Client/Weapons/Ranged/Systems/GunSystem.cs

@@ -5,6 +5,7 @@ using Content.Client.Items;
 using Content.Client.Weapons.Ranged.Components;
 using Content.Shared.Camera;
 using Content.Shared.CombatMode;
+using Content.Shared.Mech.Components;
 using Content.Shared.Weapons.Ranged;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
@@ -150,6 +151,11 @@ public sealed partial class GunSystem : SharedGunSystem
 
         var entity = entityNull.Value;
 
+        if (TryComp<MechPilotComponent>(entity, out var mechPilot))
+        {
+            entity = mechPilot.Mech;
+        }
+
         if (!TryGetGun(entity, out var gunUid, out var gun))
         {
             return;

Content.Server/Mech/Equipment/EntitySystems/MechGunSystem.cs

@@ -0,0 +1,61 @@
+using Content.Server.Mech.Systems;
+using Content.Server.Power.Components;
+using Content.Server.Power.EntitySystems;
+using Content.Shared.Mech.Components;
+using Content.Shared.Mech.Equipment.Components;
+using Content.Shared.Throwing;
+using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Shared.Random;
+
+namespace Content.Server.Mech.Equipment.EntitySystems;
+public sealed class MechGunSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly ThrowingSystem _throwing = default!;
+    [Dependency] private readonly MechSystem _mech = default!;
+    [Dependency] private readonly BatterySystem _battery = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<MechEquipmentComponent, GunShotEvent>(MechGunShot);
+    }
+
+    private void MechGunShot(EntityUid uid, MechEquipmentComponent component, ref GunShotEvent args)
+    {
+        if (!component.EquipmentOwner.HasValue)
+            return;
+
+        if (!TryComp<MechComponent>(component.EquipmentOwner.Value, out var mech))
+            return;
+
+        if (TryComp<BatteryComponent>(uid, out var battery))
+        {
+            ChargeGunBattery(uid, battery);
+            return;
+        }
+    }
+
+    private void ChargeGunBattery(EntityUid uid, BatteryComponent component)
+    {
+        if (!TryComp<MechEquipmentComponent>(uid, out var mechEquipment) || !mechEquipment.EquipmentOwner.HasValue)
+            return;
+
+        if (!TryComp<MechComponent>(mechEquipment.EquipmentOwner.Value, out var mech))
+            return;
+
+        var maxCharge = component.MaxCharge;
+        var currentCharge = component.CurrentCharge;
+
+        var chargeDelta = maxCharge - currentCharge;
+
+        // TODO: The battery charge of the mech would be spent directly when fired.
+        if (chargeDelta <= 0 || mech.Energy - chargeDelta < 0)
+            return;
+
+        if (!_mech.TryChangeEnergy(mechEquipment.EquipmentOwner.Value, -chargeDelta, mech))
+            return;
+
+        _battery.SetCharge(uid, component.MaxCharge, component);
+    }
+}

Content.Server/Mech/Systems/MechSystem.cs

@@ -18,6 +18,8 @@ using Content.Shared.Verbs;
 using Content.Shared.Wires;
 using Content.Server.Body.Systems;
 using Content.Shared.Tools.Systems;
+using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
 using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
@@ -39,6 +41,7 @@ public sealed partial class MechSystem : SharedMechSystem
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
     [Dependency] private readonly SharedToolSystem _toolSystem = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -234,6 +237,14 @@ public sealed partial class MechSystem : SharedMechSystem
             _popup.PopupEntity(Loc.GetString("mech-no-enter", ("item", uid)), args.User);
             return;
         }
+        
+        if (!TryComp<HandsComponent>(args.Args.User, out var handsComponent))
+            return;
+        
+        foreach (var hand in _hands.EnumerateHands(args.Args.User, handsComponent))
+        {
+            _hands.DoDrop(args.Args.User, hand, true, handsComponent);
+        }
 
         TryInsert(uid, args.Args.User, component);
         _actionBlocker.UpdateCanMove(uid);

Content.Server/Weapons/Ranged/Systems/GunSystem.cs

@@ -2,6 +2,7 @@ using System.Linq;
 using System.Numerics;
 using Content.Server.Cargo.Systems;
 using Content.Server.Interaction;
+using Content.Server.Mech.Equipment.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Stunnable;
 using Content.Server.Weapons.Ranged.Components;
@@ -10,6 +11,7 @@ using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.Effects;
 using Content.Shared.Interaction.Components;
+using Content.Shared.Mech.Equipment.Components;
 using Content.Shared.Projectiles;
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Ranged;

Content.Shared/Mech/Components/MechComponent.cs

@@ -13,6 +13,13 @@ namespace Content.Shared.Mech.Components;
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class MechComponent : Component
 {
+    /// <summary>
+    /// Whether or not an emag disables it.
+    /// </summary>
+    [DataField("breakOnEmag")]
+    [AutoNetworkedField]
+    public bool BreakOnEmag = true;
+
     /// <summary>
     /// How much "health" the mech has left.
     /// </summary>

Content.Shared/Mech/EntitySystems/SharedMechSystem.cs

@@ -5,6 +5,8 @@ using Content.Shared.Actions;
 using Content.Shared.Destructible;
 using Content.Shared.DoAfter;
 using Content.Shared.DragDrop;
+using Content.Shared.Emag.Components;
+using Content.Shared.Emag.Systems;
 using Content.Shared.FixedPoint;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Components;
@@ -15,6 +17,7 @@ using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Weapons.Melee;
+using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
 using Robust.Shared.Network;
@@ -51,6 +54,7 @@ public abstract class SharedMechSystem : EntitySystem
         SubscribeLocalEvent<MechComponent, GetAdditionalAccessEvent>(OnGetAdditionalAccess);
         SubscribeLocalEvent<MechComponent, DragDropTargetEvent>(OnDragDrop);
         SubscribeLocalEvent<MechComponent, CanDropTargetEvent>(OnCanDragDrop);
+        SubscribeLocalEvent<MechComponent, GotEmaggedEvent>(OnEmagged);
 
         SubscribeLocalEvent<MechPilotComponent, GetMeleeWeaponEvent>(OnGetMeleeWeapon);
         SubscribeLocalEvent<MechPilotComponent, CanAttackFromContainerEvent>(OnCanAttackFromContainer);
@@ -449,6 +453,14 @@ public abstract class SharedMechSystem : EntitySystem
         args.CanDrop |= !component.Broken && CanInsert(uid, args.Dragged, component);
     }
 
+    private void OnEmagged(EntityUid uid, MechComponent component, ref GotEmaggedEvent args)
+    {
+        if (!component.BreakOnEmag)
+            return;
+        args.Handled = true;
+        component.EquipmentWhitelist = null;
+        Dirty(uid, component);
+    }
 }
 
 /// <summary>

Content.Shared/Weapons/Ranged/Components/GunComponent.cs

@@ -193,7 +193,7 @@ public sealed partial class GunComponent : Component
     /// How fast the projectile moves.
     /// <seealso cref="GunRefreshModifiersEvent"/>
     /// </summary>
-    [AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
     public float ProjectileSpeedModified;
 
     /// <summary>

Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs

@@ -11,6 +11,7 @@ using Content.Shared.Examine;
 using Content.Shared.Gravity;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
+using Content.Shared.Mech.Components;
 using Content.Shared.Popups;
 using Content.Shared.Projectiles;
 using Content.Shared.Tag;
@@ -127,12 +128,14 @@ public abstract partial class SharedGunSystem : EntitySystem
     {
         var user = args.SenderSession.AttachedEntity;
 
-        if (user == null ||
-            !_combatMode.IsInCombatMode(user) ||
-            !TryGetGun(user.Value, out var ent, out var gun))
-        {
+        if (user == null || !_combatMode.IsInCombatMode(user))
+            return;
+
+        if (TryComp<MechPilotComponent>(user.Value, out var mechPilot))
+            user = mechPilot.Mech;
+
+        if (!TryGetGun(user.Value, out var ent, out var gun))
             return;
-        }
 
         if (ent != GetEntity(msg.Gun))
             return;
@@ -146,14 +149,18 @@ public abstract partial class SharedGunSystem : EntitySystem
     {
         var gunUid = GetEntity(ev.Gun);
 
-        if (args.SenderSession.AttachedEntity == null ||
-            !TryComp<GunComponent>(gunUid, out var gun) ||
-            !TryGetGun(args.SenderSession.AttachedEntity.Value, out _, out var userGun))
-        {
-            return;
-        }
+        var user = args.SenderSession.AttachedEntity;
 
-        if (userGun != gun)
+        if (user == null)
+            return;
+
+        if (TryComp<MechPilotComponent>(user.Value, out var mechPilot))
+            user = mechPilot.Mech;
+
+        if (!TryGetGun(user.Value, out var ent, out var gun))
+            return;
+
+        if (ent != gunUid)
             return;
 
         StopShooting(gunUid, gun);
@@ -172,6 +179,15 @@ public abstract partial class SharedGunSystem : EntitySystem
         gunEntity = default;
         gunComp = null;
 
+        if (TryComp<MechComponent>(entity, out var mech) &&
+            mech.CurrentSelectedEquipment.HasValue &&
+            TryComp<GunComponent>(mech.CurrentSelectedEquipment.Value, out var mechGun))
+        {
+            gunEntity = mech.CurrentSelectedEquipment.Value;
+            gunComp = mechGun;
+            return true;
+        }
+
         if (EntityManager.TryGetComponent(entity, out HandsComponent? hands) &&
             hands.ActiveHandEntity is { } held &&
             TryComp(held, out GunComponent? gun))
@@ -267,8 +283,11 @@ public abstract partial class SharedGunSystem : EntitySystem
         var shots = 0;
         var lastFire = gun.NextFire;
 
+        Log.Debug($"Nextfire={gun.NextFire} curTime={curTime}");
+
         while (gun.NextFire <= curTime)
         {
+            Log.Debug("Shots++");
             gun.NextFire += fireRate;
             shots++;
         }
@@ -292,6 +311,8 @@ public abstract partial class SharedGunSystem : EntitySystem
                 throw new ArgumentOutOfRangeException($"No implemented shooting behavior for {gun.SelectedMode}!");
         }
 
+        Log.Debug($"Shots fired: {shots}");
+
         var attemptEv = new AttemptShootEvent(user, null);
         RaiseLocalEvent(gunUid, ref attemptEv);
 

Resources/Locale/en-US/_prototypes/_sunrise/actions/nvg.ftl

@@ -0,0 +1,4 @@
+ent-NVToggleAction = Switching NVG
+    .desc = Switching NVG
+ent-SwitchNightVision = Switches Night Vision
+    .desc = Switches Night Vision

Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/crates/armory.ftl

@@ -0,0 +1,10 @@
+ent-CrateArmoryM16A4 = M16A4 crate
+    .desc = Contains two M16A4 assault rifle with four mags. Requires Armory access to open.
+ent-CrateArmoryAKMS = AKMS crate
+    .desc = Contains two AKMS assault rifle with four mags. Requires Armory access to open.
+ent-CrateArmoryMP5 = MP5 crate
+    .desc = Contains two MP5 submachine gun with four mags. Requires Armory access to open.
+ent-CrateArmoryMagazineBoxLightRifleBig = MagazineBoxLightRifleBig crate
+    .desc = Contains two MagazineBoxLightRifleBig. Requires Armory access to open.
+ent-CrateArmoryMagazineBoxRifleBig = MagazineBoxRifleBig crate
+    .desc = Contains two MagazineBoxRifleBig. Requires Armory access to open.

Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/crates/security.ftl

@@ -0,0 +1,4 @@
+ent-CrateSecurityWebbing = Security Webbing crate
+    .desc = Contains two Security Webbing. Requires Security access to open.
+ent-CrateSecurityGlovesCombat = Gloves Combat crate
+    .desc = Contains three Gloves Combat. Requires Security access to open.

Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/eyes/nvg.ftl

@@ -0,0 +1,5 @@
+ent-ClothingEyesVision = NVD
+    .desc = Night vision device. Provides an image of the terrain in low-light conditions.
+ent-ClothingEyesVisionNuki = { ent-ClothingEyesVision }
+    .suffix = nuke
+    .desc = { ent-ClothingEyesVision.desc }

Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/consumable/drinks/drinks.ftl

@@ -22,6 +22,8 @@ ent-DrinkEspressoMartiniGlass = { ent-DrinkGlass }
 ent-DrinkKvassGlass = { ent-DrinkGlassBase }
     .suffix = kvass
     .desc = { ent-DrinkGlassBase.desc }
+ent-DrinkNastoykaRomashki = настойка ромашки
+    .desc = { ent-DrinkGlassBase.desc }
 ent-DrinkMaiTaiGlass = { ent-DrinkGlass }
     .suffix = mai tai
     .desc = { ent-DrinkGlass.desc }

Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/fun/toys.ftl

@@ -94,3 +94,5 @@ ent-PlushieMiron = Плюшевый Мирон Потапов
     .desc = Плюшевая игрушка ветерана медицинского отдела, готового делиться опытом с другими. На бирке указано "Изготовлен из натуральных химикатов"
 ent-PlushieBublegum = Плюшевый Бубльгум
     .desc = Милая игрушка ужасающего чудовища из глубин лаваленда. Она не способна вам навредить
+ent-PlushieCikuus = Плюшевая Лилит Бонавентура
+    .desc = Милая вульпочка в костюме горничной, она приятно пахнет цветами и с радостью уберет ваш дом. Кто о такой не мечтал?

Resources/Locale/en-US/_prototypes/catalog/fills/crates/syndicate.ftl

@@ -5,3 +5,9 @@ ent-CrateCybersunJuggernautBundle = Cybersun juggernaut bundle
     .suffix = Filled
 ent-CrateSyndicateSuperSurplusBundle = Syndicate super surplus crate
     .desc = Contains 125 telecrystals worth of completely random Syndicate items.
+ent-CrateCybersunDarkGygaxBundle = Cybersun gygax bundle
+    .desc = Contains a set of Cybersan light armored mechs.
+    .suffix = Filled
+ent-CrateCybersunMaulerBundle = Cybersun mauler bundle
+    .desc = Contains a set of Cybersan heavy armored mechs.
+    .suffix = Filled

Resources/Locale/en-US/_prototypes/entities/markers/spawners/mechs.ftl

@@ -1,4 +1,35 @@
 ent-SpawnMechRipley = Ripley APLU Spawner
     .desc = { ent-MarkerBase.desc }
+ent-SpawnMechRipley2 = Ripley APLU MK-II Spawner
+    .desc = { ent-MarkerBase.desc }
 ent-SpawnMechHonker = H.O.N.K. Spawner
     .desc = { ent-MarkerBase.desc }
+ent-SpawnMechHonkerFilled = H.O.N.K. Spawner
+    .suffix = Filled
+    .desc = { ent-MarkerBase.desc }
+ent-SpawnMechClarke = Clarke Spawner
+    .desc = { ent-MarkerBase.desc }
+ent-SpawnMechGygax = Gygax Spawner
+    .desc = { ent-MarkerBase.desc }
+ent-SpawnMechDurand = Durand Spawner
+    .desc = { ent-MarkerBase.desc }
+ent-SpawnMechMarauder = Marauder Spawner
+    .desc = { ent-MarkerBase.desc }
+ent-SpawnMechMarauderFilled = Marauder Spawner
+    .suffix = Filled
+    .desc = { ent-MarkerBase.desc }
+ent-SpawnMechSeraph = Seraph Spawner
+    .desc = { ent-MarkerBase.desc }
+ent-SpawnMechSeraphFilled = Seraph Spawner
+    .suffix = Filled
+    .desc = { ent-MarkerBase.desc }
+ent-SpawnMechGygaxSyndie = Dark Gygax Spawner
+    .desc = { ent-MarkerBase.desc }
+ent-SpawnMechGygaxSyndieFilled = Dark Gygax Spawner
+    .suffix = Filled
+    .desc = { ent-MarkerBase.desc }
+ent-SpawnMechMaulerSyndie = Mauler Spawner
+    .desc = { ent-MarkerBase.desc }
+ent-SpawnMechMaulerSyndieFilled = Mauler Spawner
+    .suffix = Filled
+    .desc = { ent-MarkerBase.desc }

Resources/Locale/en-US/_prototypes/entities/objects/devices/electronics/exosuit_components.ftl

@@ -0,0 +1,12 @@
+ent-BaseExosuitParts = base components
+    .desc = { ent-BaseItem.desc }
+ent-DurandArmorPlate = durand armor plates
+    .desc = Armor plates made of plasteel for Durand exosuit.
+ent-GygaxArmorPlate = gygax armor plates
+    .desc = Armor plates made of steel for Gygax exosuit.
+ent-RipleyUpgradeKit = exosuit upgrade kit
+    .desc = This kit allows you to assemble an exosuit Ripley MK-II.
+ent-MechAirTank = exosuit air tank
+    .desc = A special air canister capable of holding a large amount of air.
+ent-MechThruster = exosuit thruster
+    .desc = A thruster with which the exosuit can safely move in the absence of gravity.

Resources/Locale/en-US/_prototypes/entities/objects/devices/electronics/mech.ftl

@@ -1,7 +1,7 @@
 ent-RipleyCentralElectronics = ripley central control module
-    .desc = The electrical control center for the ripley mech.
+    .desc = The electrical control center for the Ripley mech.
 ent-RipleyPeripheralsElectronics = ripley peripherals control module
-    .desc = The electrical peripherals control for the ripley mech.
+    .desc = The electrical peripherals control for the Ripley mech.
 ent-HonkerCentralElectronics = H.O.N.K. central control module
     .desc = The electrical control center for the H.O.N.K. mech.
 ent-HonkerPeripheralsElectronics = H.O.N.K. peripherals control module
@@ -12,3 +12,19 @@ ent-HamtrCentralElectronics = HAMTR central control module
     .desc = The electrical control center for the HAMTR mech.
 ent-HamtrPeripheralsElectronics = HAMTR peripherals control module
     .desc = The electrical peripherals control for the HAMTR mech.
+ent-ClarkeCentralElectronics = clarke central control module
+    .desc = The electrical control center for the Clarke mech.
+ent-ClarkePeripheralsElectronics = clarke peripherals control module
+    .desc = The electrical peripherals control for the Clarke mech.
+ent-GygaxCentralElectronics = gygax central control module
+    .desc = The electrical control center for the Gygax mech.
+ent-GygaxPeripheralsElectronics = gygax peripherals control module
+    .desc = The electrical peripherals control for the Gygax mech.
+ent-GygaxTargetingElectronics = gygax weapon control and targeting module
+    .desc = The electrical targeting control for the Gygax mech.
+ent-DurandCentralElectronics = durand central control module
+    .desc = The electrical control center for the Durand mech.
+ent-DurandPeripheralsElectronics = durand peripherals control module
+    .desc = The electrical peripherals control for the Durand mech.
+ent-DurandTargetingElectronics = durand weapon control and targeting module
+    .desc = The electrical targeting control for the Durand mech.

Resources/Locale/en-US/_prototypes/entities/objects/specific/mech/mech_construction.ftl

@@ -1,5 +1,57 @@
 ent-BaseMechPart = { "" }
     .desc = { "" }
+ent-BaseClarkePart = { ent-BaseMechPart }
+    .desc = { ent-BaseMechPart.desc }
+ent-BaseClarkePartItem = { ent-BaseClarkePart }
+    .desc = { ent-BaseClarkePart.desc }
+ent-ClarkeHarness = clarke harness
+    .desc = The core of the Clarke.
+ent-ClarkeHead = clarke head
+    .desc = The head of the Clarke. It belongs on the chassis of the mech.
+ent-ClarkeRArm = clarke right arm
+    .desc = The right arm of the Clarke. It belongs on the chassis of the mech.
+ent-ClarkeLArm = clarke left arm
+    .desc = The left arm of the Clarke. It belongs on the chassis of the mech.
+ent-ClarkeTreads = clarke treads
+    .desc = The treads of the Clarke. It belongs on the chassis of the mech.
+ent-ClarkeChassis = calrke chassis
+    .desc = An in-progress construction of the Clarke mech.
+ent-BaseDurandPart = { ent-BaseMechPart }
+    .desc = { ent-BaseMechPart.desc }
+ent-BaseDurandPartItem = { ent-BaseDurandPart }
+    .desc = { ent-BaseDurandPart.desc }
+ent-DurandHarness = durand harness
+    .desc = The core of the Durand.
+ent-DurandHead = durand head
+    .desc = The head of the Durand. It belongs on the chassis of the mech.
+ent-DurandLArm = durand left arm
+    .desc = The left arm of the Durand. It belongs on the chassis of the mech.
+ent-DurandLLeg = durand left leg
+    .desc = The left leg of the Durand. It belongs on the chassis of the mech.
+ent-DurandRLeg = durand right leg
+    .desc = The right leg of the Durand. It belongs on the chassis of the mech.
+ent-DurandRArm = durand right arm
+    .desc = The right arm of the Durand. It belongs on the chassis of the mech.
+ent-DurandChassis = durand chassis
+    .desc = An in-progress construction of the Durand mech.
+ent-BaseGygaxPart = { ent-BaseMechPart }
+    .desc = { ent-BaseMechPart.desc }
+ent-BaseGygaxPartItem = { ent-BaseGygaxPart }
+    .desc = { ent-BaseGygaxPart.desc }
+ent-GygaxHarness = gygax harness
+    .desc = The core of the Gygax.
+ent-GygaxHead = gygax head
+    .desc = The head of the Gygax. It belongs on the chassis of the mech.
+ent-GygaxLArm = gygax left arm
+    .desc = The left arm of the Gygax. It belongs on the chassis of the mech.
+ent-GygaxLLeg = gygax left leg
+    .desc = The left leg of the Gygax. It belongs on the chassis of the mech.
+ent-GygaxRLeg = gygax right leg
+    .desc = The right leg of the Gygax. It belongs on the chassis of the mech.
+ent-GygaxRArm = gygax right arm
+    .desc = The right arm of the Gygax. It belongs on the chassis of the mech.
+ent-GygaxChassis = gygax chassis
+    .desc = An in-progress construction of the Gygax mech.
 ent-BaseRipleyPart = { ent-BaseMechPart }
     .desc = { ent-BaseMechPart.desc }
 ent-BaseRipleyPartItem = { ent-BaseRipleyPart }
@@ -16,6 +68,12 @@ ent-RipleyRArm = ripley right arm
     .desc = The right arm of the Ripley APLU. It belongs on the chassis of the mech.
 ent-RipleyChassis = ripley chassis
     .desc = An in-progress construction of the Ripley APLU mech.
+ent-BaseRipleyMKIIPart = { ent-BaseMechPart }
+    .desc = { ent-BaseMechPart.desc }
+ent-RipleyMKIIHarness = ripley MK-II harness
+    .desc = The core of the Ripley MK-II.
+ent-RipleyMKIIChassis = ripley MK-II chassis
+    .desc = An in-progress construction of the Ripley MK-II mech.
 ent-BaseHonkerPart = { ent-BaseMechPart }
     .desc = { ent-BaseMechPart.desc }
 ent-BaseHonkerPartItem = { ent-BaseHonkerPart }

Resources/Locale/en-US/_prototypes/entities/objects/specific/mech/mecha_equipment.ftl

@@ -1,3 +1,14 @@
+ent-DebugMechEquipment = { "" }
+    .suffix = DEBUG
+    .desc = { "" }
+ent-CombatMechEquipment = { "" }
+    .desc = { "" }
+ent-IndustrialMechEquipment = { "" }
+    .desc = { "" }
+ent-SpecialMechEquipment = { "" }
+    .desc = { "" }
+ent-SmallMechEquipment = { "" }
+    .desc = { "" }
 ent-BaseMechEquipment = { ent-BaseItem }
     .desc = { ent-BaseItem.desc }
 ent-MechEquipmentGrabber = hydraulic clamp

Resources/Locale/en-US/_prototypes/entities/objects/specific/mech/mechs.ftl

@@ -1,3 +1,11 @@
+ent-CombatMech = { "" }
+    .desc = { "" }
+ent-IndustrialMech = { "" }
+    .desc = { "" }
+ent-SpecialMech = { "" }
+    .desc = { "" }
+ent-SmallMech = { "" }
+    .desc = { "" }
 ent-BaseMech = { "" }
     .desc = { "" }
 ent-MechRipley = Ripley APLU
@@ -5,11 +13,24 @@ ent-MechRipley = Ripley APLU
 ent-MechRipleyBattery = { ent-MechRipley }
     .suffix = Battery
     .desc = { ent-MechRipley.desc }
+ent-MechRipley2 = Ripley APLU MK-II
+    .desc = The "MK-II" has a pressurized cabin for space operations, but the added weight has slowed it down.
+ent-MechRipley2Battery = { ent-MechRipley2 }
+    .suffix = Battery
+    .desc = { ent-MechRipley2.desc }
+ent-MechClarke = Clarke
+    .desc = A fast-moving mech for space travel. It has built-in trusts.
+ent-MechClarkeBattery = { ent-MechClarke }
+    .suffix = Battery
+    .desc = { ent-MechClarke.desc }
 ent-MechHonker = H.O.N.K.
     .desc = Produced by "Tyranny of Honk, INC", this exosuit is designed as heavy clown-support. Used to spread the fun and joy of life. HONK!
 ent-MechHonkerBattery = { ent-MechHonker }
     .suffix = Battery
     .desc = { ent-MechHonker.desc }
+ent-MechHonkerFilled = { ent-MechHonkerBattery }
+    .suffix = Battery, Filled
+    .desc = { ent-MechHonkerBattery.desc }
 ent-MechHamtr = HAMTR
     .desc = An experimental mech which uses a brain–computer interface to connect directly to a hamsters brain.
 ent-MechHamtrBattery = { ent-MechHamtr }
@@ -20,3 +41,45 @@ ent-MechVim = Vim
 ent-MechVimBattery = { ent-MechVim }
     .suffix = Battery
     .desc = { ent-MechVim.desc }
+ent-MechGygax = Gygax
+    .desc = While lightly armored, the Gygax has incredible mobility thanks to its ability that lets it smash through walls at high speeds.
+ent-MechGygaxBattery = { ent-MechGygax }
+    .suffix = Battery
+    .desc = { ent-MechGygax.desc }
+ent-MechDurand = Durand
+    .desc = A slow but beefy combat exosuit that is extra scary in confined spaces due to its punches. Xenos hate it!
+ent-MechDurandBattery = { ent-MechDurand }
+    .suffix = Battery
+    .desc = { ent-MechDurand.desc }
+ent-MechMarauder = Marauder
+    .desc = Looks like we're all saved.
+ent-MechMarauderBattery = { ent-MechMarauder }
+    .suffix = Battery
+    .desc = { ent-MechMarauder.desc }
+ent-MechMarauderFilled = { ent-MechMarauderBattery }
+    .suffix = Battery, Filled
+    .desc = { ent-MechMarauderBattery.desc }
+ent-MechSeraph = Seraph
+    .desc = That's the last thing you'll see.
+ent-MechSeraphBattery = { ent-MechSeraph }
+    .suffix = Battery
+    .desc = { ent-MechSeraph.desc }
+ent-MechSeraphFilled = { ent-MechSeraphBattery }
+    .suffix = Battery, Filled
+    .desc = { ent-MechSeraphBattery.desc }
+ent-MechGygaxSyndie = Dark Gygax
+    .desc = A modified Gygax used for nefarious purposes. On the back of the armor plate there is an inscription "Cybersun Inc."
+ent-MechGygaxSyndieBattery = { ent-MechGygaxSyndie }
+    .suffix = Battery
+    .desc = { ent-MechGygaxSyndie.desc }
+ent-MechGygaxSyndieFilled = { ent-MechGygaxSyndieBattery }
+    .suffix = Battery, Filled
+    .desc = { ent-MechGygaxSyndieBattery.desc }
+ent-MechMaulerSyndie = Mauler
+    .desc = A modified Marauder used by the Syndicate that's not as maneuverable as the Dark Gygax, but it makes up for that in armor and sheer firepower. On the back of the armor plate there is an inscription "Cybersun Inc."
+ent-MechMaulerSyndieBattery = { ent-MechMaulerSyndie }
+    .suffix = Battery
+    .desc = { ent-MechMaulerSyndie.desc }
+ent-MechMaulerSyndieFilled = { ent-MechMaulerSyndieBattery }
+    .suffix = Battery, Filled
+    .desc = { ent-MechMaulerSyndieBattery.desc }

Resources/Locale/en-US/_prototypes/entities/objects/specific/mech/weapons/gun/base.ftl

@@ -0,0 +1,2 @@
+ent-BaseMechWeaponRange = { ent-BaseMechEquipment }
+    .desc = { ent-BaseMechEquipment.desc }

Resources/Locale/en-US/_prototypes/entities/objects/specific/mech/weapons/gun/combat.ftl

@@ -0,0 +1,39 @@
+ent-WeaponMechCombatPulseRifle = eZ-14 mk2 Heavy pulse rifle
+    .desc = Fires a heavy pulse laser.
+    .suffix = Mech Weapon, Gun, Combat, Pulse
+ent-WeaponMechCombatImmolationGun = ZFI Immolation Beam Gun
+    .desc = A gun for battlemechs, firing high-temperature beams.
+    .suffix = Mech Weapon, Gun, Combat, Laser
+ent-WeaponMechCombatSolarisLaser = CH-LC "Solaris" laser cannon
+    .desc = An experimental combat mounted laser cannon that causes more damage, but also has a greater cooldown than a "Firedart".
+    .suffix = Mech Weapon, Gun, Combat, Laser
+ent-WeaponMechCombatFiredartLaser = CH-PS "Firedart" Laser
+    .desc = The standard combat armament of the mechs is a combat mounted laser.
+    .suffix = Mech Weapon, Gun, Combat, Laser
+ent-WeaponMechCombatTeslaCannon = P-X Tesla Cannon
+    .desc = A weapon for combat mechs, firing energy balls, based on the principle of an experimental Tesla engine.
+    .suffix = Mech Weapon, Gun, Combat, Tesla
+ent-WeaponMechCombatDisabler = CH-PD Disabler
+    .desc = A non-lethal mounted stun gun that allows you to immobilize intruders.
+    .suffix = Mech Weapon, Gun, Combat, Disabler
+ent-WeaponMechCombatTaser = PBT "Pacifier" Mounted Taser
+    .desc = A mounted non-lethal taser that allows you to stun intruders.
+    .suffix = Mech Weapon, Gun, Combat, Disabler, admeme
+ent-WeaponMechCombatShotgun = LBX AC 10 "Scattershot"
+    .desc = A mounted non-lethal taser that allows you to stun intruders.
+    .suffix = Mech Weapon, Gun, Combat, Shotgun
+ent-WeaponMechCombatShotgunIncendiary = FNX-99 "Hades" Carbine
+    .desc = Mounted carbine, firing incendiary cartridges.
+    .suffix = Mech Weapon, Gun, Combat, Shotgun, Incendiary
+ent-WeaponMechCombatUltraRifle = Ultra AC-2
+    .desc = Mounted carbine, firing incendiary cartridges.
+    .suffix = Mech Weapon, Gun, Combat, Rifle
+ent-WeaponMechCombatMissileRack8 = SRM-8 Light Missile Rack
+    .desc = Launches low-explosive breaching missiles designed to explode only when striking a sturdy target.
+    .suffix = Mech Weapon, Gun, Combat, Light Missile
+ent-WeaponMechCombatMissileRack6 = BRM-6 Missile Rack
+    .desc = Tubes must be reloaded from the outside.
+    .suffix = Mech Weapon, Gun, Combat, Missile
+ent-WeaponMechCombatFlashbangLauncher = SGL-6 Flashbang Launcher
+    .desc = Launches low-explosive breaching missiles designed to explode only when striking a sturdy target.
+    .suffix = Mech Weapon, Gun, Combat, Flashbang

Resources/Locale/en-US/_prototypes/entities/objects/specific/mech/weapons/gun/debug.ftl

@@ -0,0 +1,9 @@
+ent-WeaponMechDebugBallistic = debug bang
+    .suffix = Mech Weapon, DEBUG, Ballistic
+    .desc = { ent-BaseMechWeaponRange.desc }
+ent-WeaponMechDebugLaser = debug pow
+    .desc = A weapon using light amplified by the stimulated emission of radiation.
+    .suffix = Mech Weapon, DEBUG, Laser
+ent-WeaponMechDebugDisabler = debug tew
+    .desc = A self-defense weapon that exhausts organic targets, weakening them until they collapse.
+    .suffix = Mech Weapon, DEBUG, Disabler

Resources/Locale/en-US/_prototypes/entities/objects/specific/mech/weapons/gun/industrial.ftl

@@ -0,0 +1,3 @@
+ent-WeaponMechIndustrialKineticAccelerator = exosuit proto-kinetic accelerator
+    .desc = Fires normal-damage kinetic bolts at a short range.
+    .suffix = Mech Weapon, Gun, Industrial, Kinetic Accelerator

Resources/Locale/en-US/_prototypes/entities/objects/specific/mech/weapons/gun/special.ftl

@@ -0,0 +1,6 @@
+ent-WeaponMechSpecialMousetrapMortar = mousetrap mortar
+    .desc = Mounted mousetrap launcher.
+    .suffix = Mech Weapon, Gun, Special, Mortar
+ent-WeaponMechSpecialBananaMortar = banana mortar
+    .desc = Mounted banana peel launcher.
+    .suffix = Mech Weapon, Gun, Special, Mortar

Resources/Locale/en-US/_prototypes/entities/objects/specific/mech/weapons/melee/base.ftl

@@ -0,0 +1,2 @@
+ent-BaseMechWeaponMelee = { ent-BaseMechEquipment }
+    .desc = { ent-BaseMechEquipment.desc }

Resources/Locale/en-US/_prototypes/entities/objects/specific/mech/weapons/melee/combat.ftl

@@ -0,0 +1,3 @@
+ent-WeaponMechChainSword = exosuit chainsword
+    .desc = Equipment for combat exosuits. This is the mechanical chainsword that'll pierce the heavens!
+    .suffix = Mech Weapon, Melee, Combat

Resources/Locale/en-US/_prototypes/entities/objects/specific/mech/weapons/melee/debug.ftl

@@ -0,0 +1,3 @@
+ent-WeaponMechDebugMelle = debug bam
+    .desc = A robust thing.
+    .suffix = Mech Weapon, DEBUG, Melee

Resources/Locale/en-US/_prototypes/entities/objects/specific/mech/weapons/melee/industrial.ftl

@@ -0,0 +1,6 @@
+ent-WeaponMechMelleDrill = exosuit drill
+    .desc = Equipment for mining exosuits. This is the drill that'll pierce the rocks!
+    .suffix = Mech Weapon, Melee, Industrial
+ent-WeaponMechMelleDrillDiamond = diamond-tipped exosuit drill
+    .desc = Equipment for mining exosuits. This is an upgraded version of the drill that'll pierce the rocks!
+    .suffix = Mech Weapon, Melee, Industrial

Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/projectiles/shotgun.ftl

@@ -2,6 +2,8 @@ ent-PelletShotgunSlug = pellet (.50 slug)
     .desc = { ent-BaseBullet.desc }
 ent-PelletShotgunBeanbag = beanbag (.50)
     .desc = { ent-BaseBullet.desc }
+ent-PelletShotgunBeanbagSpread = { ent-PelletShotgunBeanbag }
+    .desc = { ent-PelletShotgunBeanbag.desc }
 ent-PelletShotgun = pellet (.50)
     .desc = { ent-BaseBullet.desc }
 ent-PelletShotgunSpread = { ent-PelletShotgun }

Resources/Locale/en-US/_strings/lathe/lathe-categories.ftl

@@ -1,7 +1,6 @@
 lathe-category-ammo = Ammo
 lathe-category-circuitry = Circuitry
 lathe-category-lights = Lights
-lathe-category-mechs = Mechs
 lathe-category-parts = Parts
 lathe-category-robotics = Robotics
 lathe-category-tools = Tools
@@ -10,3 +9,14 @@ lathe-category-weapons = Weapons
 lathe-category-food = Food
 lathe-category-chemicals = Chemicals
 lathe-category-materials = Materials
+
+lathe-category-mechs-vim = Vim
+lathe-category-mechs-honker = H.O.N.K.
+lathe-category-mechs-hamptr = H.A.M.P.T.R.
+lathe-category-mechs-ripley = Riley
+lathe-category-mechs-ripleymkii = Riley MK-II
+lathe-category-mechs-clarke = Clarke
+lathe-category-mechs-gygax = Gygax
+lathe-category-mechs-durand = Durand
+lathe-category-mechs-equipment = Mech equipment
+lathe-category-mechs-weapons = Mech weapons

Resources/Locale/en-US/_strings/research/technologies.ftl

@@ -14,6 +14,10 @@ research-technology-power-generation = Power Generation
 research-technology-atmospheric-tech = Atmospherics
 research-technology-shuttlecraft = Shuttlecraft
 research-technology-ripley-aplu = Ripley APLU
+research-technology-ripley-mkii = Ripley MK-II
+research-technology-clarke = Clarke
+research-technology-gygax = Gygax
+research-technology-durand = Durand
 research-technology-advanced-atmospherics = Advanced Atmospherics
 research-technology-advanced-tools = Advanced Tools
 research-technology-super-powercells = Super Powercells
@@ -41,6 +45,7 @@ research-technology-advanced-shuttle-weapon = Advanced shuttle weapons
 research-technology-energy-gun = Energy weaponry
 research-technology-energy-gun-advance = Advanced energy weaponry
 research-technology-advance-laser = Military-grade energy weaponry
+research-technology-explosive-mech-ammunition = Explosive Mech Ammunition
 
 research-technology-basic-robotics = Basic Robotics
 research-technology-basic-anomalous-research = Basic Anomalous Research
@@ -71,6 +76,7 @@ research-technology-robotic-cleanliness = Robotic Cleanliness
 research-technology-advanced-cleaning = Advanced Cleaning
 research-technology-meat-manipulation = Meat Manipulation
 research-technology-honk-mech = H.O.N.K. Mech
+research-technology-honk-weapons = Bananium Weapons
 research-technology-advanced-spray = Advanced Spray
 research-technology-bluespace-cargo-transport = Bluespace Cargo Transport
 research-technology-quantum-fiber-weaving = Quantum Fiber Weaving

Resources/Locale/en-US/_strings/store/uplink-catalog.ftl

@@ -133,6 +133,12 @@ uplink-reinforcement-radio-nukeops-desc =  Radio in a nuclear operative of extre
 uplink-reinforcement-radio-cyborg-assault-name = Syndicate Assault Cyborg Teleporter
 uplink-reinforcement-radio-cyborg-assault-desc =  A lean, mean killing machine with access to an Energy Sword, LMG, Cryptographic Sequencer, and a Pinpointer.
 
+uplink-mech-teleporter-heavy-name = Heavy Mech teleporter
+uplink-mech-teleporter-heavy-desc = Contains Cybersan heavy armored mech with integrated chainsword, Ultra AC-2, LBX AC 10 "Scattershot", BRM-6 Missile Rack and P-X Tesla Cannon.
+
+uplink-mech-teleporter-assault-name = Assault Mech teleporter
+uplink-mech-teleporter-assault-desc = Contains Cybersan lightly armored mech with integrated chainsword, LBX AC 10 "Scattershot", SRM-8 Light Missile Rack and P-X Tesla Cannon.
+
 uplink-stealth-box-name = Stealth Box
 uplink-stealth-box-desc = A box outfitted with stealth technology. Sneak around unnoticed, but don't move too fast or you'll be revealed!
 

Resources/Locale/ru-RU/_prototypes/_sunrise/actions/nvg.ftl

@@ -1,4 +1,4 @@
 ent-NVToggleAction = Переключение ПНВ
     .desc = Переключает ПНВ.
 ent-SwitchNightVision = Переключение ночного видения
-    .desc = Переключяет ночное видение.
+    .desc = Переключяет ночное видение.

Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/armory.ftl

@@ -7,4 +7,4 @@ ent-CrateArmoryMP5 = ящик MP5
 ent-CrateArmoryMagazineBoxLightRifleBig = ящик патронов .30 винтовочные
     .desc = Содержит три ящика патрон калибра .30, в сумме 600 патрон. Чтобы открыть необходим доступ уровня Оружейной.
 ent-CrateArmoryMagazineBoxRifleBig = ящик патронов .20 винтовочные
-    .desc = Содержит три ящика патрон калибра .20, в сумме 600 патрон. Чтобы открыть необходим доступ уровня Оружейной.
+    .desc = Содержит три ящика патрон калибра .20, в сумме 600 патрон. Чтобы открыть необходим доступ уровня Оружейной.

Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/security.ftl

@@ -2,4 +2,3 @@ ent-CrateSecurityWebbing = ящик с РПС охраны
     .desc = Ящик, содержащий две РПС охраны. Чтобы открыть необходим уровень доступа Служба безопасности.
 ent-CrateSecurityGlovesCombat = ящик с боевыми перчатками
     .desc = Ящик, содержащий трое боевых перчаток. Чтобы открыть необходим уровень доступа Служба безопасности.
-

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/eyes/nvg.ftl

@@ -1,4 +1,5 @@
 ent-ClothingEyesVision = ПНВ
     .desc = Прибор ночного видения. Обеспечивает изображение местности в условиях низкой освещенности.
 ent-ClothingEyesVisionNuki = { ent-ClothingEyesVision }
-    .desc = { ent-ClothingEyesVision.desc }
+    .desc = { ent-ClothingEyesVision.desc }
+    .suffix = ЯО

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/consumable/drinks/drinks.ftl

@@ -22,6 +22,8 @@ ent-DrinkEspressoMartiniGlass = { ent-DrinkGlass }
 ent-DrinkKvassGlass = { ent-DrinkGlass }
     .suffix = Квас
     .desc = { ent-DrinkGlass.desc }
+ent-DrinkNastoykaRomashki = настойка ромашки
+    .desc = { ent-DrinkGlassBase.desc }
 ent-DrinkMaiTaiGlass = { ent-DrinkGlass }
     .suffix = Май Тай
     .desc = { ent-DrinkGlass.desc }

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/toys.ftl

@@ -94,3 +94,5 @@ ent-PlushieMiron = Плюшевый Мирон Потапов
     .desc = Плюшевая игрушка ветерана медицинского отдела, готового делиться опытом с другими. На бирке указано "Изготовлен из натуральных химикатов"
 ent-PlushieBublegum = Плюшевый Бубльгум
     .desc = Милая игрушка ужасающего чудовища из глубин лаваленда. Она не способна вам навредить
+ent-PlushieCikuus = Плюшевая Лилит Бонавентура
+    .desc = Милая вульпочка в костюме горничной, она приятно пахнет цветами и с радостью уберет ваш дом. Кто о такой не мечтал?

Resources/Locale/ru-RU/_prototypes/_sunrise/reagents/meta/consumable/drink/drinks.ftl

@@ -0,0 +1,2 @@
+reagent-name-chamomile-tincture = настойка ромашки
+reagent-desc-chamomile-tincture = Натуральная настойка ромашки, успокаивающая и поддерживающая здоровье.

Resources/Locale/ru-RU/_prototypes/actions/types.ftl

@@ -6,6 +6,8 @@ ent-ActionTurnUndead = Обратиться в зомби
     .desc = Поддайтесь заражению и превратитесь в зомби.
 ent-ActionToggleLight = Переключить фонарь
     .desc = Включает или выключает фонарь.
+ent-ActionToggleDome = Переключить энергетический купол
+    .desc = Включите или выключите энергетический барьер.
 ent-ActionOpenStorageImplant = Открыть имплант Хранилище
     .desc = Открывает доступ к хранилищу, спрятанному под вашей кожей.
 ent-ActionActivateMicroBomb = Активировать имплант Микробомба

Resources/Locale/ru-RU/_prototypes/catalog/fills/crates/syndicate.ftl

@@ -5,3 +5,9 @@ ent-CrateCybersunJuggernautBundle = набор джаггернаута Cybersun
     .suffix = Заполненный
 ent-CrateSyndicateSuperSurplusBundle = ящик суперприпасов синдиката
     .desc = Содержит случайное снаряжение Синдиката, общей стоимостью в 125 телекристаллов.
+ent-CrateCybersunDarkGygaxBundle = набор Cybersun "Гигакс"
+    .desc = Содержит набор легкобронированных мехов от компании Cybersun.
+    .suffix = Заполненный
+ent-CrateCybersunMaulerBundle = набор Cybersun "Маулер"
+    .desc = Содержит набор тяжелых бронированных мехов от компании Cybersun.
+    .suffix = Заполненный

Resources/Locale/ru-RU/_prototypes/entities/clothing/head/hats.ftl

@@ -116,6 +116,8 @@ ent-ClothingHeadHatPirateTricord = пиратская треуголка
     .desc = Йо хо хо и бутылка рома!
 ent-ClothingHeadHatWatermelon = арбузный шлем
     .desc = Небрежно отрезанная половина арбуза, выпотрошенная изнутри, для ношения в качестве шлема. Она способна смягчить удар по голове.
+ent-ClothingHeadHatHolyWatermelon = арбузный ореол
+    .desc = Святые угодники.
 ent-ClothingHeadHatSyndie = шапка Синдиката
     .desc = Сувенирная шапка из Синдиленда, производство которой уже закрыто.
 ent-ClothingHeadHatSyndieMAA = фуражка мастера по оружию

Resources/Locale/ru-RU/_prototypes/entities/markers/spawners/mechs.ftl

@@ -1,4 +1,35 @@
 ent-SpawnMechRipley = спавнер Рипли АВП
     .desc = { ent-MarkerBase.desc }
+ent-SpawnMechRipley2 = спавнер Рипли АВП MK-II
+    .desc = { ent-MarkerBase.desc }
 ent-SpawnMechHonker = спавнер Х.О.Н.К.
     .desc = { ent-MarkerBase.desc }
+ent-SpawnMechHonkerFilled = спавнер Х.О.Н.К.
+    .desc = { ent-MarkerBase.desc }
+    .suffix = Заполнен
+ent-SpawnMechClarke = спавнер Кларк
+    .desc = { ent-MarkerBase.desc }
+ent-SpawnMechGygax = спавнер Гигакс
+    .desc = { ent-MarkerBase.desc }
+ent-SpawnMechDurand = спавнер Дюранд
+    .desc = { ent-MarkerBase.desc }
+ent-SpawnMechMarauder = спавнер Мародёр
+    .desc = { ent-MarkerBase.desc }
+ent-SpawnMechMarauderFilled = спавнер Мародёр
+    .desc = { ent-MarkerBase.desc }
+    .suffix = Заполнен
+ent-SpawnMechSeraph = спавнер Серафим
+    .desc = { ent-MarkerBase.desc }
+ent-SpawnMechSeraphFilled = спавнер Серафим
+    .desc = { ent-MarkerBase.desc }
+    .suffix = Заполнен
+ent-SpawnMechGygaxSyndie = спавнер Тёмный гигакс
+    .desc = { ent-MarkerBase.desc }
+ent-SpawnMechGygaxSyndieFilled = спавнер Тёмный гигакс
+    .desc = { ent-MarkerBase.desc }
+    .suffix = Заполнен
+ent-SpawnMechMaulerSyndie = спавнер Маулер
+    .desc = { ent-MarkerBase.desc }
+ent-SpawnMechMaulerSyndieFilled = спавнер Маулер
+    .desc = { ent-MarkerBase.desc }
+    .suffix = Заполнен

Resources/Locale/ru-RU/_prototypes/entities/objects/consumable/food/produce.ftl

@@ -155,3 +155,5 @@ ent-FoodCherry = вишня
     .desc = Сочная красная вишня с косточкой внутри.
 ent-TrashCherryPit = косточка вишни
     .desc = { ent-FoodInjectableBase.desc }
+ent-FoodAnomalyBerry = аномальная ягода
+    .desc = Странный синий фрукт. Что-то в нем не так.

Resources/Locale/ru-RU/_prototypes/entities/objects/devices/cartridges.ftl

@@ -10,3 +10,5 @@ ent-LogProbeCartridge = картридж Зонд логов
     .desc = Программа для получения логов доступа с устройств
 ent-WantedListCartridge = картридж списка разыскиваемых
     .desc = Программа для получения списка разыскиваемых лиц.
+ent-AstroNavCartridge = Картридж АстроНав
+    .desc = Программа для навигации, предоставляющая GPS-координаты.

Resources/Locale/ru-RU/_prototypes/entities/objects/devices/electronics/exosuit_components.ftl

@@ -0,0 +1,12 @@
+ent-BaseExosuitParts = base components
+    .desc = { ent-BaseItem.desc }
+ent-DurandArmorPlate = бронепластины Дюранда
+    .desc = Броневые пластины из пластали для экзокостюма Дюранд.
+ent-GygaxArmorPlate = бронепластины Гигакса
+    .desc = Броневые пластины из стали для экзокостюма Гигакс.
+ent-RipleyUpgradeKit = комплект модернизации экзокостюма
+    .desc = Этот комплект позволяет собрать экзокостюм Рипли MK-II.
+ent-MechAirTank = воздушный баллон экзокостюма
+    .desc = Специальный воздушный баллон, способный вместить большое количество воздуха.
+ent-MechThruster = ускоритель экзокостюма
+    .desc = Ускоритель, который позволяет экзокостюму безопасно двигаться при отсутствии гравитации.

Resources/Locale/ru-RU/_prototypes/entities/objects/devices/electronics/mech.ftl

@@ -12,3 +12,19 @@ ent-HamtrCentralElectronics = центральный модуль управле
     .desc = Центр управления электрооборудованием меха ХАМЯК.
 ent-HamtrPeripheralsElectronics = модуль управления периферией ХАМЯК
     .desc = Система управления электрическими периферийными устройствами меха ХАМЯК.
+ent-ClarkeCentralElectronics = центральный модуль управления Кларк
+    .desc = Центр управления электрооборудованием меха Кларк.
+ent-ClarkePeripheralsElectronics = модуль управления периферией Кларк
+    .desc = Система управления электрическими периферийными устройствами меха Кларк.
+ent-GygaxCentralElectronics = центральный модуль управления Гигакс
+    .desc = Центр управления электрооборудованием меха Гигакс.
+ent-GygaxPeripheralsElectronics = модуль управления периферией Гигакс
+    .desc = Система управления электрическими периферийными устройствами меха Гигакс.
+ent-GygaxTargetingElectronics = модуль управления огнём Гигакс
+    .desc = Электрическая система управления огнём меха Гигакс.
+ent-DurandCentralElectronics = центральный модуль управления Дюранд
+    .desc = Центр управления электрооборудованием меха Дюранд.
+ent-DurandPeripheralsElectronics = модуль управления периферией Дюранд
+    .desc = Система управления электрическими периферийными устройствами меха Дюранд.
+ent-DurandTargetingElectronics = модуль управления огнём Дюранд
+    .desc = Электрическая система управления огнём меха Дюранд.

Resources/Locale/ru-RU/_prototypes/entities/objects/specific/hydroponics/seeds.ftl

@@ -139,3 +139,5 @@ ent-FakeCapfruitSeeds = { ent-RealCapfruitSeeds }
     .desc = { ent-RealCapfruitSeeds.desc }
 ent-CherrySeeds = пакет семян вишни
     .desc = { ent-SeedBase.desc }
+ent-AnomalyBerrySeeds = пакет семян (аномальная ягода)
+    .desc = { ent-SeedBase.desc }

Resources/Locale/ru-RU/_prototypes/entities/objects/specific/mech/mech_construction.ftl

@@ -1,5 +1,57 @@
 ent-BaseMechPart = { "" }
     .desc = { "" }
+ent-BaseClarkePart = { ent-BaseMechPart }
+    .desc = { ent-BaseMechPart.desc }
+ent-BaseClarkePartItem = { ent-BaseClarkePart }
+    .desc = { ent-BaseClarkePart.desc }
+ent-ClarkeHarness = каркас Кларка
+    .desc = Ядро меха Кларк.
+ent-ClarkeHead = голова Кларка
+    .desc = Голова меха Кларк. Устанавливается на шасси меха.
+ent-ClarkeRArm = правая рука Кларка
+    .desc = Правая рука меха Кларк. Устанавливается на шасси меха.
+ent-ClarkeLArm = левая рука Кларка
+    .desc = Левая рука меха Кларк. Устанавливается на шасси меха.
+ent-ClarkeTreads = гусеницы Кларка
+    .desc = Гусеницы меха Кларк. Устанавливается на шасси меха.
+ent-ClarkeChassis = шасси Кларка
+    .desc = Незавершённое шасси меха Кларк.
+ent-BaseDurandPart = { ent-BaseMechPart }
+    .desc = { ent-BaseMechPart.desc }
+ent-BaseDurandPartItem = { ent-BaseDurandPart }
+    .desc = { ent-BaseDurandPart.desc }
+ent-DurandHarness = каркас Дюранда
+    .desc = Ядро меха Дюранд.
+ent-DurandHead = голова Дюранда
+    .desc = Голова меха Дюранд. Устанавливается на шасси меха.
+ent-DurandLArm = левая рука Дюранда
+    .desc = Левая рука меха Дюранд. Устанавливается на шасси меха.
+ent-DurandLLeg = левая нога Дюранда
+    .desc = Левая нога меха Дюранд. Устанавливается на шасси меха.
+ent-DurandRLeg = правая нога Дюранда
+    .desc = Правая нога меха Дюранд. Устанавливается на шасси меха.
+ent-DurandRArm = правая рука Дюранда
+    .desc = Правая рука меха Дюранд. Устанавливается на шасси меха.
+ent-DurandChassis = шасси Дюранда
+    .desc = Незавершённое шасси меха Дюранд.
+ent-BaseGygaxPart = { ent-BaseMechPart }
+    .desc = { ent-BaseMechPart.desc }
+ent-BaseGygaxPartItem = { ent-BaseGygaxPart }
+    .desc = { ent-BaseGygaxPart.desc }
+ent-GygaxHarness = каркас Гигакса
+    .desc = Ядро меха Гигакс.
+ent-GygaxHead = голова Гигакса
+    .desc = Голова меха Гигакс. Устанавливается на шасси меха.
+ent-GygaxLArm = левая рука Гигакса
+    .desc = Левая рука меха Гигакс. Устанавливается на шасси меха.
+ent-GygaxLLeg = левая нога Гигакса
+    .desc = Левая нога меха Гигакс. Устанавливается на шасси меха.
+ent-GygaxRLeg = правая нога Гигакса
+    .desc = Правая нога меха Гигакс. Устанавливается на шасси меха.
+ent-GygaxRArm = правая рука Гигакса
+    .desc = Правая рука меха Гигакс. Устанавливается на шасси меха.
+ent-GygaxChassis = шасси Гигакса
+    .desc = Незавершённое шасси меха Гигакс.
 ent-BaseRipleyPart = { ent-BaseMechPart }
     .desc = { ent-BaseMechPart.desc }
 ent-BaseRipleyPartItem = { ent-BaseRipleyPart }
@@ -16,6 +68,12 @@ ent-RipleyRArm = правая рука Рипли
     .desc = Правая рука меха Рипли АВП. Устанавливается на шасси меха.
 ent-RipleyChassis = шасси Рипли
     .desc = Незавершённое шасси меха Рипли АВП.
+ent-BaseRipleyMKIIPart = { ent-BaseMechPart }
+    .desc = { ent-BaseMechPart.desc }
+ent-RipleyMKIIHarness = каркас Рипли MK-II
+    .desc = Ядро меха Рипли АВП MK-II.
+ent-RipleyMKIIChassis = шасси Рипли MK-II
+    .desc = Незавершённое шасси меха Рипли АВП MK-II.
 ent-BaseHonkerPart = { ent-BaseMechPart }
     .desc = { ent-BaseMechPart.desc }
 ent-BaseHonkerPartItem = { ent-BaseHonkerPart }

Resources/Locale/ru-RU/_prototypes/entities/objects/specific/mech/mecha_equipment.ftl

@@ -1,3 +1,14 @@
+ent-DebugMechEquipment = { "" }
+    .suffix = ДЕБАГ
+    .desc = { "" }
+ent-CombatMechEquipment = { "" }
+    .desc = { "" }
+ent-IndustrialMechEquipment = { "" }
+    .desc = { "" }
+ent-SpecialMechEquipment = { "" }
+    .desc = { "" }
+ent-SmallMechEquipment = { "" }
+    .desc = { "" }
 ent-BaseMechEquipment = { ent-BaseItem }
     .desc = { ent-BaseItem.desc }
 ent-MechEquipmentGrabber = гидравлическая клешня

Resources/Locale/ru-RU/_prototypes/entities/objects/specific/mech/mechs.ftl

@@ -1,3 +1,11 @@
+ent-CombatMech = { "" }
+    .desc = { "" }
+ent-IndustrialMech = { "" }
+    .desc = { "" }
+ent-SpecialMech = { "" }
+    .desc = { "" }
+ent-SmallMech = { "" }
+    .desc = { "" }
 ent-BaseMech = { "" }
     .desc = { "" }
 ent-MechRipley = Рипли АВП
@@ -5,11 +13,24 @@ ent-MechRipley = Рипли АВП
 ent-MechRipleyBattery = { ent-MechRipley }
     .suffix = Батарея
     .desc = { ent-MechRipley.desc }
+ent-MechRipley2 = Рипли АВП MK-II
+    .desc = Рипли АВП "MK-II" имеет герметичную кабину для космических операций, но дополнительный вес замедляет его работу.
+ent-MechRipley2Battery = { ent-MechRipley2 }
+    .suffix = Батарея
+    .desc = { ent-MechRipley2.desc }
+ent-MechClarke = Кларк
+    .desc = Быстроходный мех для космических путешествий. Имеет встроенный ускоритель.
+ent-MechClarkeBattery = { ent-MechClarke }
+    .suffix = Батарея
+    .desc = { ent-MechClarke.desc }
 ent-MechHonker = Х.О.Н.К.
     .desc = Произведённый компанией "Тирания Хонка, инкорпорейтед", этот экзокостюм предназначен для тяжёлой поддержки клоунов. Используется, чтобы сеять радость жизни и веселье. ХОНК!
 ent-MechHonkerBattery = { ent-MechHonker }
     .suffix = Батарея
     .desc = { ent-MechHonker.desc }
+ent-MechHonkerFilled = { ent-MechHonkerBattery }
+    .suffix = Батарея, Заполненный
+    .desc = { ent-MechHonkerBattery.desc }
 ent-MechHamtr = ХАМЯК
     .desc = Экспериментальный мех, использующий нейрокомпьютерный интерфейс для подключения к мозгу хомяка.
 ent-MechHamtrBattery = { ent-MechHamtr }
@@ -20,3 +41,45 @@ ent-MechVim = ВИМ
 ent-MechVimBattery = { ent-MechVim }
     .suffix = Батарея
     .desc = { ent-MechVim.desc }
+ent-MechGygax = Гигакс
+    .desc = Несмотря на легкую броню, Гигакс обладает невероятной подвижностью благодаря своей способности, позволяющей ему пробивать стены на высокой скорости.
+ent-MechGygaxBattery = { ent-MechGygax }
+    .suffix = Батарея
+    .desc = { ent-MechGygax.desc }
+ent-MechDurand = Дюранд
+    .desc = Медленный, но мускулистый боевой экзокостюм, который особенно страшен в замкнутых пространствах благодаря своим ударам. Ксеносы ненавидят его!
+ent-MechDurandBattery = { ent-MechDurand }
+    .suffix = Батарея
+    .desc = { ent-MechDurand.desc }
+ent-MechMarauder = Мародёр
+    .desc = Похоже, мы все спасены.
+ent-MechMarauderBattery = { ent-MechMarauder }
+    .suffix = Батарея
+    .desc = { ent-MechMarauder.desc }
+ent-MechMarauderFilled = { ent-MechMarauderBattery }
+    .suffix = Батарея, Заполненный
+    .desc = { ent-MechMarauderBattery.desc }
+ent-MechSeraph = Серафим
+    .desc = Это последнее, что вы увидите.
+ent-MechSeraphBattery = { ent-MechSeraph }
+    .suffix = Батарея
+    .desc = { ent-MechSeraph.desc }
+ent-MechSeraphFilled = { ent-MechSeraphBattery }
+    .suffix = Батарея, Заполненный
+    .desc = { ent-MechSeraphBattery.desc }
+ent-MechGygaxSyndie = Тёмный гигакс
+    .desc = Модифицированный Гигакс, используемый в неблаговидных целях. На задней стороне бронепластины имеется надпись "Cybersun Inc.".
+ent-MechGygaxSyndieBattery = { ent-MechGygaxSyndie }
+    .suffix = Батарея
+    .desc = { ent-MechGygaxSyndie.desc }
+ent-MechGygaxSyndieFilled = { ent-MechGygaxSyndieBattery }
+    .suffix = Батарея, Заполненный
+    .desc = { ent-MechGygaxSyndieBattery.desc }
+ent-MechMaulerSyndie = Маулер
+    .desc = Модифицированный Мародёр, используемый Синдикатом, не такой маневренный, как Тёмный гигакс, но он компенсирует это броней и мощной огневой мощью. На задней стороне бронепластины имеется надпись "Cybersun Inc.".
+ent-MechMaulerSyndieBattery = { ent-MechMaulerSyndie }
+    .suffix = Батарея
+    .desc = { ent-MechMaulerSyndie.desc }
+ent-MechMaulerSyndieFilled = { ent-MechMaulerSyndieBattery }
+    .suffix = Батарея, Заполненный
+    .desc = { ent-MechMaulerSyndieBattery.desc }

Resources/Locale/ru-RU/_prototypes/entities/objects/specific/mech/weapons/gun/base.ftl

@@ -0,0 +1,2 @@
+ent-BaseMechWeaponRange = { ent-BaseMechEquipment }
+    .desc = { ent-BaseMechEquipment.desc }

Resources/Locale/ru-RU/_prototypes/entities/objects/specific/mech/weapons/gun/combat.ftl

@@ -0,0 +1,39 @@
+ent-WeaponMechCombatPulseRifle = eZ-14 mk2 тяжёлая импульсная винтовка
+    .desc = Стреляет тяжёлыми импульсными лазерами.
+    .suffix = Оружие мехов, Стрелковое, Боевое, Импульсное
+ent-WeaponMechCombatImmolationGun = ZFI иммоляционная лучевая пушка
+    .desc = Оружие для боевых мехов, стреляющее высокотемпературными лучами.
+    .suffix = Оружие мехов, Стрелковое, Боевое, Лазерное
+ent-WeaponMechCombatSolarisLaser = лазерная пушка CH-LC "Solaris"
+    .desc = Экспериментальная боевая лазерная пушка, наносящая больший урон, но и имеющая большую перезарядку, чем "Firedart".
+    .suffix = Оружие мехов, Стрелковое, Боевое, Лазерное
+ent-WeaponMechCombatFiredartLaser = лазерная пушка CH-PS "Firedart"
+    .desc = Стандартным боевым вооружением мехов является боевой лазер.
+    .suffix = Оружие мехов, Стрелковое, Боевое, Лазерное
+ent-WeaponMechCombatTeslaCannon = P-X Tesla Cannon
+    .desc = Оружие для боевых мехов, стреляющее энергетическими шарами, основанное на принципе экспериментального двигателя Теслы.
+    .suffix = Оружие мехов, Стрелковое, Боевое, Тесла
+ent-WeaponMechCombatDisabler = CH-PD Disabler
+    .desc = Нелетальный навесной электрошокер, позволяющий обездвижить злоумышленников.
+    .suffix = Оружие мехов, Стрелковое, Боевое, Станнер
+ent-WeaponMechCombatTaser = Навесной электрошокер PBT "Пацификатор"
+    .desc = Навесной нелетальный электрошокер, позволяющий оглушить злоумышленников.
+    .suffix = Оружие мехов, Стрелковое, Боевое, Станнер, Адмемы
+ent-WeaponMechCombatShotgun = LBX AC 10 "Scattershot"
+    .desc = Навесной нелетальный электрошокер, позволяющий оглушить злоумышленников.
+    .suffix = Оружие мехов, Стрелковое, Боевое, Дробовик
+ent-WeaponMechCombatShotgunIncendiary = карабин FNX-99 "Аид"
+    .desc = Навесной карабин, стреляющий зажигательными патронами.
+    .suffix = Оружие мехов, Стрелковое, Боевое, Дробовик, Incendiary
+ent-WeaponMechCombatUltraRifle = Ultra AC-2
+    .desc = Навесной карабин, стреляющий зажигательными патронами.
+    .suffix = Оружие мехов, Стрелковое, Боевое, Автомат
+ent-WeaponMechCombatMissileRack8 = стойка для легких ракет SRM-8
+    .desc = Запускает низколетящие прорывные ракеты, предназначенные для взрыва только при поражении прочной цели.
+    .suffix = Оружие мехов, Стрелковое, Боевое, Легкая ракетница
+ent-WeaponMechCombatMissileRack6 = ракетная стойка BRM-6
+    .desc = Трубки должны загружаться снаружи.
+    .suffix = Оружие мехов, Стрелковое, Боевое, Ракетница
+ent-WeaponMechCombatFlashbangLauncher =  ракетная стойка ослепительных ракет SGL-6
+    .desc = Запускает низколетящие прорывные ракеты, предназначенные для взрыва только при поражении прочной цели.
+    .suffix = Оружие мехов, Стрелковое, Боевое, Ослепляющая

Resources/Locale/ru-RU/_prototypes/entities/objects/specific/mech/weapons/gun/debug.ftl

@@ -0,0 +1,9 @@
+ent-WeaponMechDebugBallistic = debug bang
+    .suffix = Mech Weapon, DEBUG, Ballistic
+    .desc = { ent-BaseMechWeaponRange.desc }
+ent-WeaponMechDebugLaser = debug pow
+    .desc = A weapon using light amplified by the stimulated emission of radiation.
+    .suffix = Mech Weapon, DEBUG, Laser
+ent-WeaponMechDebugDisabler = debug tew
+    .desc = A self-defense weapon that exhausts organic targets, weakening them until they collapse.
+    .suffix = Mech Weapon, DEBUG, Disabler

Resources/Locale/ru-RU/_prototypes/entities/objects/specific/mech/weapons/gun/industrial.ftl

@@ -0,0 +1,3 @@
+ent-WeaponMechIndustrialKineticAccelerator = протокинетический ускоритель экзокостюма
+    .desc = Стреляет кинетическими болтами с нормальным уроном на небольшом расстоянии.
+    .suffix = Оружие мехов, Стрелковое, Промышленное, кинетический ускоритель

Resources/Locale/ru-RU/_prototypes/entities/objects/specific/mech/weapons/gun/special.ftl

@@ -0,0 +1,6 @@
+ent-WeaponMechSpecialMousetrapMortar = мышеловочная мортира
+    .desc = Навесная пусковая установка для мышеловки.
+    .suffix = Оружие мехов, Стрелковое, Специальное, Мортира
+ent-WeaponMechSpecialBananaMortar = банановая мортира
+    .desc = Навесная пусковая установка для банановой кожуры.
+    .suffix = Оружие мехов, Стрелковое, Специальное, Мортира

Resources/Locale/ru-RU/_prototypes/entities/objects/specific/mech/weapons/melee/base.ftl

@@ -0,0 +1,2 @@
+ent-BaseMechWeaponMelee = { ent-BaseMechEquipment }
+    .desc = { ent-BaseMechEquipment.desc }

Resources/Locale/ru-RU/_prototypes/entities/objects/specific/mech/weapons/melee/combat.ftl

@@ -0,0 +1,3 @@
+ent-WeaponMechChainSword = Цепной меч экзокостюма
+    .desc = Экипировка для боевых экзокостюмов. Это механический цепной меч, который пронзит небеса!
+    .suffix = Оружие мехов, Ближнее, Боевое

Resources/Locale/ru-RU/_prototypes/entities/objects/specific/mech/weapons/melee/debug.ftl

@@ -0,0 +1,3 @@
+ent-WeaponMechDebugMelle = debug bam
+    .desc = A robust thing.
+    .suffix = Mech Weapon, DEBUG, Melee

Resources/Locale/ru-RU/_prototypes/entities/objects/specific/mech/weapons/melee/industrial.ftl

@@ -0,0 +1,6 @@
+ent-WeaponMechMelleDrill = бур для экзокостюма
+    .desc = Оборудование для добывающих экзокостюмов. Это бур, который пробивает скалы!
+    .suffix = Оружие мехов, Ближнее, Промышленное
+ent-WeaponMechMelleDrillDiamond = бур для экзокостюма с алмазным наконечником
+    .desc = Оборудование для добывающих экзокостюмов. Это усовершенствованная версия бура, который пробивает скалы!
+    .suffix = Оружие мехов, Ближнее, Промышленное

Resources/Locale/ru-RU/_prototypes/entities/objects/tools/energydome.ftl

@@ -2,3 +2,6 @@ ent-EnergyDomeGeneratorPersonalSyndie = Кроваво-красный генер
     .desc = Генератор щита, защищающий владельца от лазеров и пуль, но не позволяющий самому использовать оружие дальнего боя. Использует батареи.
 ent-EnergyDomeDirectionalTurtle = BR-40c "Черепаха"
     .desc = Двуручный тяжелый энергетический барьер с чрезвычайно низким пассивным потреблением энергии. Можно подключить с помощью мультитула.
+ent-EnergyDomeWiredTest = Статический купол
+    .desc = Тестовый энергетический барьер, питающийся от проводки станции. Я не знаю, как, черт возьми, сбалансировать его.....
+    .suffix = НЕ ОБЪЕДИНЯТЬ

Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/projectiles/shotgun.ftl

@@ -2,6 +2,8 @@ ent-PelletShotgunSlug = дробина (.50 пуля)
     .desc = { ent-BaseBullet.desc }
 ent-PelletShotgunBeanbag = дробина (.50)
     .desc = { ent-BaseBullet.desc }
+ent-PelletShotgunBeanbagSpread = { ent-PelletShotgunBeanbag }
+    .desc = { ent-PelletShotgunBeanbag.desc }
 ent-PelletShotgun = дробина (.50)
     .desc = { ent-BaseBullet.desc }
 ent-PelletShotgunSpread = { ent-PelletShotgun }

Resources/Locale/ru-RU/_prototypes/entities/structures/machines/computers/base_structurecomputers.ftl

@@ -1,2 +1,4 @@
 ent-BaseComputer = компьютер
     .desc = { ent-ComputerFrame.desc }
+ent-BaseComputerAiAccess = { ent-BaseComputer }
+    .desc = { ent-BaseComputer.desc }

Resources/Locale/ru-RU/_prototypes/gamerules/unknown_shuttles.ftl

@@ -22,6 +22,8 @@ ent-UnknownShuttleGym = { ent-BaseUnknownShuttleRule }
     .desc = { ent-BaseUnknownShuttleRule.desc }
 ent-UnknownShuttleNTIncorporation = { ent-BaseUnknownShuttleRule }
     .desc = { ent-BaseUnknownShuttleRule.desc }
+ent-UnknownShuttleInstigator = { ent-BaseUnknownShuttleRule }
+    .desc = { ent-BaseUnknownShuttleRule.desc }
 ent-UnknownShuttleJoe = { ent-BaseUnknownShuttleRule }
     .desc = { ent-BaseUnknownShuttleRule.desc }
 ent-UnknownShuttleLambordeere = { ent-BaseUnknownShuttleRule }

Resources/Locale/ru-RU/_prototypes/objectives/traitor.ftl

@@ -46,6 +46,8 @@ ent-CaptainJetpackStealObjective = { ent-BaseCaptainObjective }
     .desc = { ent-BaseCaptainObjective.desc }
 ent-PlutoniumCoreStealObjective = { ent-BaseTraitorStealObjective }
     .desc = { ent-BaseTraitorStealObjective.desc }
+ent-StealSupermatterSliverObjective = { ent-BaseTraitorStealObjective }
+    .desc = { ent-BaseTraitorStealObjective.desc }
 ent-CaptainGunStealObjective = { ent-BaseCaptainObjective }
     .desc = { ent-BaseCaptainObjective.desc }
 ent-NukeDiskStealObjective = { ent-BaseCaptainObjective }

Resources/Locale/ru-RU/_strings/_sunrise/administration/ui/actions.ftl

@@ -1 +1 @@
-admin-player-actions-screenshot = Просмотр экрана
+admin-player-actions-screenshot = Просмотр экрана

Resources/Locale/ru-RU/_strings/_sunrise/flavors/flavor-profiles.ftl

@@ -1,2 +1,2 @@
 flavor-complex-fourteen-loko-soda-plus = как бунт в тюрьме
-flavor-nastoyka-romashki = как ромашка
+flavor-complex-nastoyka-romashki = как ромашка

Resources/Locale/ru-RU/_strings/lathe/lathe-categories.ftl

@@ -1,7 +1,6 @@
 lathe-category-ammo = Боеприпасы
 lathe-category-circuitry = Электроника
 lathe-category-lights = Лампы
-lathe-category-mechs = Мехи
 lathe-category-parts = Компоненты
 lathe-category-robotics = Робототехника
 lathe-category-tools = Инструменты
@@ -9,3 +8,13 @@ lathe-category-weapons = Вооружение
 lathe-category-food = Еда
 lathe-category-chemicals = Химикаты
 lathe-category-materials = Материалы
+lathe-category-mechs-vim = Вим
+lathe-category-mechs-honker = Х.О.Н.К.
+lathe-category-mechs-hamptr = Х.А.М.Т.Р.
+lathe-category-mechs-ripley = Рипли АВП
+lathe-category-mechs-ripleymkii = Рипли MK-II
+lathe-category-mechs-clarke = Кларк
+lathe-category-mechs-gygax = Гигакс
+lathe-category-mechs-durand = Дюранд
+lathe-category-mechs-equipment = Оборудование механоидов
+lathe-category-mechs-weapons = Вооружение механоидов

Resources/Locale/ru-RU/_strings/research/technologies.ftl

@@ -13,6 +13,10 @@ research-technology-power-generation = Генерация электроэнер
 research-technology-atmospheric-tech = Атмосферные технологии
 research-technology-shuttlecraft = Шаттлостроение
 research-technology-ripley-aplu = Рипли АВП
+research-technology-ripley-mkii = Рипли MK-II
+research-technology-clarke = Кларк
+research-technology-gygax = Гигакс
+research-technology-durand = Дюранд
 research-technology-advanced-atmospherics = Продвинутые атмос-технологии
 research-technology-advanced-tools = Продвинутые инструменты
 research-technology-super-powercells = Супербатареи
@@ -39,6 +43,7 @@ research-technology-experimental-battery-ammo = Экспериментальны
 research-technology-energy_barriers = Энергетические барьеры
 research-technology-basic-shuttle-armament = Базовое корабельное вооружение
 research-technology-advanced-shuttle-weapon = Продвинутое корабельное оружие
+research-technology-explosive-mech-ammunition = Взрывоопасные боеприпасы для меха
 research-technology-basic-robotics = Основы робототехники
 research-technology-basic-anomalous-research = Основы исследования аномалий
 research-technology-basic-xenoarcheology = Основы ксеноархеологии
@@ -65,6 +70,7 @@ research-technology-audio-visual-communication = А/В коммуникация
 research-technology-advanced-cleaning = Продвинутая уборка
 research-technology-meat-manipulation = Манипулирование мясом
 research-technology-honk-mech = Мех Х.О.Н.К.
+research-technology-honk-weapons = Бананиумное вооружение
 research-technology-advanced-spray = Продвинутые спреи
 research-technology-quantum-fiber-weaving = Плетение квантового волокна
 research-technology-bluespace-cargo-transport = Блюспейс-транспортировка грузов

Resources/Locale/ru-RU/_strings/store/uplink-catalog.ftl

@@ -92,6 +92,10 @@ uplink-reinforcement-radio-nukeops-name = Телепорт Ядерного оп
 uplink-reinforcement-radio-nukeops-desc = Телепортирует в качестве подкрепления сомнительного качества ядерного оперативника. Не имеет кнопки отключения, покупайте его только если вы готовы к вечеринке. У них будет базовое снаряжение ядерного оперативника.
 uplink-reinforcement-radio-cyborg-assault-name = Телепорт штурмового киборга Синдиката
 uplink-reinforcement-radio-cyborg-assault-desc = Машина для убийств с доступом к энергомечу, пулемёту, криптографическому секвенсору и пинпоинтеру.
+uplink-mech-teleporter-heavy-name = Телепорт тяжелого меха
+uplink-mech-teleporter-heavy-desc = Содержит тяжелобронированный мех Cybersan с интегрированными цепным мечом, Ultra AC-2, LBX AC 10 "Картечь", ракетной установкой BRM-6 и пушкой P-X Tesla.
+uplink-mech-teleporter-assault-name = Телепорт штурмового меха
+uplink-mech-teleporter-assault-desc = Содержит легкобронированный мех Cybersan с интегрированными цепным мечом, LBX AC 10 "Картечь", легкой ракетной установкой SRM-8 и пушкой P-X Tesla.
 uplink-stealth-box-name = Стелс-коробка
 uplink-stealth-box-desc = Ящик, оснащённый технологией невидимости, проникните везде и не двигайтесь слишком быстро!
 uplink-headset-name = Полноразмерная гарнитура Синдиката

Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml

@@ -30,3 +30,33 @@
   components:
     - type: SurplusBundle
       totalPrice: 125
+
+- type: entity
+  id: CrateCybersunDarkGygaxBundle
+  suffix: Filled
+  parent: CrateSyndicate
+  name: Cybersun gygax bundle
+  description: Contains a set of Cybersan light armored mechs.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MechGygaxSyndieFilled
+      - id: DoubleEmergencyOxygenTankFilled
+      - id: DoubleEmergencyNitrogenTankFilled
+      - id: ToolboxSyndicateFilled
+      - id: PlushieNuke
+
+- type: entity
+  id: CrateCybersunMaulerBundle
+  suffix: Filled
+  parent: CrateSyndicate
+  name: Cybersun mauler bundle
+  description: Contains a set of Cybersan heavy armored mechs.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MechMaulerSyndieFilled
+      - id: DoubleEmergencyOxygenTankFilled
+      - id: DoubleEmergencyNitrogenTankFilled
+      - id: ToolboxSyndicateFilled
+      - id: PlushieNuke

Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml

@@ -6,6 +6,6 @@
     DrinkTeacup: 5
     DrinkGreenTea: 5
     DrinkHotCoco: 5
-    DrinkNastoykaRomashki: 5 # Sunrise-edit
+    DrinkChamomileTincture: 5 # Sunrise-edit
   emaggedInventory:
     DrinkNothing: 2

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -1415,6 +1415,38 @@
   - !type:ListingLimitedStockCondition
     stock: 1
 
+- type: listing
+  id: UplinkDarkGygax
+  name: uplink-mech-teleporter-assault-name
+  description: uplink-mech-teleporter-assault-desc
+  icon: { sprite: /Textures/Objects/Specific/Mech/mecha.rsi, state: darkgygax }
+  productEntity: CrateCybersunDarkGygaxBundle
+  cost:
+    Telecrystal: 100
+  categories:
+  - UplinkAllies
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+
+- type: listing
+  id: UplinkMauler
+  name: uplink-mech-teleporter-heavy-name
+  description: uplink-mech-teleporter-heavy-desc
+  icon: { sprite: /Textures/Objects/Specific/Mech/mecha.rsi, state: mauler }
+  productEntity: CrateCybersunMaulerBundle
+  cost:
+    Telecrystal: 150
+  categories:
+  - UplinkAllies
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+
 # Implants
 
 - type: listing

Resources/Prototypes/Damage/modifier_sets.yml

@@ -354,3 +354,76 @@
   flatReductions:
     # can't punch the endoskeleton to death
     Blunt: 5
+    
+# Mech armor
+- type: damageModifierSet
+  id: ThinArmor
+  coefficients:
+    Blunt: 0.8
+    Slash: 0.8
+    Piercing: 0.9
+    Shock: 1.2
+    Heat: 0.8
+  flatReductions:
+    Blunt: 3
+    Heat: 2
+
+- type: damageModifierSet
+  id: LightArmor
+  coefficients:
+    Blunt: 0.75
+    Slash: 0.75
+    Piercing: 0.7
+    Shock: 1.2
+    Heat: 0.7
+  flatReductions:
+    Blunt: 5
+    Heat: 5
+
+- type: damageModifierSet
+  id: MediumArmorNT
+  coefficients:
+    Blunt: 0.6
+    Slash: 0.6
+    Piercing: 0.65
+    Shock: 1.4
+    Heat: 0.7
+  flatReductions:
+    Blunt: 8
+    Heat: 10
+
+- type: damageModifierSet
+  id: HeavyArmorNT
+  coefficients:
+    Blunt: 0.5
+    Slash: 0.5
+    Piercing: 0.35
+    Shock: 1.8
+    Heat: 0.6
+  flatReductions:
+    Blunt: 15
+    Heat: 15
+
+- type: damageModifierSet
+  id: MediumArmorSyndi
+  coefficients:
+    Blunt: 0.6
+    Slash: 0.6
+    Piercing: 0.6
+    Shock: 1.4
+    Heat: 0.75
+  flatReductions:
+    Blunt: 8
+    Heat: 5
+
+- type: damageModifierSet
+  id: HeavyArmorSyndi
+  coefficients:
+    Blunt: 0.5
+    Slash: 0.5
+    Piercing: 0.4
+    Shock: 1.8
+    Heat: 0.7
+  flatReductions:
+    Blunt: 10
+    Heat: 7

Resources/Prototypes/Entities/Markers/Spawners/mechs.yml

@@ -12,6 +12,20 @@
     prototypes:
       - MechRipleyBattery
 
+- type: entity
+  name: Ripley APLU MK-II Spawner
+  id: SpawnMechRipley2
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: Objects/Specific/Mech/mecha.rsi
+        state: ripleymkii
+  - type: ConditionalSpawner
+    prototypes:
+      - MechRipley2Battery
+
 - type: entity
   name: H.O.N.K. Spawner
   id: SpawnMechHonker
@@ -25,3 +39,176 @@
   - type: ConditionalSpawner
     prototypes:
       - MechHonkerBattery
+
+- type: entity
+  name: H.O.N.K. Spawner
+  suffix: Filled
+  id: SpawnMechHonkerFilled
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: Objects/Specific/Mech/mecha.rsi
+        state: honker
+  - type: ConditionalSpawner
+    prototypes:
+      - MechHonkerFilled
+
+- type: entity
+  name: Clarke Spawner
+  id: SpawnMechClarke
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: Objects/Specific/Mech/mecha.rsi
+        state: clarke
+  - type: ConditionalSpawner
+    prototypes:
+      - MechClarkeBattery
+
+- type: entity
+  name: Gygax Spawner
+  id: SpawnMechGygax
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: Objects/Specific/Mech/mecha.rsi
+        state: gygax
+  - type: ConditionalSpawner
+    prototypes:
+      - MechGygaxBattery
+
+- type: entity
+  name: Durand Spawner
+  id: SpawnMechDurand
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: Objects/Specific/Mech/mecha.rsi
+        state: durand
+  - type: ConditionalSpawner
+    prototypes:
+      - MechDurandBattery
+      
+- type: entity
+  name: Marauder Spawner
+  id: SpawnMechMarauder
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: Objects/Specific/Mech/mecha.rsi
+        state: marauder
+  - type: ConditionalSpawner
+    prototypes:
+      - MechMarauderBattery
+
+- type: entity
+  name: Marauder Spawner
+  suffix: Filled
+  id: SpawnMechMarauderFilled
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: Objects/Specific/Mech/mecha.rsi
+        state: marauder
+  - type: ConditionalSpawner
+    prototypes:
+      - MechMarauderFilled
+
+- type: entity
+  name: Seraph Spawner
+  id: SpawnMechSeraph
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: Objects/Specific/Mech/mecha.rsi
+        state: seraph
+  - type: ConditionalSpawner
+    prototypes:
+      - MechSeraphBattery
+
+- type: entity
+  name: Seraph Spawner
+  suffix: Filled
+  id: SpawnMechSeraphFilled
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: Objects/Specific/Mech/mecha.rsi
+        state: seraph
+  - type: ConditionalSpawner
+    prototypes:
+      - MechSeraphFilled
+
+- type: entity
+  name: Dark Gygax Spawner
+  id: SpawnMechGygaxSyndie
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: Objects/Specific/Mech/mecha.rsi
+        state: darkgygax
+  - type: ConditionalSpawner
+    prototypes:
+      - MechGygaxSyndieBattery
+
+- type: entity
+  name: Dark Gygax Spawner
+  suffix: Filled
+  id: SpawnMechGygaxSyndieFilled
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: Objects/Specific/Mech/mecha.rsi
+        state: darkgygax
+  - type: ConditionalSpawner
+    prototypes:
+      - MechGygaxSyndieFilled
+
+- type: entity
+  name: Mauler Spawner
+  id: SpawnMechMaulerSyndie
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: Objects/Specific/Mech/mecha.rsi
+        state: mauler
+  - type: ConditionalSpawner
+    prototypes:
+      - MechMaulerSyndieBattery
+
+- type: entity
+  name: Mauler Spawner
+  suffix: Filled
+  id: SpawnMechMaulerSyndieFilled
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: Objects/Specific/Mech/mecha.rsi
+        state: mauler
+  - type: ConditionalSpawner
+    prototypes:
+      - MechMaulerSyndieFilled

Resources/Prototypes/Entities/Objects/Devices/Electronics/exosuit_components.yml

@@ -0,0 +1,104 @@
+- type: entity
+  id: BaseExosuitParts
+  parent: BaseItem
+  name: base components
+  abstract: true
+  components:
+  - type: Item
+    storedRotation: -90
+    size: Ginormous
+  - type: Sprite
+    sprite: Objects/Specific/Mech/mecha_equipment.rsi
+    state: mecha_camera
+  - type: StaticPrice
+    price: 100
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 200
+
+- type: entity
+  id: DurandArmorPlate
+  parent: BaseExosuitParts
+  name: durand armor plates
+  description: Armor plates made of plasteel for Durand exosuit.
+  components:
+    - type: Item
+      storedRotation: 0
+    - type: Sprite
+      sprite: Objects/Specific/Mech/durand_construction.rsi
+      state: durand_armor
+    - type: Tag
+      tags:
+      - DurandArmor
+    - type: GuideHelp
+      guides:
+      - Robotics
+
+- type: entity
+  id: GygaxArmorPlate
+  parent: BaseExosuitParts
+  name: gygax armor plates
+  description: Armor plates made of steel for Gygax exosuit.
+  components:
+    - type: Item
+      storedRotation: 0
+    - type: Sprite
+      sprite: Objects/Specific/Mech/gygax_construction.rsi
+      state: gygax_armor
+    - type: Tag
+      tags:
+      - GygaxArmor
+    - type: GuideHelp
+      guides:
+      - Robotics
+
+- type: entity
+  id: RipleyUpgradeKit
+  parent: BaseExosuitParts
+  name: exosuit upgrade kit
+  description: This kit allows you to assemble an exosuit Ripley MK-II.
+  components:
+    - type: Item
+      storedRotation: 0
+    - type: Sprite
+      state: ripleyupgrade
+    - type: Tag
+      tags:
+      - RipleyMKIIUpgradeKit
+    - type: GuideHelp
+      guides:
+      - Robotics
+
+- type: entity
+  id: MechAirTank
+  parent: BaseExosuitParts
+  name: exosuit air tank
+  description: A special air canister capable of holding a large amount of air.
+  components:
+    - type: Item
+      storedRotation: 0
+    - type: Sprite
+      state: mecha_air_tank
+    - type: Tag
+      tags:
+      - MechAirTank
+    - type: GuideHelp
+      guides:
+      - Robotics
+
+- type: entity
+  id: MechThruster
+  parent: BaseExosuitParts
+  name: exosuit thruster
+  description: A thruster with which the exosuit can safely move in the absence of gravity.
+  components:
+    - type: Item
+      storedRotation: 0
+    - type: Sprite
+      state: mecha_bin
+    - type: Tag
+      tags:
+      - MechThruster
+    - type: GuideHelp
+      guides:
+      - Robotics

Resources/Prototypes/Entities/Objects/Devices/Electronics/mech.yml

@@ -4,7 +4,7 @@
   id: RipleyCentralElectronics
   parent: BaseElectronics
   name: ripley central control module
-  description: The electrical control center for the ripley mech.
+  description: The electrical control center for the Ripley mech.
   components:
     - type: Item
       storedRotation: 0
@@ -22,7 +22,7 @@
   id: RipleyPeripheralsElectronics
   parent: BaseElectronics
   name: ripley peripherals control module
-  description: The electrical peripherals control for the ripley mech.
+  description: The electrical peripherals control for the Ripley mech.
   components:
     - type: Sprite
       sprite: Objects/Misc/module.rsi
@@ -78,7 +78,7 @@
   components:
     - type: Sprite
       sprite: Objects/Misc/module.rsi
-      state: id_mod
+      state: mcontroller
     - type: Tag
       tags:
       - HonkerTargetingControlModule
@@ -121,3 +121,143 @@
     - type: GuideHelp
       guides:
       - Robotics
+
+# Clarke
+
+- type: entity
+  id: ClarkeCentralElectronics
+  parent: BaseElectronics
+  name: clarke central control module
+  description: The electrical control center for the Clarke mech.
+  components:
+    - type: Item
+      storedRotation: 0
+    - type: Sprite
+      sprite: Objects/Misc/module.rsi
+      state: mainboard
+    - type: Tag
+      tags:
+      - ClarkeCentralControlModule
+    - type: GuideHelp
+      guides:
+      - Robotics
+
+- type: entity
+  id: ClarkePeripheralsElectronics
+  parent: BaseElectronics
+  name: clarke peripherals control module
+  description: The electrical peripherals control for the Clarke mech.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/module.rsi
+      state: id_mod
+    - type: Tag
+      tags:
+      - ClarkePeripheralsControlModule
+    - type: GuideHelp
+      guides:
+      - Robotics
+
+# Gygax
+
+- type: entity
+  id: GygaxCentralElectronics
+  parent: BaseElectronics
+  name: gygax central control module
+  description: The electrical control center for the Gygax mech.
+  components:
+    - type: Item
+      storedRotation: 0
+    - type: Sprite
+      sprite: Objects/Misc/module.rsi
+      state: mainboard
+    - type: Tag
+      tags:
+      - GygaxCentralControlModule
+    - type: GuideHelp
+      guides:
+      - Robotics
+
+- type: entity
+  id: GygaxPeripheralsElectronics
+  parent: BaseElectronics
+  name: gygax peripherals control module
+  description: The electrical peripherals control for the Gygax mech.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/module.rsi
+      state: id_mod
+    - type: Tag
+      tags:
+      - GygaxPeripheralsControlModule
+    - type: GuideHelp
+      guides:
+      - Robotics
+
+- type: entity
+  id: GygaxTargetingElectronics
+  parent: BaseElectronics
+  name: gygax weapon control and targeting module
+  description: The electrical targeting control for the Gygax mech.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/module.rsi
+      state: mcontroller
+    - type: Tag
+      tags:
+      - GygaxTargetingControlModule
+    - type: GuideHelp
+      guides:
+      - Robotics
+
+# Durand
+
+- type: entity
+  id: DurandCentralElectronics
+  parent: BaseElectronics
+  name: durand central control module
+  description: The electrical control center for the Durand mech.
+  components:
+    - type: Item
+      storedRotation: 0
+    - type: Sprite
+      sprite: Objects/Misc/module.rsi
+      state: mainboard
+    - type: Tag
+      tags:
+      - DurandCentralControlModule
+    - type: GuideHelp
+      guides:
+      - Robotics
+
+- type: entity
+  id: DurandPeripheralsElectronics
+  parent: BaseElectronics
+  name: durand peripherals control module
+  description: The electrical peripherals control for the Durand mech.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/module.rsi
+      state: id_mod
+    - type: Tag
+      tags:
+      - DurandPeripheralsControlModule
+    - type: GuideHelp
+      guides:
+      - Robotics
+
+- type: entity
+  id: DurandTargetingElectronics
+  parent: BaseElectronics
+  name: durand weapon control and targeting module
+  description: The electrical targeting control for the Durand mech.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/module.rsi
+      state: mcontroller
+    - type: Tag
+      tags:
+      - DurandTargetingControlModule
+    - type: GuideHelp
+      guides:
+      - Robotics

Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/base.yml

@@ -0,0 +1,18 @@
+- type: entity
+  id: BaseMechWeaponRange
+  parent: BaseMechEquipment
+  abstract: true
+  components:
+  - type: Battery
+    maxCharge: 100 # Battery is charged by mech
+    startingCharge: 100
+  - type: Appearance
+  - type: StaticPrice
+    price: 1
+  - type: Item
+    size: Ginormous
+  - type: MultiHandedItem
+  - type: ClothingSpeedModifier
+    walkModifier: 0.5
+    sprintModifier: 0.5
+  - type: HeldSpeedModifier

Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml

@@ -0,0 +1,304 @@
+- type: entity
+  id: WeaponMechCombatPulseRifle
+  name: eZ-14 mk2 Heavy pulse rifle
+  description: Fires a heavy pulse laser.
+  suffix: Mech Weapon, Gun, Combat, Pulse
+  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Mech/mecha_equipment.rsi
+    state: mecha_pulse
+  - type: Gun
+    fireRate: 1.5
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser3.ogg
+  - type: HitscanBatteryAmmoProvider
+    proto: Pulse
+    fireCost: 40
+  - type: Appearance
+  - type: AmmoCounter
+
+- type: entity
+  id: WeaponMechCombatImmolationGun
+  name: ZFI Immolation Beam Gun
+  description: A gun for battlemechs, firing high-temperature beams.
+  suffix: Mech Weapon, Gun, Combat, Laser
+  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Mech/mecha_equipment.rsi
+    state: mecha_laser
+  - type: Gun
+    fireRate: 0.6
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+  - type: HitscanBatteryAmmoProvider
+    proto: RedHeavyLaser
+    fireCost: 99
+  - type: Appearance
+  - type: AmmoCounter
+
+- type: entity
+  id: WeaponMechCombatSolarisLaser
+  name: CH-LC "Solaris" laser cannon
+  description: An experimental combat mounted laser cannon that causes more damage, but also has a greater cooldown than a "Firedart".
+  suffix: Mech Weapon, Gun, Combat, Laser
+  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Mech/mecha_equipment.rsi
+    state: mecha_laser
+  - type: Gun
+    fireRate: 1
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
+  - type: HitscanBatteryAmmoProvider
+    proto: RedMediumLaser
+    fireCost: 59
+  - type: Appearance
+  - type: AmmoCounter
+
+- type: entity
+  id: WeaponMechCombatFiredartLaser
+  name: CH-PS "Firedart" Laser
+  description: The standard combat armament of the mechs is a combat mounted laser.
+  suffix: Mech Weapon, Gun, Combat, Laser
+  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Mech/mecha_equipment.rsi
+    state: mecha_laser
+  - type: Gun
+    fireRate: 0.8
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
+  - type: HitscanBatteryAmmoProvider
+    proto: RedLaser
+    fireCost: 39
+  - type: Appearance
+  - type: AmmoCounter
+
+- type: entity
+  id: WeaponMechCombatTeslaCannon
+  name: P-X Tesla Cannon
+  description: A weapon for combat mechs, firing energy balls, based on the principle of an experimental Tesla engine.
+  suffix: Mech Weapon, Gun, Combat, Tesla
+  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Mech/mecha_equipment.rsi
+    state: mecha_wholegen
+  - type: Gun
+    projectileSpeed: 1
+    projectileSpeedModified: 5
+    fireRate: 0.4
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Effects/Lightning/lightningshock.ogg
+      params:
+        variation: 0.2
+  - type: ProjectileBatteryAmmoProvider
+    proto: TeslaGunBullet
+    fireCost: 99
+  - type: Appearance
+  - type: AmmoCounter
+
+- type: entity
+  id: WeaponMechCombatDisabler
+  name: CH-PD Disabler
+  description: A non-lethal mounted stun gun that allows you to immobilize intruders.
+  suffix: Mech Weapon, Gun, Combat, Disabler
+  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Mech/mecha_equipment.rsi
+    state: mecha_disabler
+  - type: Gun
+    fireRate: 1
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletDisabler
+    fireCost: 29
+  - type: Appearance
+  - type: AmmoCounter
+
+- type: entity
+  id: WeaponMechCombatTaser
+  name: PBT "Pacifier" Mounted Taser
+  description: A mounted non-lethal taser that allows you to stun intruders.
+  suffix: Mech Weapon, Gun, Combat, Disabler, admeme
+  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Mech/mecha_equipment.rsi
+    state: mecha_taser
+  - type: Gun
+    fireRate: 1
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletTaser
+    fireCost: 19
+  - type: Appearance
+  - type: AmmoCounter
+
+- type: entity
+  id: WeaponMechCombatShotgun
+  name: LBX AC 10 "Scattershot"
+  description: A mounted non-lethal taser that allows you to stun intruders.
+  suffix: Mech Weapon, Gun, Combat, Shotgun
+  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Mech/mecha_equipment.rsi
+    state: mecha_scatter
+  - type: Gun
+    fireRate: 0.5
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: ShellShotgun
+    fireCost: 99
+  - type: Appearance
+  - type: AmmoCounter
+
+- type: entity
+  id: WeaponMechCombatShotgunIncendiary
+  name: FNX-99 "Hades" Carbine
+  description: Mounted carbine, firing incendiary cartridges.
+  suffix: Mech Weapon, Gun, Combat, Shotgun, Incendiary
+  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Mech/mecha_equipment.rsi
+    state: mecha_carbine
+  - type: Gun
+    fireRate: 1.2
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: ShellShotgunIncendiary
+    fireCost: 99
+  - type: Appearance
+  - type: AmmoCounter
+
+- type: entity
+  id: WeaponMechCombatUltraRifle
+  name: Ultra AC-2
+  description: Mounted carbine, firing incendiary cartridges.
+  suffix: Mech Weapon, Gun, Combat, Rifle
+  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Mech/mecha_equipment.rsi
+    state: mecha_uac2
+  - type: Gun
+    fireRate: 3
+    selectedMode: FullAuto
+    availableModes:
+      - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: CartridgeLightRifle
+    fireCost: 15
+  - type: Appearance
+  - type: AmmoCounter
+
+- type: entity
+  id: WeaponMechCombatMissileRack8
+  name: SRM-8 Light Missile Rack
+  description: Launches low-explosive breaching missiles designed to explode only when striking a sturdy target.
+  suffix: Mech Weapon, Gun, Combat, Light Missile
+  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Mech/mecha_equipment.rsi
+    state: mecha_missilerack
+  - type: Gun
+    fireRate: 1
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/rpgfire.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletWeakRocket
+    fireCost: 25
+  - type: Appearance
+  - type: AmmoCounter
+
+- type: entity
+  id: WeaponMechCombatMissileRack6
+  name: BRM-6 Missile Rack
+  description: Tubes must be reloaded from the outside.
+  suffix: Mech Weapon, Gun, Combat, Missile
+  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Mech/mecha_equipment.rsi
+    state: mecha_missilerack_six
+  - type: Gun
+    fireRate: 1
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/rpgfire.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: GrenadeBlast
+    fireCost: 100
+  - type: Appearance
+  - type: AmmoCounter
+
+- type: entity
+  id: WeaponMechCombatFlashbangLauncher
+  name: SGL-6 Flashbang Launcher
+  description: Launches low-explosive breaching missiles designed to explode only when striking a sturdy target.
+  suffix: Mech Weapon, Gun, Combat, Flashbang
+  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Mech/mecha_equipment.rsi
+    state: mecha_grenadelnchr
+  - type: Gun
+    fireRate: 1
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg
+    soundEmpty:
+      path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: GrenadeFlash
+    fireCost: 30
+  - type: Appearance
+  - type: AmmoCounter

Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/debug.yml

@@ -0,0 +1,98 @@
+- type: entity
+  id: WeaponMechDebugBallistic
+  parent: [ BaseMechWeaponRange, DebugMechEquipment ] # Debug equipment dose has all whitelist tags.
+  suffix: Mech Weapon, DEBUG, Ballistic
+  name: debug bang
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Gun
+    minAngle: 24
+    maxAngle: 45
+    angleIncrease: 4
+    angleDecay: 16
+    fireRate: 5
+    selectedMode: FullAuto
+    availableModes:
+      - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/lmg.ogg
+    soundEmpty:
+      path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg
+  - type: AmmoCounter
+  - type: ProjectileBatteryAmmoProvider
+    proto: CartridgeLightRifle
+    fireCost: 9
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: true
+  - type: Appearance
+
+- type: entity
+  id: WeaponMechDebugLaser
+  name: debug pow
+  suffix: Mech Weapon, DEBUG, Laser
+  parent: [ BaseMechWeaponRange, DebugMechEquipment ]
+  description: A weapon using light amplified by the stimulated emission of radiation.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: HitscanBatteryAmmoProvider
+    proto: RedMediumLaser
+    fireCost: 19
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: true
+  - type: Gun
+    fireRate: 2
+    selectedMode: FullAuto
+    availableModes:
+      - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
+  - type: AmmoCounter
+
+- type: entity
+  id: WeaponMechDebugDisabler
+  name: debug tew
+  description: A self-defense weapon that exhausts organic targets, weakening them until they collapse.
+  suffix: Mech Weapon, DEBUG, Disabler
+  parent: [ BaseMechWeaponRange, DebugMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Battery/disabler.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-unshaded-0
+        map: ["enum.GunVisualLayers.MagUnshaded"]
+        shader: unshaded
+  - type: Gun
+    fireRate: 1
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletDisabler
+    fireCost: 19
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: true
+  - type: Appearance
+  - type: AmmoCounter

Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/industrial.yml

@@ -0,0 +1,23 @@
+- type: entity
+  id: WeaponMechIndustrialKineticAccelerator
+  name: exosuit proto-kinetic accelerator
+  description: Fires normal-damage kinetic bolts at a short range.
+  suffix: Mech Weapon, Gun, Industrial, Kinetic Accelerator
+  parent: [ BaseMechWeaponRange, IndustrialMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Mech/mecha_equipment.rsi
+    state: mecha_kineticgun
+  - type: Gun
+    fireRate: 1
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletKineticShuttle
+    fireCost: 50
+  - type: Appearance
+  - type: AmmoCounter
+# TODO: Plasma Cutter

Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/special.yml

@@ -0,0 +1,55 @@
+- type: entity
+  id: WeaponMechSpecialMousetrapMortar
+  parent: [ BaseMechWeaponRange, SpecialMechEquipment ]
+  suffix: Mech Weapon, Gun, Special, Mortar
+  name: mousetrap mortar
+  description: Mounted mousetrap launcher.
+  components:
+  - type: Sprite
+    state: mecha_mousetrapmrtr
+  - type: Gun
+    minAngle: 24
+    maxAngle: 45
+    angleIncrease: 4
+    angleDecay: 16
+    fireRate: 0.5
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg
+    soundEmpty:
+      path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg
+  - type: AmmoCounter
+  - type: ProjectileBatteryAmmoProvider
+    proto: MousetrapArmed
+    fireCost: 100
+  - type: Appearance
+  
+- type: entity
+  id: WeaponMechSpecialBananaMortar
+  parent: [ BaseMechWeaponRange, SpecialMechEquipment ]
+  suffix: Mech Weapon, Gun, Special, Mortar
+  name: banana mortar
+  description: Mounted banana peel launcher.
+  components:
+  - type: Sprite
+    state: mecha_bananamrtr
+  - type: Gun
+    minAngle: 24
+    maxAngle: 25
+    angleIncrease: 4
+    angleDecay: 16
+    fireRate: 0.5
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg
+    soundEmpty:
+      path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg
+  - type: AmmoCounter
+  - type: ProjectileBatteryAmmoProvider
+    proto: TrashBananaPeel
+    fireCost: 100
+  - type: Appearance

Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Melee/base.yml

@@ -0,0 +1,15 @@
+- type: entity
+  id: BaseMechWeaponMelee
+  parent: BaseMechEquipment
+  abstract: true
+  components:
+  - type: Appearance
+  - type: StaticPrice
+    price: 1
+  - type: Item
+    size: Ginormous
+  - type: MultiHandedItem
+  - type: ClothingSpeedModifier
+    walkModifier: 0.5
+    sprintModifier: 0.5
+  - type: HeldSpeedModifier

Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Melee/combat.yml

@@ -0,0 +1,20 @@
+- type: entity
+  id: WeaponMechChainSword
+  parent: [ BaseMechWeaponMelee, CombatMechEquipment  ]
+  name: exosuit chainsword
+  suffix: Mech Weapon, Melee, Combat
+  description: Equipment for combat exosuits. This is the mechanical chainsword that'll pierce the heavens!
+  components:
+  - type: Sprite
+    state: mecha_chainsword
+  - type: MeleeWeapon
+    autoAttack: true
+    angle: 0
+    wideAnimationRotation: -90
+    soundHit:
+      path: "/Audio/Weapons/chainsaw.ogg"
+    attackRate: 3.5
+    damage:
+      types:
+        Structural: 35
+        Piercing: 15

Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Melee/debug.yml

@@ -0,0 +1,18 @@
+- type: entity
+  id: WeaponMechDebugMelle
+  parent: [ BaseMechWeaponMelee, DebugMechEquipment ] # Debug equipment dose has all whitelist tags.
+  name: debug bam
+  suffix: Mech Weapon, DEBUG, Melee
+  description: A robust thing.
+  components:
+  - type: Sprite
+    state: paddy_claw
+  - type: MeleeWeapon
+    hidden: true
+    attackRate: 0.75
+    damage:
+      types:
+        Blunt: 40
+        Structural: 20
+    soundHit:
+      collection: MetalThud

Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Melee/industrial.yml

@@ -0,0 +1,51 @@
+- type: entity
+  id: WeaponMechMelleDrill
+  parent: BaseMechWeaponMelee
+  name: exosuit drill
+  suffix: Mech Weapon, Melee, Industrial
+  description: Equipment for mining exosuits. This is the drill that'll pierce the rocks!
+  components:
+  - type: Sprite
+    state: mecha_drill
+  - type: Tag
+    tags:
+    - Pickaxe
+    - IndustrialMech
+  - type: MeleeWeapon
+    autoAttack: true
+    angle: 0
+    wideAnimationRotation: -90
+    soundHit:
+      path: "/Audio/Items/drill_hit.ogg"
+    attackRate: 3.5
+    damage:
+      groups:
+        Brute: 9
+      types:
+        Structural: 40 # ~10 seconds for solid wall / ~21 secods for reinforced wall
+
+- type: entity
+  id: WeaponMechMelleDrillDiamond
+  parent: BaseMechWeaponMelee
+  name: diamond-tipped exosuit drill
+  suffix: Mech Weapon, Melee, Industrial
+  description: Equipment for mining exosuits. This is an upgraded version of the drill that'll pierce the rocks!
+  components:
+  - type: Sprite
+    state: mecha_diamond_drill
+  - type: Tag
+    tags:
+    - Pickaxe
+    - IndustrialMech
+  - type: MeleeWeapon
+    autoAttack: true
+    angle: 0
+    wideAnimationRotation: -90
+    soundHit:
+      path: "/Audio/Items/drill_hit.ogg"
+    attackRate: 4
+    damage:
+      groups:
+        Brute: 18
+      types:
+        Structural: 60 # ~3 seconds for solid wall / 9 seconds for reinforced wall

Resources/Prototypes/Entities/Objects/Specific/Mech/mech_construction.yml

@@ -26,6 +26,424 @@
     guides:
     - Robotics
 
+# Clarke
+
+- type: entity
+  id: BaseClarkePart
+  parent: BaseMechPart
+  abstract: true
+  components:
+  - type: Sprite
+    drawdepth: Items
+    noRot: false
+    sprite: Objects/Specific/Mech/clarke_construction.rsi
+
+- type: entity
+  id: BaseClarkePartItem
+  parent: BaseClarkePart
+  abstract: true
+  components:
+  - type: Item
+    size: Ginormous
+
+- type: entity
+  parent: BaseClarkePart
+  id: ClarkeHarness
+  name: clarke harness
+  description: The core of the Clarke.
+  components:
+  - type: Appearance
+  - type: ItemMapper
+    mapLayers:
+      clarke_head+o:
+        whitelist:
+          tags:
+          - ClarkeHead
+      clarke_r_arm+o:
+        whitelist:
+          tags:
+          - ClarkeLArm
+      clarke_l_arm+o:
+        whitelist:
+          tags:
+          - ClarkeRArm
+      clarke_treads+o:
+        whitelist:
+          tags:
+          - ClarkeTreads
+    sprite: Objects/Specific/Mech/clarke_construction.rsi
+  - type: ContainerContainer
+    containers:
+      mech-assembly-container: !type:Container
+  - type: MechAssembly
+    finishedPrototype: ClarkeChassis
+    requiredParts:
+      ClarkeHead: false
+      ClarkeLArm: false
+      ClarkeRArm: false
+      ClarkeTreads: false
+  - type: Sprite
+    state: clarke_harness+o
+    noRot: true
+
+- type: entity
+  parent: BaseClarkePartItem
+  id: ClarkeHead
+  name: clarke head
+  description: The head of the Clarke. It belongs on the chassis of the mech.
+  components:
+  - type: Sprite
+    state: clarke_head
+  - type: Tag
+    tags:
+    - ClarkeHead
+
+- type: entity
+  parent: BaseClarkePartItem
+  id: ClarkeRArm
+  name: clarke right arm
+  description: The right arm of the Clarke. It belongs on the chassis of the mech.
+  components:
+  - type: Sprite
+    state: clarke_l_arm
+  - type: Tag
+    tags:
+    - ClarkeRArm
+
+- type: entity
+  parent: BaseClarkePartItem
+  id: ClarkeLArm
+  name: clarke left arm
+  description: The left arm of the Clarke. It belongs on the chassis of the mech.
+  components:
+  - type: Sprite
+    state: clarke_r_arm
+  - type: Tag
+    tags:
+    - ClarkeLArm
+
+- type: entity
+  parent: BaseClarkePartItem
+  id: ClarkeTreads
+  name: clarke treads
+  description: The treads of the Clarke. It belongs on the chassis of the mech.
+  components:
+  - type: Sprite
+    state: clarke_treads
+  - type: Tag
+    tags:
+    - ClarkeTreads
+
+- type: entity
+  id: ClarkeChassis
+  parent: BaseClarkePart
+  name: calrke chassis
+  description: An in-progress construction of the Clarke mech.
+  components:
+  - type: Appearance
+  - type: ContainerContainer
+    containers:
+      battery-container: !type:Container
+  - type: MechAssemblyVisuals
+    statePrefix: clarke
+  - type: Sprite
+    noRot: true
+    state: clarke0
+  - type: Construction
+    graph: Clarke
+    node: start
+    defaultTarget: clarke
+
+# Durand
+
+- type: entity
+  id: BaseDurandPart
+  parent: BaseMechPart
+  abstract: true
+  components:
+  - type: Sprite
+    drawdepth: Items
+    noRot: false
+    sprite: Objects/Specific/Mech/durand_construction.rsi
+
+- type: entity
+  id: BaseDurandPartItem
+  parent: BaseDurandPart
+  abstract: true
+  components:
+  - type: Item
+    size: Ginormous
+
+- type: entity
+  parent: BaseDurandPart
+  id: DurandHarness
+  name: durand harness
+  description: The core of the Durand.
+  components:
+  - type: Appearance
+  - type: ItemMapper
+    mapLayers:
+      durand_head+o:
+        whitelist:
+          tags:
+          - DurandHead
+      durand_l_arm+o:
+        whitelist:
+          tags:
+          - DurandLArm
+      durand_r_arm+o:
+        whitelist:
+          tags:
+          - DurandRArm
+      durand_l_leg+o:
+        whitelist:
+          tags:
+          - DurandLLeg
+      durand_r_leg+o:
+        whitelist:
+          tags:
+          - DurandRLeg
+    sprite: Objects/Specific/Mech/durand_construction.rsi
+  - type: ContainerContainer
+    containers:
+      mech-assembly-container: !type:Container
+  - type: MechAssembly
+    finishedPrototype: DurandChassis
+    requiredParts:
+      DurandHead: false
+      DurandLArm: false
+      DurandRArm: false
+      DurandLLeg: false
+      DurandRLeg: false
+  - type: Sprite
+    state: durand_harness+o
+    noRot: true
+
+- type: entity
+  parent: BaseDurandPartItem
+  id: DurandHead
+  name: durand head
+  description: The head of the Durand. It belongs on the chassis of the mech.
+  components:
+  - type: Sprite
+    state: durand_head
+  - type: Tag
+    tags:
+    - DurandHead
+
+- type: entity
+  parent: BaseDurandPartItem
+  id: DurandLArm
+  name: durand left arm
+  description: The left arm of the Durand. It belongs on the chassis of the mech.
+  components:
+  - type: Sprite
+    state: durand_l_arm
+  - type: Tag
+    tags:
+    - DurandLArm
+
+- type: entity
+  parent: BaseDurandPartItem
+  id: DurandLLeg
+  name: durand left leg
+  description: The left leg of the Durand. It belongs on the chassis of the mech.
+  components:
+  - type: Sprite
+    state: durand_l_leg
+  - type: Tag
+    tags:
+    - DurandLLeg
+
+- type: entity
+  parent: BaseDurandPartItem
+  id: DurandRLeg
+  name: durand right leg
+  description: The right leg of the Durand. It belongs on the chassis of the mech.
+  components:
+  - type: Sprite
+    state: durand_r_leg
+  - type: Tag
+    tags:
+    - DurandRLeg
+
+- type: entity
+  parent: BaseDurandPartItem
+  id: DurandRArm
+  name: durand right arm
+  description: The right arm of the Durand. It belongs on the chassis of the mech.
+  components:
+  - type: Sprite
+    state: durand_r_arm
+  - type: Tag
+    tags:
+    - DurandRArm
+
+- type: entity
+  id: DurandChassis
+  parent: BaseDurandPart
+  name: durand chassis
+  description: An in-progress construction of the Durand mech.
+  components:
+  - type: Appearance
+  - type: ContainerContainer
+    containers:
+      battery-container: !type:Container
+  - type: MechAssemblyVisuals
+    statePrefix: durand
+  - type: Sprite
+    noRot: true
+    state: durand0
+  - type: Construction
+    graph: Durand
+    node: start
+    defaultTarget: durand
+
+# Gygax
+
+- type: entity
+  id: BaseGygaxPart
+  parent: BaseMechPart
+  abstract: true
+  components:
+  - type: Sprite
+    drawdepth: Items
+    noRot: false
+    sprite: Objects/Specific/Mech/gygax_construction.rsi
+
+- type: entity
+  id: BaseGygaxPartItem
+  parent: BaseGygaxPart
+  abstract: true
+  components:
+  - type: Item
+    size: Ginormous
+
+- type: entity
+  parent: BaseGygaxPart
+  id: GygaxHarness
+  name: gygax harness
+  description: The core of the Gygax.
+  components:
+  - type: Appearance
+  - type: ItemMapper
+    mapLayers:
+      gygax_head+o:
+        whitelist:
+          tags:
+          - GygaxHead
+      gygax_l_arm+o:
+        whitelist:
+          tags:
+          - GygaxLArm
+      gygax_r_arm+o:
+        whitelist:
+          tags:
+          - GygaxRArm
+      gygax_l_leg+o:
+        whitelist:
+          tags:
+          - GygaxLLeg
+      gygax_r_leg+o:
+        whitelist:
+          tags:
+          - GygaxRLeg
+    sprite: Objects/Specific/Mech/gygax_construction.rsi
+  - type: ContainerContainer
+    containers:
+      mech-assembly-container: !type:Container
+  - type: MechAssembly
+    finishedPrototype: GygaxChassis
+    requiredParts:
+      GygaxHead: false
+      GygaxLArm: false
+      GygaxRArm: false
+      GygaxLLeg: false
+      GygaxRLeg: false
+  - type: Sprite
+    state: gygax_harness+o
+    noRot: true
+
+- type: entity
+  parent: BaseGygaxPartItem
+  id: GygaxHead
+  name: gygax head
+  description: The head of the Gygax. It belongs on the chassis of the mech.
+  components:
+  - type: Sprite
+    state: gygax_head
+  - type: Tag
+    tags:
+    - GygaxHead
+
+- type: entity
+  parent: BaseGygaxPartItem
+  id: GygaxLArm
+  name: gygax left arm
+  description: The left arm of the Gygax. It belongs on the chassis of the mech.
+  components:
+  - type: Sprite
+    state: gygax_l_arm
+  - type: Tag
+    tags:
+    - GygaxLArm
+
+- type: entity
+  parent: BaseGygaxPartItem
+  id: GygaxLLeg
+  name: gygax left leg
+  description: The left leg of the Gygax. It belongs on the chassis of the mech.
+  components:
+  - type: Sprite
+    state: gygax_l_leg
+  - type: Tag
+    tags:
+    - GygaxLLeg
+
+- type: entity
+  parent: BaseGygaxPartItem
+  id: GygaxRLeg
+  name: gygax right leg
+  description: The right leg of the Gygax. It belongs on the chassis of the mech.
+  components:
+  - type: Sprite
+    state: gygax_r_leg
+  - type: Tag
+    tags:
+    - GygaxRLeg
+
+- type: entity
+  parent: BaseGygaxPartItem
+  id: GygaxRArm
+  name: gygax right arm
+  description: The right arm of the Gygax. It belongs on the chassis of the mech.
+  components:
+  - type: Sprite
+    state: gygax_r_arm
+  - type: Tag
+    tags:
+    - GygaxRArm
+
+- type: entity
+  id: GygaxChassis
+  parent: BaseGygaxPart
+  name: gygax chassis
+  description: An in-progress construction of the Gygax mech.
+  components:
+  - type: Appearance
+  - type: ContainerContainer
+    containers:
+      battery-container: !type:Container
+  - type: MechAssemblyVisuals
+    statePrefix: gygax
+  - type: Sprite
+    noRot: true
+    state: gygax0
+  - type: Construction
+    graph: Gygax
+    node: start
+    defaultTarget: gygax
+
 # Ripley APLU
 
 - type: entity
@@ -154,6 +572,83 @@
     node: start
     defaultTarget: ripley
 
+# Ripley MK-II
+
+- type: entity
+  id: BaseRipleyMKIIPart
+  parent: BaseMechPart
+  abstract: true
+  components:
+  - type: Sprite
+    drawdepth: Items
+    noRot: false
+    sprite: Objects/Specific/Mech/ripleymkii_construction.rsi
+
+- type: entity
+  parent: BaseRipleyMKIIPart
+  id: RipleyMKIIHarness
+  name: ripley MK-II harness
+  description: The core of the Ripley MK-II.
+  components:
+  - type: Appearance
+  - type: ItemMapper
+    mapLayers:
+      ripleymkii_upgrade_kit+o:
+        whitelist:
+          tags:
+          - RipleyMKIIUpgradeKit
+      ripleymkii_l_arm+o:
+        whitelist:
+          tags:
+          - RipleyLArm
+      ripleymkii_r_arm+o:
+        whitelist:
+          tags:
+          - RipleyRArm
+      ripleymkii_l_leg+o:
+        whitelist:
+          tags:
+          - RipleyLLeg
+      ripleymkii_r_leg+o:
+        whitelist:
+          tags:
+          - RipleyRLeg
+    sprite: Objects/Specific/Mech/ripleymkii_construction.rsi
+  - type: ContainerContainer
+    containers:
+      mech-assembly-container: !type:Container
+  - type: MechAssembly
+    finishedPrototype: RipleyMKIIChassis
+    requiredParts:
+      RipleyMKIIUpgradeKit: false
+      RipleyLArm: false
+      RipleyRArm: false
+      RipleyLLeg: false
+      RipleyRLeg: false
+  - type: Sprite
+    state: ripleymkii_harness+o
+    noRot: true
+
+- type: entity
+  id: RipleyMKIIChassis
+  parent: BaseRipleyMKIIPart
+  name: ripley MK-II chassis
+  description: An in-progress construction of the Ripley MK-II mech.
+  components:
+  - type: Appearance
+  - type: ContainerContainer
+    containers:
+      battery-container: !type:Container
+  - type: MechAssemblyVisuals
+    statePrefix: ripleymkii
+  - type: Sprite
+    noRot: true
+    state: ripleymkii0
+  - type: Construction
+    graph: RipleyMKII
+    node: start
+    defaultTarget: ripleymkii
+
 # H.O.N.K.
 
 - type: entity

Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml

@@ -1,3 +1,53 @@
+- type: entity
+  id: DebugMechEquipment
+  abstract: true
+  suffix: DEBUG
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Tag
+    tags:
+    - CombatMech
+    - IndustrialMech
+    - SpecialMech
+    - SmallMech
+
+- type: entity
+  id: CombatMechEquipment
+  abstract: true
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Tag
+    tags:
+    - CombatMech
+
+- type: entity
+  id: IndustrialMechEquipment
+  abstract: true
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Tag
+    tags:
+    - IndustrialMech
+
+- type: entity
+  id: SpecialMechEquipment
+  abstract: true
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Tag
+    tags:
+    - SpecialMech
+
+- type: entity
+  id: SmallMechEquipment
+  abstract: true
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Tag
+    tags:
+    - SmallMech
+# TODO: Make medical mech with equipment.
+
 - type: entity
   parent: BaseItem
   id: BaseMechEquipment
@@ -15,7 +65,7 @@
 
 - type: entity
   id: MechEquipmentGrabber
-  parent: BaseMechEquipment
+  parent: [ BaseMechEquipment, IndustrialMechEquipment ]
   name: hydraulic clamp
   description: Gives the mech the ability to grab things and drag them around.
   components:
@@ -40,18 +90,19 @@
     maxContents: 4
     grabDelay: 3
     grabEnergyDelta: -20
-  - type: Tag
-    tags:
-    - SmallMech
   - type: UIFragment
     ui: !type:MechGrabberUi
   - type: ContainerContainer
     containers:
       item-container: !type:Container
+  - type: Tag
+    tags:
+    - IndustrialMech
+    - SmallMech
 
 - type: entity
   id: MechEquipmentHorn
-  parent: BaseMechEquipment
+  parent: [ BaseMechEquipment, SpecialMechEquipment ]
   name: mech horn
   description: An enhanced bike horn that plays a hilarious array of sounds for the enjoyment of the crew. HONK!
   components:
@@ -70,4 +121,3 @@
     ui: !type:MechSoundboardUi
   - type: UseDelay
     delay: 0.5
-  # TODO: tag as being for H.O.N.K. only!!!

Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml

@@ -1,3 +1,43 @@
+- type: entity
+  id: CombatMech
+  abstract: true
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Mech
+    equipmentWhitelist:
+      tags:
+      - CombatMech
+
+- type: entity
+  id: IndustrialMech
+  abstract: true
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Mech
+    equipmentWhitelist:
+      tags:
+      - IndustrialMech
+
+- type: entity
+  id: SpecialMech
+  abstract: true
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Mech
+    equipmentWhitelist:
+      tags:
+      - SpecialMech
+
+- type: entity
+  id: SmallMech
+  abstract: true
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Mech
+    equipmentWhitelist:
+      tags:
+      - SmallMech
+
 - type: entity
   id: BaseMech
   save: false
@@ -85,7 +125,7 @@
       mech-battery-slot: !type:ContainerSlot
   - type: Damageable
     damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageModifierSet: LightArmor
   - type: FootstepModifier
     footstepSoundCollection:
       path: /Audio/Mecha/mechmove03.ogg
@@ -96,7 +136,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 400
+        damage: 1000
       behaviors:
       - !type:PlaySoundBehavior
         sound:
@@ -106,9 +146,10 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
 
+# Ripley MK-I
 - type: entity
   id: MechRipley
-  parent: BaseMech
+  parent: [ BaseMech, IndustrialMech, BaseCargoContraband ]
   name: Ripley APLU
   description: Versatile and lightly armored, the Ripley is useful for almost any heavy work scenario. The "APLU" stands for Autonomous Power Loading Unit.
   components:
@@ -150,9 +191,105 @@
       mech-battery-slot:
       - PowerCellHigh
 
-# TODO: have a whitelist for honker equipment
+# Ripley MK-II
 - type: entity
-  parent: BaseMech
+  id: MechRipley2
+  parent: [ BaseMech, IndustrialMech, BaseCargoContraband ]
+  name: Ripley APLU MK-II
+  description: The "MK-II" has a pressurized cabin for space operations, but the added weight has slowed it down.
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    noRot: true
+    sprite: Objects/Specific/Mech/mecha.rsi
+    layers:
+    - map: [ "enum.MechVisualLayers.Base" ]
+      state: ripleymkii
+  - type: FootstepModifier
+    footstepSoundCollection:
+      path: /Audio/Mecha/sound_mecha_powerloader_step.ogg
+  - type: Mech
+    baseState: ripleymkii
+    openState: ripleymkii-open
+    brokenState: ripleymkii-broken
+    mechToPilotDamageMultiplier: 0.4
+    airtight: true
+    pilotWhitelist:
+      components:
+        - HumanoidAppearance
+  - type: MeleeWeapon
+    hidden: true
+    attackRate: 1
+    damage:
+      types:
+        Blunt: 20
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 1
+    baseSprintSpeed: 2
+  - type: Damageable
+    damageModifierSet: MediumArmorNT
+
+- type: entity
+  id: MechRipley2Battery
+  parent: MechRipley2
+  suffix: Battery
+  components:
+  - type: ContainerFill
+    containers:
+      mech-battery-slot:
+      - PowerCellHigh
+
+# Clarke
+- type: entity
+  id: MechClarke
+  parent: [ BaseMech, IndustrialMech, BaseCargoContraband ]
+  name: Clarke
+  description: A fast-moving mech for space travel. It has built-in trusts.
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    noRot: true
+    sprite: Objects/Specific/Mech/mecha.rsi
+    layers:
+    - map: [ "enum.MechVisualLayers.Base" ]
+      state: clarke
+  - type: FootstepModifier
+    footstepSoundCollection:
+      path: /Audio/Mecha/sound_mecha_powerloader_step.ogg
+  - type: Mech
+    baseState: clarke
+    openState: clarke-open
+    brokenState: clarke-broken
+    mechToPilotDamageMultiplier: 0.5
+    airtight: true
+    pilotWhitelist:
+      components:
+        - HumanoidAppearance
+  - type: MeleeWeapon
+    hidden: true
+    attackRate: 1
+    damage:
+      types:
+        Blunt: 26
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 2.5
+    baseSprintSpeed: 4.5
+  - type: CanMoveInAir
+  - type: MovementAlwaysTouching
+
+- type: entity
+  id: MechClarkeBattery
+  parent: MechClarke
+  suffix: Battery
+  components:
+  - type: ContainerFill
+    containers:
+      mech-battery-slot:
+      - PowerCellHigh
+
+# H.O.N.K.
+- type: entity
+  parent: [ BaseMech, SpecialMech, BaseCivilianContraband ]
   id: MechHonker
   name: H.O.N.K.
   description: "Produced by \"Tyranny of Honk, INC\", this exosuit is designed as heavy clown-support. Used to spread the fun and joy of life. HONK!"
@@ -172,6 +309,7 @@
     openState: honker-open
     brokenState: honker-broken
     mechToPilotDamageMultiplier: 0.5
+    airtight: true # Space Honks is real.
     pilotWhitelist:
       components:
       - HumanoidAppearance
@@ -187,7 +325,19 @@
       - PowerCellHigh
 
 - type: entity
-  parent: BaseMech
+  parent: MechHonkerBattery
+  id: MechHonkerFilled
+  suffix: Battery, Filled
+  components:
+  - type: Mech
+    startingEquipment:
+      - WeaponMechSpecialBananaMortar
+      - WeaponMechSpecialMousetrapMortar
+      - MechEquipmentHorn
+
+# HAMTR
+- type: entity
+  parent: [ BaseMech, SmallMech ]
   id: MechHamtr
   name: HAMTR
   description: "An experimental mech which uses a brain–computer interface to connect directly to a hamsters brain."
@@ -209,9 +359,6 @@
     mechToPilotDamageMultiplier: 0.2
     maxEquipmentAmount: 2
     airtight: true
-    equipmentWhitelist:
-      tags:
-      - SmallMech
     pilotWhitelist:
       tags:
       - Hamster
@@ -303,3 +450,385 @@
     containers:
       mech-battery-slot:
       - PowerCellHigh
+
+# Combat-Station Mechs
+
+# Gygax
+- type: entity
+  id: MechGygax
+  parent: [ BaseMech, CombatMech, BaseRestrictedContraband ]
+  name: Gygax
+  description: While lightly armored, the Gygax has incredible mobility thanks to its ability that lets it smash through walls at high speeds.
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    noRot: true
+    sprite: Objects/Specific/Mech/mecha.rsi
+    layers:
+    - map: [ "enum.MechVisualLayers.Base" ]
+      state: gygax
+  - type: FootstepModifier
+    footstepSoundCollection:
+      path: /Audio/Mecha/sound_mecha_powerloader_step.ogg
+  - type: Mech
+    baseState: gygax
+    openState: gygax-open
+    brokenState: gygax-broken
+    mechToPilotDamageMultiplier: 0.3
+    airtight: true
+    pilotWhitelist:
+      components:
+        - HumanoidAppearance
+  - type: MeleeWeapon
+    hidden: true
+    attackRate: 1
+    damage:
+      types:
+        Blunt: 25
+        Structural: 180
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 2
+    baseSprintSpeed: 2.6
+
+- type: entity
+  id: MechGygaxBattery
+  parent: MechGygax
+  suffix: Battery
+  components:
+  - type: ContainerFill
+    containers:
+      mech-battery-slot:
+      - PowerCellHigh
+
+# Durand
+- type: entity
+  id: MechDurand
+  parent: [ BaseMech, CombatMech, BaseRestrictedContraband ]
+  name: Durand
+  description: A slow but beefy combat exosuit that is extra scary in confined spaces due to its punches. Xenos hate it!
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    noRot: true
+    sprite: Objects/Specific/Mech/mecha.rsi
+    layers:
+    - map: [ "enum.MechVisualLayers.Base" ]
+      state: durand
+  - type: FootstepModifier
+    footstepSoundCollection:
+      path: /Audio/Mecha/sound_mecha_powerloader_step.ogg
+  - type: Mech
+    baseState: durand
+    openState: durand-open
+    brokenState: durand-broken
+    mechToPilotDamageMultiplier: 0.25
+    airtight: true
+    maxIntegrity: 400
+    pilotWhitelist:
+      components:
+        - HumanoidAppearance
+  - type: MeleeWeapon
+    hidden: true
+    attackRate: 1
+    damage:
+      types:
+        Blunt: 40
+        Structural: 220
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 1.5
+    baseSprintSpeed: 2
+  - type: Damageable
+    damageModifierSet: MediumArmorNT
+  - type: CanMoveInAir
+  - type: MovementAlwaysTouching
+  - type: Repairable
+    fuelCost: 30
+    doAfterDelay: 15
+
+- type: entity
+  id: MechDurandBattery
+  parent: MechDurand
+  suffix: Battery
+  components:
+  - type: ContainerFill
+    containers:
+      mech-battery-slot:
+      - PowerCellHigh
+
+# Nanotrasen Combat Mechs
+
+# Marauder
+- type: entity
+  id: MechMarauder
+  parent: [ BaseMech, CombatMech, BaseCentcommContraband ]
+  name: Marauder
+  description: Looks like we're all saved. # ERT mech
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    noRot: true
+    sprite: Objects/Specific/Mech/mecha.rsi
+    layers:
+    - map: [ "enum.MechVisualLayers.Base" ]
+      state: marauder
+  - type: FootstepModifier
+    footstepSoundCollection:
+      path: /Audio/Mecha/sound_mecha_powerloader_step.ogg
+  - type: Mech
+    baseState: marauder
+    openState: marauder-open
+    brokenState: marauder-broken
+    mechToPilotDamageMultiplier: 0.1
+    airtight: true
+    maxIntegrity: 500
+    maxEquipmentAmount: 4
+    pilotWhitelist:
+      components:
+        - HumanoidAppearance
+  - type: MeleeWeapon
+    hidden: true
+    attackRate: 1
+    damage:
+      types:
+        Blunt: 40
+        Structural: 200
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 1
+    baseSprintSpeed: 1.5
+  - type: Damageable
+    damageModifierSet: HeavyArmorNT
+  - type: CanMoveInAir
+  - type: MovementAlwaysTouching
+  - type: Repairable
+    fuelCost: 30
+    doAfterDelay: 15
+
+- type: entity
+  id: MechMarauderBattery
+  parent: MechMarauder
+  suffix: Battery
+  components:
+  - type: ContainerFill
+    containers:
+      mech-battery-slot:
+      - PowerCellHyper
+
+- type: entity
+  id: MechMarauderFilled
+  parent: MechMarauderBattery
+  suffix: Battery, Filled
+  components:
+  - type: Mech
+    startingEquipment:
+      - WeaponMechChainSword
+      - WeaponMechCombatPulseRifle
+      - WeaponMechCombatUltraRifle
+      - WeaponMechCombatMissileRack8
+
+# Seraph
+- type: entity
+  id: MechSeraph
+  parent: [ BaseMech, CombatMech, BaseCentcommContraband ]
+  name: Seraph
+  description: That's the last thing you'll see. # Death Squad mech
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    noRot: true
+    sprite: Objects/Specific/Mech/mecha.rsi
+    layers:
+    - map: [ "enum.MechVisualLayers.Base" ]
+      state: seraph
+  - type: FootstepModifier
+    footstepSoundCollection:
+      path: /Audio/Mecha/sound_mecha_powerloader_step.ogg
+  - type: Mech
+    baseState: seraph
+    openState: seraph-open
+    brokenState: seraph-broken
+    mechToPilotDamageMultiplier: 0.05
+    airtight: true
+    maxIntegrity: 550
+    maxEquipmentAmount: 5
+    pilotWhitelist:
+      components:
+        - HumanoidAppearance
+  - type: MeleeWeapon
+    hidden: true
+    attackRate: 1
+    damage:
+      types:
+        Blunt: 60
+        Structural: 400
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 2.2
+    baseSprintSpeed: 3.7
+  - type: Damageable
+    damageModifierSet: HeavyArmorNT
+  - type: CanMoveInAir
+  - type: MovementAlwaysTouching
+  - type: Repairable
+    fuelCost: 30
+    doAfterDelay: 20
+
+- type: entity
+  id: MechSeraphBattery
+  parent: MechSeraph
+  suffix: Battery
+  components:
+  - type: ContainerFill
+    containers:
+      mech-battery-slot:
+      - PowerCellAntiqueProto
+
+- type: entity
+  id: MechSeraphFilled
+  parent: MechSeraphBattery
+  suffix: Battery, Filled
+  components:
+  - type: Mech
+    startingEquipment:
+      - WeaponMechChainSword
+      - WeaponMechCombatPulseRifle
+      - WeaponMechCombatShotgun
+      - WeaponMechCombatMissileRack6
+      - WeaponMechCombatUltraRifle
+
+# Syndicate Combat Mech
+
+# Dark Gygax
+- type: entity
+  id: MechGygaxSyndie
+  parent: [ BaseMech, CombatMech, BaseSyndicateContraband ]
+  name: Dark Gygax
+  description: A modified Gygax used for nefarious purposes. On the back of the armor plate there is an inscription "Cybersun Inc."
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    noRot: true
+    sprite: Objects/Specific/Mech/mecha.rsi
+    layers:
+    - map: [ "enum.MechVisualLayers.Base" ]
+      state: darkgygax
+  - type: FootstepModifier
+    footstepSoundCollection:
+      path: /Audio/Mecha/sound_mecha_powerloader_step.ogg
+  - type: Mech
+    baseState: darkgygax
+    openState: darkgygax-open
+    brokenState: darkgygax-broken
+    mechToPilotDamageMultiplier: 0.15
+    airtight: true
+    maxIntegrity: 300
+    maxEquipmentAmount: 4
+    pilotWhitelist:
+      components:
+        - HumanoidAppearance
+  - type: MeleeWeapon
+    hidden: true
+    attackRate: 1
+    damage:
+      types:
+        Blunt: 30
+        Structural: 200
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 2.2
+    baseSprintSpeed: 3.7
+  - type: Damageable
+    damageModifierSet: MediumArmorSyndi
+  - type: CanMoveInAir
+  - type: MovementAlwaysTouching
+  - type: Repairable
+    fuelCost: 40
+    doAfterDelay: 20
+
+- type: entity
+  id: MechGygaxSyndieBattery
+  parent: MechGygaxSyndie
+  suffix: Battery
+  components:
+  - type: ContainerFill
+    containers:
+      mech-battery-slot:
+      - PowerCellHyper
+
+- type: entity
+  id: MechGygaxSyndieFilled
+  parent: MechGygaxSyndieBattery
+  suffix: Battery, Filled
+  components:
+  - type: Mech
+    startingEquipment:
+      - WeaponMechChainSword
+      - WeaponMechCombatShotgun
+      - WeaponMechCombatMissileRack8
+      - WeaponMechCombatTeslaCannon
+
+# Mauler
+- type: entity
+  id: MechMaulerSyndie
+  parent: [ BaseMech, CombatMech, BaseSyndicateContraband ]
+  name: Mauler
+  description: A modified Marauder used by the Syndicate that's not as maneuverable as the Dark Gygax, but it makes up for that in armor and sheer firepower. On the back of the armor plate there is an inscription "Cybersun Inc."
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    noRot: true
+    sprite: Objects/Specific/Mech/mecha.rsi
+    layers:
+    - map: [ "enum.MechVisualLayers.Base" ]
+      state: mauler
+  - type: FootstepModifier
+    footstepSoundCollection:
+      path: /Audio/Mecha/sound_mecha_powerloader_step.ogg
+  - type: Mech
+    baseState: mauler
+    openState: mauler-open
+    brokenState: mauler-broken
+    mechToPilotDamageMultiplier: 0.1
+    airtight: true
+    maxIntegrity: 500
+    maxEquipmentAmount: 5
+    pilotWhitelist:
+      components:
+        - HumanoidAppearance
+  - type: MeleeWeapon
+    hidden: true
+    attackRate: 1
+    damage:
+      types:
+        Blunt: 50
+        Structural: 400
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 1
+    baseSprintSpeed: 1.5
+  - type: Damageable
+    damageModifierSet: HeavyArmorSyndi
+  - type: CanMoveInAir
+  - type: MovementAlwaysTouching
+  - type: Repairable
+    fuelCost: 50
+    doAfterDelay: 25
+
+- type: entity
+  id: MechMaulerSyndieBattery
+  parent: MechMaulerSyndie
+  suffix: Battery
+  components:
+  - type: ContainerFill
+    containers:
+      mech-battery-slot:
+      - PowerCellHyper
+
+- type: entity
+  id: MechMaulerSyndieFilled
+  parent: MechMaulerSyndieBattery
+  suffix: Battery, Filled
+  components:
+  - type: Mech
+    startingEquipment:
+      - WeaponMechChainSword
+      - WeaponMechCombatUltraRifle
+      - WeaponMechCombatShotgun
+      - WeaponMechCombatMissileRack6
+      - WeaponMechCombatTeslaCannon

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -513,6 +513,14 @@
       - HonkerCentralElectronics
       - HonkerPeripheralsElectronics
       - HonkerTargetingElectronics
+      - GygaxCentralElectronics
+      - GygaxPeripheralsElectronics
+      - GygaxTargetingElectronics
+      - DurandCentralElectronics
+      - DurandPeripheralsElectronics
+      - DurandTargetingElectronics
+      - ClarkeCentralElectronics
+      - ClarkePeripheralsElectronics
       - HamtrCentralElectronics
       - HamtrPeripheralsElectronics
       - PortableGeneratorPacmanMachineCircuitboard
@@ -632,6 +640,8 @@
     - RightLegBorgService
     - HeadBorgService
     - TorsoBorgService
+    - MechAirTank
+    - MechThruster
     dynamicRecipes:
 #Sunrise-edit start
     - CartridgeLightRifleRubber
@@ -665,6 +675,8 @@
     - RipleyRArm
     - RipleyLLeg
     - RipleyRLeg
+    - RipleyMKIIHarness
+    - RipleyUpgradeKit
     - MechEquipmentGrabber
     - HonkerHarness
     - HonkerLArm
@@ -679,6 +691,41 @@
     - HamtrLLeg
     - HamtrRLeg
     - VimHarness
+    - ClarkeHarness
+    - ClarkeHead
+    - ClarkeLArm
+    - ClarkeRArm
+    - ClarkeTreads
+    - DurandHarness
+    - DurandArmor
+    - DurandHead
+    - DurandLArm
+    - DurandLLeg
+    - DurandRArm
+    - DurandRLeg
+    - GygaxHarness
+    - GygaxArmor
+    - GygaxHead
+    - GygaxLArm
+    - GygaxLLeg
+    - GygaxRArm
+    - GygaxRLeg
+    - MechEquipmentDrill
+    - MechEquipmentDrillDiamond
+    - MechEquipmentKineticAccelerator
+    - MechEquipmentHonkerBananaMortar
+    - MechEquipmentHonkerMousetrapMortar
+  - type: EmagLatheRecipes
+    emagDynamicRecipes:
+    - WeaponMechCombatImmolationGun
+    - WeaponMechCombatSolarisLaser
+    - WeaponMechCombatFiredartLaser
+    - WeaponMechCombatUltraRifle
+    - WeaponMechCombatShotgun
+    - WeaponMechCombatShotgunIncendiary
+    - WeaponMechCombatDisabler
+    - WeaponMechCombatFlashbangLauncher
+    - WeaponMechCombatMissileRack8
   - type: MaterialStorage
     whitelist:
       tags:
@@ -878,6 +925,15 @@
       - WeaponLaserCannon
       - WeaponLaserCarbine
       - WeaponXrayCannon
+      - WeaponMechCombatImmolationGun # Sunrise - Mechs
+      - WeaponMechCombatSolarisLaser # Sunrise - Mechs
+      - WeaponMechCombatFiredartLaser # Sunrise - Mechs
+      - WeaponMechCombatUltraRifle # Sunrise - Mechs
+      - WeaponMechCombatShotgun # Sunrise - Mechs
+      - WeaponMechCombatShotgunIncendiary # Sunrise - Mechs
+      - WeaponMechCombatDisabler # Sunrise - Mechs
+      - WeaponMechCombatFlashbangLauncher # Sunrise - Mechs
+      - WeaponMechCombatMissileRack8 # Sunrise - Mechs
       - WeaponEnergyGun       # Sunrise - Energy Gun
       - WeaponEnergyGunMini   # Sunrise - Miniature Energy Gun
       - WeaponEnergyGunPistol # Sunrise - PDW-9 Energy Pistol

Resources/Prototypes/Recipes/Construction/Graphs/mechs/clarke_construction.yml

@@ -0,0 +1,156 @@
+- type: constructionGraph
+  id: Clarke
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: clarke
+      steps:
+      - tool: Anchoring
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 1
+
+      - tool: Screwing
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 2
+
+      - material: Cable
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 3
+
+      - tool: Cutting
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 4
+
+      - tag: ClarkeCentralControlModule
+        name: clarke central control module
+        icon:
+          sprite: "Objects/Misc/module.rsi"
+          state: "mainboard"
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 5
+
+      - tool: Screwing
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 6
+
+      - tag: ClarkePeripheralsControlModule
+        name: clarke peripherals control module
+        icon:
+          sprite: "Objects/Misc/module.rsi"
+          state: id_mod
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 7
+
+      - tool: Screwing
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 8
+
+      - tag: CapacitorStockPart
+        name: capacitor
+        icon:
+          sprite: Objects/Misc/stock_parts.rsi
+          state: capacitor
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 9
+
+      - tool: Screwing
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 10
+
+      - component: PowerCell
+        name: power cell
+        store: battery-container
+        icon:
+          sprite: Objects/Power/power_cells.rsi
+          state: small
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 11
+
+      - tool: Screwing
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 12
+
+      - material: Steel
+        amount: 5
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 14
+
+      - tool: Anchoring
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 15
+
+      - tool: Welding
+        doAfter: 1
+
+      - material: Gold
+        amount: 5
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 16
+
+      - tool: Anchoring
+        doAfter: 1
+
+      - tag: MechAirTank
+        name: exosuit air tank
+        icon:
+          sprite: Objects/Specific/Mech/mecha_equipment.rsi
+          state: mecha_air_tank
+
+      - tool: Anchoring
+        doAfter: 1
+
+      - tag: MechThruster
+        name: exosuit thruster
+        icon:
+          sprite: Objects/Specific/Mech/mecha_equipment.rsi
+          state: mecha_bin
+
+      - tool: Anchoring
+        doAfter: 1
+
+      - tool: Welding
+        doAfter: 1
+
+  - node: clarke
+    actions:
+    - !type:BuildMech
+      mechPrototype: MechClarke

Resources/Prototypes/Recipes/Construction/Graphs/mechs/durand_construction.yml

@@ -0,0 +1,180 @@
+- type: constructionGraph
+  id: Durand
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: durand
+      steps:
+      - tool: Anchoring
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 1
+
+      - tool: Screwing
+        doAfter: 1
+
+      - material: Cable
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 2
+
+      - tool: Cutting
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 3
+
+      - tag: DurandCentralControlModule
+        name: durand central control module
+        icon:
+          sprite: "Objects/Misc/module.rsi"
+          state: "mainboard"
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 4
+
+      - tool: Screwing
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 5
+
+      - tag: DurandPeripheralsControlModule
+        name: durand peripherals control module
+        icon:
+          sprite: "Objects/Misc/module.rsi"
+          state: id_mod
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 6
+
+      - tool: Screwing
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 7
+
+      - tag: DurandTargetingControlModule
+        name: durand weapon control and targeting module
+        icon:
+          sprite: "Objects/Misc/module.rsi"
+          state: mcontroller
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 8
+
+      - tool: Screwing
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 9
+
+      - tag: CapacitorStockPart
+        name: capacitor
+        icon:
+          sprite: Objects/Misc/stock_parts.rsi
+          state: capacitor
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 10
+
+      - tool: Screwing
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 11
+
+      - component: PowerCell
+        name: power cell
+        store: battery-container
+        icon:
+          sprite: Objects/Power/power_cells.rsi
+          state: small
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 12
+
+      - tool: Screwing
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 13
+
+      - material: Steel
+        amount: 5
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 14
+
+      - tool: Anchoring
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 15
+
+      - tool: Welding
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 16
+
+      - tag: MechAirTank
+        name: exosuit air tank
+        icon:
+          sprite: Objects/Specific/Mech/mecha_equipment.rsi
+          state: mecha_air_tank
+
+      - tool: Anchoring
+        doAfter: 1
+
+      - tag: MechThruster
+        name: exosuit thruster
+        icon:
+          sprite: Objects/Specific/Mech/mecha_equipment.rsi
+          state: mecha_bin
+
+      - tool: Anchoring
+        doAfter: 1
+
+      - tag: DurandArmor
+        name: durand armor plates
+        icon:
+          sprite: "Objects/Specific/Mech/durand_construction.rsi"
+          state: durand_armor
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 17
+
+      - tool: Anchoring
+        doAfter: 2
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 18
+
+      - tool: Welding
+        doAfter: 1
+
+  - node: durand
+    actions:
+    - !type:BuildMech
+      mechPrototype: MechDurand

Resources/Prototypes/Recipes/Construction/Graphs/mechs/gygax_construction.yml

@@ -0,0 +1,180 @@
+- type: constructionGraph
+  id: Gygax
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: gygax
+      steps:
+      - tool: Anchoring
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 1
+
+      - tool: Screwing
+        doAfter: 1
+
+      - material: Cable
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 2
+
+      - tool: Cutting
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 3
+
+      - tag: GygaxCentralControlModule
+        name: gygax central control module
+        icon:
+          sprite: "Objects/Misc/module.rsi"
+          state: "mainboard"
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 4
+
+      - tool: Screwing
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 5
+
+      - tag: GygaxPeripheralsControlModule
+        name: gygax peripherals control module
+        icon:
+          sprite: "Objects/Misc/module.rsi"
+          state: id_mod
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 6
+
+      - tool: Screwing
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 7
+
+      - tag: GygaxTargetingControlModule
+        name: gygax weapon control and targeting module
+        icon:
+          sprite: "Objects/Misc/module.rsi"
+          state: mcontroller
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 8
+
+      - tool: Screwing
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 9
+
+      - tag: CapacitorStockPart
+        name: capacitor
+        icon:
+          sprite: Objects/Misc/stock_parts.rsi
+          state: capacitor
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 10
+
+      - tool: Screwing
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 11
+
+      - component: PowerCell
+        name: power cell
+        store: battery-container
+        icon:
+          sprite: Objects/Power/power_cells.rsi
+          state: small
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 12
+
+      - tool: Screwing
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 13
+
+      - material: Steel
+        amount: 5
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 16
+
+      - tool: Anchoring
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 17
+
+      - tool: Welding
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 18
+
+      - tag: MechAirTank
+        name: exosuit air tank
+        icon:
+          sprite: Objects/Specific/Mech/mecha_equipment.rsi
+          state: mecha_air_tank
+
+      - tool: Anchoring
+        doAfter: 1
+
+      - tag: MechThruster
+        name: exosuit thruster
+        icon:
+          sprite: Objects/Specific/Mech/mecha_equipment.rsi
+          state: mecha_bin
+
+      - tool: Anchoring
+        doAfter: 1
+
+      - tag: GygaxArmor
+        name: gygax armor plates
+        icon:
+          sprite: "Objects/Specific/Mech/gygax_construction.rsi"
+          state: gygax_armor
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 19
+
+      - tool: Anchoring
+        doAfter: 2
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 20
+
+      - tool: Welding
+        doAfter: 1
+
+  - node: gygax
+    actions:
+    - !type:BuildMech
+      mechPrototype: MechGygax

Resources/Prototypes/Recipes/Construction/Graphs/mechs/ripleymkii_construction.yml

@@ -0,0 +1,138 @@
+- type: constructionGraph
+  id: RipleyMKII
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: ripleymkii
+      steps:
+      - tool: Anchoring
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 1
+
+      - tool: Screwing
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 2
+
+      - material: Cable
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 3
+
+      - tool: Cutting
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 4
+
+      - tag: RipleyCentralControlModule
+        name: ripley central control module
+        icon:
+          sprite: "Objects/Misc/module.rsi"
+          state: "mainboard"
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 5
+
+      - tool: Screwing
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 6
+
+      - tag: RipleyPeripheralsControlModule
+        name: ripley peripherals control module
+        icon:
+          sprite: "Objects/Misc/module.rsi"
+          state: id_mod
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 7
+
+      - tool: Screwing
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 8
+
+      - component: PowerCell
+        name: power cell
+        store: battery-container
+        icon:
+          sprite: Objects/Power/power_cells.rsi
+          state: small
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 9
+
+      - tool: Screwing
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 12
+
+      - material: Steel
+        amount: 5
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 15
+
+      - tool: Anchoring
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 16
+
+      - tool: Welding
+        doAfter: 1
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 17
+
+      - tag: MechAirTank
+        name: exosuit air tank
+        icon:
+          sprite: Objects/Specific/Mech/mecha_equipment.rsi
+          state: mecha_air_tank
+
+      - tool: Anchoring
+        doAfter: 1
+
+      - material: Plasteel
+        amount: 10
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 19
+
+      - tool: Anchoring
+        doAfter: 2
+        completed:
+        - !type:VisualizerDataInt
+          key: "enum.MechAssemblyVisuals.State"
+          data: 20
+
+      - tool: Welding
+        doAfter: 1
+
+  - node: ripleymkii
+    actions:
+    - !type:BuildMech
+      mechPrototype: MechRipley2

Resources/Prototypes/Recipes/Lathes/categories.yml

@@ -10,10 +10,6 @@
   id: Lights
   name: lathe-category-lights
 
-- type: latheCategory
-  id: Mech
-  name: lathe-category-mechs
-
 - type: latheCategory
   id: Parts
   name: lathe-category-parts
@@ -43,3 +39,44 @@
 - type: latheCategory
   id: Materials
   name: lathe-category-materials
+
+# Exosuit
+- type: latheCategory
+  id: Vim
+  name: lathe-category-mechs-vim
+
+- type: latheCategory
+  id: Honker
+  name: lathe-category-mechs-honker
+
+- type: latheCategory
+  id: Hamptr
+  name: lathe-category-mechs-hamptr
+
+- type: latheCategory
+  id: Ripley
+  name: lathe-category-mechs-ripley
+
+- type: latheCategory
+  id: RipleyMKII
+  name: lathe-category-mechs-ripleymkii
+
+- type: latheCategory
+  id: Clarke
+  name: lathe-category-mechs-clarke
+
+- type: latheCategory
+  id: Gygax
+  name: lathe-category-mechs-gygax
+
+- type: latheCategory
+  id: Durand
+  name: lathe-category-mechs-durand
+
+- type: latheCategory
+  id: MechEquipment
+  name: lathe-category-mechs-equipment
+
+- type: latheCategory
+  id: MechWeapons
+  name: lathe-category-mechs-weapons

Resources/Prototypes/Recipes/Lathes/electronics.yml

@@ -353,6 +353,46 @@
   id: RipleyPeripheralsElectronics
   result: RipleyPeripheralsElectronics
 
+- type: latheRecipe
+  parent: BaseGoldCircuitboardRecipe
+  id: ClarkeCentralElectronics
+  result: ClarkeCentralElectronics
+
+- type: latheRecipe
+  parent: BaseGoldCircuitboardRecipe
+  id: ClarkePeripheralsElectronics
+  result: ClarkePeripheralsElectronics
+
+- type: latheRecipe
+  parent: BaseGoldCircuitboardRecipe
+  id: GygaxCentralElectronics
+  result: GygaxCentralElectronics
+
+- type: latheRecipe
+  parent: BaseGoldCircuitboardRecipe
+  id: GygaxPeripheralsElectronics
+  result: GygaxPeripheralsElectronics
+
+- type: latheRecipe
+  parent: BaseGoldCircuitboardRecipe
+  id: GygaxTargetingElectronics
+  result: GygaxTargetingElectronics
+
+- type: latheRecipe
+  parent: BaseSilverCircuitboardRecipe
+  id: DurandCentralElectronics
+  result: DurandCentralElectronics
+
+- type: latheRecipe
+  parent: BaseSilverCircuitboardRecipe
+  id: DurandPeripheralsElectronics
+  result: DurandPeripheralsElectronics
+
+- type: latheRecipe
+  parent: BaseSilverCircuitboardRecipe
+  id: DurandTargetingElectronics
+  result: DurandTargetingElectronics
+
 - type: latheRecipe
   parent: BaseBananiumCircuitboardRecipe
   id: HonkerCentralElectronics

Resources/Prototypes/Recipes/Lathes/mech_parts.yml

@@ -1,8 +1,180 @@
+# Clarke
+- type: latheRecipe
+  id: ClarkeHarness
+  result: ClarkeHarness
+  category: Clarke
+  completetime: 10
+  materials:
+    Steel: 2000
+    Glass: 1500
+
+- type: latheRecipe
+  id: ClarkeHead
+  result: ClarkeHead
+  category: Clarke
+  completetime: 10
+  materials:
+    Steel: 1550
+    Glass: 950
+
+- type: latheRecipe
+  id: ClarkeLArm
+  result: ClarkeLArm
+  category: Clarke
+  completetime: 10
+  materials:
+    Steel: 900
+    Glass: 800
+
+- type: latheRecipe
+  id: ClarkeRArm
+  result: ClarkeRArm
+  category: Clarke
+  completetime: 10
+  materials:
+    Steel: 900
+    Glass: 800
+
+- type: latheRecipe
+  id: ClarkeTreads
+  result: ClarkeTreads
+  category: Clarke
+  completetime: 10
+  materials:
+    Steel: 950
+
+# Durand
+- type: latheRecipe
+  id: DurandHarness
+  result: DurandHarness
+  category: Durand
+  completetime: 10
+  materials:
+    Steel: 2500
+    Glass: 2000
+    Silver: 1500
+
+- type: latheRecipe
+  id: DurandArmor
+  result: DurandArmorPlate
+  category: Durand
+  completetime: 10
+  materials:
+    Steel: 3000
+    Silver: 900
+
+- type: latheRecipe
+  id: DurandHead
+  result: DurandHead
+  category: Durand
+  completetime: 10
+  materials:
+    Steel: 1500
+    Glass: 800
+    Silver: 250
+    Diamond: 100
+
+- type: latheRecipe
+  id: DurandLArm
+  result: DurandLArm
+  category: Durand
+  completetime: 10
+  materials:
+    Steel: 1100
+    Silver: 250
+
+- type: latheRecipe
+  id: DurandLLeg
+  result: DurandLLeg
+  category: Durand
+  completetime: 10
+  materials:
+    Steel: 1100
+    Silver: 250
+
+- type: latheRecipe
+  id: DurandRLeg
+  result: DurandRLeg
+  category: Durand
+  completetime: 10
+  materials:
+    Steel: 1100
+    Silver: 250
+
+- type: latheRecipe
+  id: DurandRArm
+  result: DurandRArm
+  category: Durand
+  completetime: 10
+  materials:
+    Steel: 1100
+    Silver: 250
+
+# Gygax
+- type: latheRecipe
+  id: GygaxHarness
+  result: GygaxHarness
+  category: Gygax
+  completetime: 10
+  materials:
+    Steel: 2500
+    Glass: 2000
+
+- type: latheRecipe
+  id: GygaxArmor
+  result: GygaxArmorPlate
+  category: Gygax
+  completetime: 10
+  materials:
+    Steel: 3000
+
+- type: latheRecipe
+  id: GygaxHead
+  result: GygaxHead
+  category: Gygax
+  completetime: 10
+  materials:
+    Steel: 1500
+    Glass: 250
+    Diamond: 100
+
+- type: latheRecipe
+  id: GygaxLArm
+  result: GygaxLArm
+  category: Gygax
+  completetime: 10
+  materials:
+    Steel: 1100
+
+- type: latheRecipe
+  id: GygaxLLeg
+  result: GygaxLLeg
+  category: Gygax
+  completetime: 10
+  materials:
+    Steel: 1100
+
+- type: latheRecipe
+  id: GygaxRLeg
+  result: GygaxRLeg
+  category: Gygax
+  completetime: 10
+  materials:
+    Steel: 1100
+
+- type: latheRecipe
+  id: GygaxRArm
+  result: GygaxRArm
+  category: Gygax
+  completetime: 10
+  materials:
+    Steel: 1100
+
 # Ripley
 - type: latheRecipe
   id: RipleyHarness
   result: RipleyHarness
-  category: Mech
+  category: Ripley
   completetime: 10
   materials:
     Steel: 1500
@@ -11,7 +183,7 @@
 - type: latheRecipe
   id: RipleyLArm
   result: RipleyLArm
-  category: Mech
+  category: Ripley
   completetime: 10
   materials:
     Steel: 1000
@@ -20,7 +192,7 @@
 - type: latheRecipe
   id: RipleyLLeg
   result: RipleyLLeg
-  category: Mech
+  category: Ripley
   completetime: 10
   materials:
     Steel: 1000
@@ -29,7 +201,7 @@
 - type: latheRecipe
   id: RipleyRLeg
   result: RipleyRLeg
-  category: Mech
+  category: Ripley
   completetime: 10
   materials:
     Steel: 1000
@@ -38,26 +210,35 @@
 - type: latheRecipe
   id: RipleyRArm
   result: RipleyRArm
-  category: Mech
+  category: Ripley
   completetime: 10
   materials:
     Steel: 1000
     Glass: 750
 
+# Ripley MK-II
 - type: latheRecipe
-  id: MechEquipmentGrabber
-  result: MechEquipmentGrabber
-  category: Mech
+  id: RipleyMKIIHarness
+  result: RipleyMKIIHarness
+  category: RipleyMKII
+  completetime: 10
+  materials:
+    Steel: 1500
+    Glass: 1200
+
+- type: latheRecipe
+  id: RipleyUpgradeKit
+  result: RipleyUpgradeKit
+  category: RipleyMKII
   completetime: 10
   materials:
     Steel: 500
-    Plastic: 200
 
 # H.O.N.K.
 - type: latheRecipe
   id: HonkerHarness
   result: HonkerHarness
-  category: Mech
+  category: Honker
   completetime: 10
   materials:
     Steel: 3000
@@ -67,7 +248,7 @@
 - type: latheRecipe
   id: HonkerLArm
   result: HonkerLArm
-  category: Mech
+  category: Honker
   completetime: 10
   materials:
     Steel: 3000
@@ -77,7 +258,7 @@
 - type: latheRecipe
   id: HonkerLLeg
   result: HonkerLLeg
-  category: Mech
+  category: Honker
   completetime: 10
   materials:
     Steel: 3000
@@ -87,7 +268,7 @@
 - type: latheRecipe
   id: HonkerRLeg
   result: HonkerRLeg
-  category: Mech
+  category: Honker
   completetime: 10
   materials:
     Steel: 3000
@@ -97,27 +278,18 @@
 - type: latheRecipe
   id: HonkerRArm
   result: HonkerRArm
-  category: Mech
+  category: Honker
   completetime: 10
   materials:
     Steel: 3000
     Glass: 1200
     Bananium: 500
 
-- type: latheRecipe
-  id: MechEquipmentHorn
-  result: MechEquipmentHorn
-  category: Mech
-  completetime: 10
-  materials:
-    Steel: 500
-    Bananium: 200
-
 # HAMTR
 - type: latheRecipe
   id: HamtrHarness
   result: HamtrHarness
-  category: Mech
+  category: Hamptr
   completetime: 10
   materials:
     Steel: 1200
@@ -126,7 +298,7 @@
 - type: latheRecipe
   id: HamtrLArm
   result: HamtrLArm
-  category: Mech
+  category: Hamptr
   completetime: 10
   materials:
     Steel: 800
@@ -135,7 +307,7 @@
 - type: latheRecipe
   id: HamtrLLeg
   result: HamtrLLeg
-  category: Mech
+  category: Hamptr
   completetime: 10
   materials:
     Steel: 800
@@ -144,7 +316,7 @@
 - type: latheRecipe
   id: HamtrRLeg
   result: HamtrRLeg
-  category: Mech
+  category: Hamptr
   completetime: 10
   materials:
     Steel: 800
@@ -153,27 +325,104 @@
 - type: latheRecipe
   id: HamtrRArm
   result: HamtrRArm
-  category: Mech
+  category: Hamptr
   completetime: 10
   materials:
     Steel: 800
     Glass: 600
 
+# Vim
+- type: latheRecipe
+  id: VimHarness
+  result: VimHarness
+  category: Vim
+  completetime: 5
+  materials:
+    Steel: 500
+    Glass: 200
+
+
+# Equipment
+- type: latheRecipe
+  id: MechEquipmentDrill
+  result: WeaponMechMelleDrill
+  category: MechEquipment
+  completetime: 10
+  materials:
+    Steel: 1000
+    Glass: 250
+
+- type: latheRecipe
+  id: MechEquipmentDrillDiamond
+  result: WeaponMechMelleDrillDiamond
+  category: MechEquipment
+  completetime: 10
+  materials:
+    Steel: 1000
+    Plastic: 150
+    Silver: 350
+    Diamond: 150
+
+- type: latheRecipe
+  id: MechEquipmentGrabber
+  result: MechEquipmentGrabber
+  category: MechEquipment
+  completetime: 10
+  materials:
+    Steel: 500
+    Plastic: 200
+
 - type: latheRecipe
   id: MechEquipmentGrabberSmall
   result: MechEquipmentGrabberSmall
-  category: Mech
+  category: MechEquipment
   completetime: 10
   materials:
     Steel: 400
     Plastic: 100
 
-# Vim
 - type: latheRecipe
-  id: VimHarness
-  result: VimHarness
-  category: Mech
-  completetime: 5
+  id: MechEquipmentHorn
+  result: MechEquipmentHorn
+  category: MechEquipment
+  completetime: 10
   materials:
     Steel: 500
-    Glass: 200
+    Bananium: 200
+
+- type: latheRecipe
+  id: MechEquipmentHonkerBananaMortar
+  result: WeaponMechSpecialBananaMortar
+  category: MechEquipment
+  completetime: 10
+  materials:
+    Steel: 1150
+    Bananium: 800
+
+- type: latheRecipe
+  id: MechEquipmentHonkerMousetrapMortar
+  result: WeaponMechSpecialMousetrapMortar
+  category: MechEquipment
+  completetime: 10
+  materials:
+    Steel: 1200
+    Bananium: 300
+
+# Misc
+- type: latheRecipe
+  id: MechAirTank
+  result: MechAirTank
+  category: MechEquipment
+  completetime: 10
+  materials:
+    Steel: 1000
+    Glass: 150
+
+- type: latheRecipe
+  id: MechThruster
+  result: MechThruster
+  category: MechEquipment
+  completetime: 10
+  materials:
+    Steel: 1000
+    Glass: 150

Resources/Prototypes/Recipes/Lathes/security.yml

@@ -677,3 +677,105 @@
     Plastic: 1000
     Plasma: 500
     Glass: 500
+
+# Mech Weapons
+- type: latheRecipe
+  id: WeaponMechCombatImmolationGun
+  result: WeaponMechCombatImmolationGun
+  category: MechWeapons
+  completetime: 10
+  materials:
+    Steel: 2800
+    Plastic: 1000
+    Plasma: 750
+    Glass: 500
+
+- type: latheRecipe
+  id: WeaponMechCombatSolarisLaser
+  result: WeaponMechCombatSolarisLaser
+  category: MechWeapons
+  completetime: 10
+  materials:
+    Steel: 1650
+    Plastic: 300
+    Plasma: 250
+    Glass: 200
+
+- type: latheRecipe
+  id: WeaponMechCombatFiredartLaser
+  result: WeaponMechCombatFiredartLaser
+  category: MechWeapons
+  completetime: 10
+  materials:
+    Steel: 1200
+    Plastic: 200
+    Plasma: 150
+    Glass: 50
+
+- type: latheRecipe
+  id: WeaponMechCombatUltraRifle
+  result: WeaponMechCombatUltraRifle
+  category: MechWeapons
+  completetime: 10
+  materials:
+    Steel: 1000
+    Plastic: 200
+
+- type: latheRecipe
+  id: WeaponMechCombatShotgun
+  result: WeaponMechCombatShotgun
+  category: MechWeapons
+  completetime: 10
+  materials:
+    Steel: 1600
+    Plastic: 550
+
+- type: latheRecipe
+  id: WeaponMechCombatShotgunIncendiary
+  result: WeaponMechCombatShotgunIncendiary
+  category: MechWeapons
+  completetime: 10
+  materials:
+    Steel: 1500
+    Plastic: 800
+    Plasma: 300
+
+- type: latheRecipe
+  id: WeaponMechCombatDisabler
+  result: WeaponMechCombatDisabler
+  category: MechWeapons
+  completetime: 10
+  materials:
+    Steel: 750
+    Glass: 250
+    Plastic: 300
+
+- type: latheRecipe
+  id: WeaponMechCombatFlashbangLauncher
+  result: WeaponMechCombatFlashbangLauncher
+  category: MechWeapons
+  completetime: 10
+  materials:
+    Steel: 1200
+    Glass: 300
+    Plastic: 450
+
+- type: latheRecipe
+  id: WeaponMechCombatMissileRack8
+  result: WeaponMechCombatMissileRack8
+  category: MechWeapons
+  completetime: 10
+  materials:
+    Steel: 2500
+    Glass: 1500
+    Plastic: 750
+
+- type: latheRecipe
+  id: MechEquipmentKineticAccelerator
+  result: WeaponMechIndustrialKineticAccelerator
+  category: MechEquipment
+  completetime: 10
+  materials:
+    Steel: 1500
+    Glass: 750
+    Silver: 150