diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
index 760788616ab..f6c78079880 100644
--- a/Content.Server/Physics/Controllers/MoverController.cs
+++ b/Content.Server/Physics/Controllers/MoverController.cs
@@ -440,7 +440,15 @@ public Vector2 GetDirectionThrust(Vector2 dir, ShuttleComponent shuttle, Physics
dir = dir - dirCompVel + scaledComp;
}
- return dir * shuttle.AccelerationMultiplier;
+ // return dir * shuttle.AccelerationMultiplier; // LuaM comented
+ // LuaM-start:
+ var thrust = dir * shuttle.AccelerationMultiplier;
+ if (shuttle.BodyModifier == ShuttleSystem.DampenDampingStrength)
+ {
+ return thrust * 1.3f;
+ }
+ return thrust;
+ // LuaM-end
}
///
diff --git a/Content.Server/Shuttles/Components/ShuttleConsoleComponent.cs b/Content.Server/Shuttles/Components/ShuttleConsoleComponent.cs
index 7cad1d5097a..b211a52d099 100644
--- a/Content.Server/Shuttles/Components/ShuttleConsoleComponent.cs
+++ b/Content.Server/Shuttles/Components/ShuttleConsoleComponent.cs
@@ -67,6 +67,11 @@ public sealed partial class ShuttleConsoleComponent : SharedShuttleConsoleCompon
public SoundSpecifier? AutopilotDoneSound = new SoundPathSpecifier("/Audio/Effects/Shuttle/radar_ping.ogg");
//
+ // LuaM-start:
+ [ViewVariables(VVAccess.ReadWrite)]
+ public float? AutopilotMaxSpeed;
+ // LuaM-end
+
// Network Port Button Source Ports
[DataField]
public List> SourcePorts = new()
diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
index 3531a3f4ad8..f6d89379204 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
@@ -33,6 +33,7 @@
using Robust.Shared.Prototypes;
using Content.Shared._Crescent.ShipShields; // Forge
using Robust.Shared.Timing; // Forge
+using Content.Server._Mono.NPC.HTN; // LuaM
namespace Content.Server.Shuttles.Systems;
@@ -463,6 +464,25 @@ private void OnConsoleShutdown(EntityUid uid, ShuttleConsoleComponent component,
ClearPilots(component);
}
+ // LuaM-start: | check for pilot or autopilot
+ public bool IsGridManned(EntityUid gridUid)
+ {
+ var consoles = new HashSet>();
+ _lookup.GetChildEntities(gridUid, consoles);
+
+ foreach (var console in consoles)
+ {
+ if (console.Comp.SubscribedPilots.Count > 0)
+ return true;
+
+ if (HasComp(console.Owner))
+ return true;
+ }
+
+ return false;
+ }
+ // LuaM-end
+
public void AddPilot(EntityUid uid, EntityUid entity, ShuttleConsoleComponent component)
{
if (!EntityManager.TryGetComponent(entity, out PilotComponent? pilotComponent)
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
index 55858cc282f..bf101545da0 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
@@ -114,6 +114,7 @@ public override void Update(float frameTime)
{
base.Update(frameTime);
UpdateHyperspace();
+ UpdateUnmannedShuttles(); // LuaM stop uncontrolled shuttles
}
private void OnGridFixtureChange(EntityUid uid, FixturesComponent manager, GridFixtureChangeEvent args)
diff --git a/Content.Server/_Mono/NPC/HTN/ShipSteererComponent.cs b/Content.Server/_Mono/NPC/HTN/ShipSteererComponent.cs
index 646503c5cdc..84f0a31e59e 100644
--- a/Content.Server/_Mono/NPC/HTN/ShipSteererComponent.cs
+++ b/Content.Server/_Mono/NPC/HTN/ShipSteererComponent.cs
@@ -204,6 +204,8 @@ public sealed partial class ShipSteererComponent : Component
///
[ViewVariables(VVAccess.ReadWrite)]
public float TargetRotation = 0f;
+
+ public float? MaxVelocity = null; // LuaM
}
public enum ShipSteeringStatus : byte
diff --git a/Content.Server/_Mono/NPC/HTN/ShipSteeringSystem.cs b/Content.Server/_Mono/NPC/HTN/ShipSteeringSystem.cs
index 63313034fcf..544016c402e 100644
--- a/Content.Server/_Mono/NPC/HTN/ShipSteeringSystem.cs
+++ b/Content.Server/_Mono/NPC/HTN/ShipSteeringSystem.cs
@@ -156,6 +156,7 @@ private void OnSteererGetInputs(Entity ent, ref GetShuttle
};
args.Input = ProcessMovement(ref context, config);
+ args.SetMaxVelocity = ent.Comp.MaxVelocity; // LuaM
}
///
diff --git a/Content.Server/_Mono/Radar/ToggleableSignatureComponent.cs b/Content.Server/_Mono/Radar/ToggleableSignatureComponent.cs
index bfa7a6247c8..4d1bb626d59 100644
--- a/Content.Server/_Mono/Radar/ToggleableSignatureComponent.cs
+++ b/Content.Server/_Mono/Radar/ToggleableSignatureComponent.cs
@@ -14,7 +14,7 @@ public sealed partial class ToggleableSignatureComponent : Component
public bool Examinable = true;
[DataField]
- public bool Enabled = false;
+ public bool Enabled = true; // LuaM: false > true
[DataField]
public RadarBlipComponent Blip = new();
diff --git a/Content.Server/_Mono/Shuttles/Systems/ShuttleConsoleSystem.Autopilot.cs b/Content.Server/_Mono/Shuttles/Systems/ShuttleConsoleSystem.Autopilot.cs
index a347f28c58c..5bd9db5438e 100644
--- a/Content.Server/_Mono/Shuttles/Systems/ShuttleConsoleSystem.Autopilot.cs
+++ b/Content.Server/_Mono/Shuttles/Systems/ShuttleConsoleSystem.Autopilot.cs
@@ -5,6 +5,7 @@
using Content.Shared._Mono.Shuttles;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
+using Content.Server._Mono.NPC.HTN; // LuaM
namespace Content.Server._Mono.Shuttles;
@@ -30,6 +31,11 @@ private void OnAutopilotMessage(Entity ent, ref Shuttle
var blackboard = htn.Blackboard;
blackboard.SetValue(ent.Comp.AutopilotTargetKey, _transform.ToCoordinates(args.Coordinates));
blackboard.SetValue(ent.Comp.AutopilotRotationKey, args.Angle + MathF.PI);
+
+ // LuaM-start:
+ var steerer = EnsureComp(ent.Owner);
+ steerer.MaxVelocity = ent.Comp.AutopilotMaxSpeed;
+ // LuaM-end
}
private void OnSteeringDone(Entity ent, ref SteeringDoneEvent args)
diff --git a/Content.Server/_NF/PacifiedZone/PacifiedZoneGeneratorSystem.cs b/Content.Server/_NF/PacifiedZone/PacifiedZoneGeneratorSystem.cs
index 6dc562d6b98..191b30036d9 100644
--- a/Content.Server/_NF/PacifiedZone/PacifiedZoneGeneratorSystem.cs
+++ b/Content.Server/_NF/PacifiedZone/PacifiedZoneGeneratorSystem.cs
@@ -7,6 +7,7 @@
using Content.Shared.Mind;
using Content.Shared.Roles.Jobs;
using Content.Server.Players.PlayTimeTracking;
+using Content.Shared.Mobs.Components; // LuaM
namespace Content.Server._NF.PacifiedZone
{
@@ -63,27 +64,48 @@ public override void Update(float frameTime)
private void UpdatePacifiedState(EntityUid genUid, PacifiedZoneGeneratorComponent component)
{
List newEntities = new List();
- var query = _lookup.GetEntitiesInRange(Transform(genUid).Coordinates, component.Radius);
+ // var query = _lookup.GetEntitiesInRange(Transform(genUid).Coordinates, component.Radius); // LuaM comented
+ var query = _lookup.GetEntitiesInRange(Transform(genUid).Coordinates, component.Radius); // LuaM
foreach (var humanoidUid in query)
{
- // Check preconditions for an entity to be pacified at all.
- // If player matches an immune role, or has playtime above a zone's threshold, it should not be pacified.
- if (!_mindSystem.TryGetMind(humanoidUid, out var mindId, out var mind))
- continue;
-
- _jobSystem.MindTryGetJobId(mindId, out var jobId);
+ // LuaM-comented-start:
+ // // Check preconditions for an entity to be pacified at all.
+ // // If player matches an immune role, or has playtime above a zone's threshold, it should not be pacified.
+ // if (!_mindSystem.TryGetMind(humanoidUid, out var mindId, out var mind))
+ // continue;
+
+ // _jobSystem.MindTryGetJobId(mindId, out var jobId);
+
+ // if (jobId != null && component.ImmuneRoles.Contains(jobId.Value))
+ // continue;
+
+ // if (component.ImmunePlaytime != null)
+ // {
+ // var playerInfo = _admin.GetCachedPlayerInfo(mind?.UserId);
+ // if (playerInfo != null && playerInfo.OverallPlaytime >= component.ImmunePlaytime)
+ // {
+ // continue;
+ // }
+ // }
+ // LuaM-comented-end
+ // LuaM-start:
+ if (_mindSystem.TryGetMind(humanoidUid, out var mindId, out var mind))
+ {
+ _jobSystem.MindTryGetJobId(mindId, out var jobId);
- if (jobId != null && component.ImmuneRoles.Contains(jobId.Value))
- continue;
+ if (jobId != null && component.ImmuneRoles.Contains(jobId.Value))
+ continue;
- if (component.ImmunePlaytime != null)
- {
- var playerInfo = _admin.GetCachedPlayerInfo(mind?.UserId);
- if (playerInfo != null && playerInfo.OverallPlaytime >= component.ImmunePlaytime)
+ if (component.ImmunePlaytime != null)
{
- continue;
+ var playerInfo = _admin.GetCachedPlayerInfo(mind?.UserId);
+ if (playerInfo != null && playerInfo.OverallPlaytime >= component.ImmunePlaytime)
+ {
+ continue;
+ }
}
}
+ // LuaM-end
// Existing entity, note it still exists.
if (component.TrackedEntities.Contains(humanoidUid))
diff --git a/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs
index 735f9498656..c28c787e031 100644
--- a/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs
+++ b/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs
@@ -10,6 +10,7 @@
using Content.Shared.Shuttles.Components;
using Robust.Shared.Physics; // Mono
using Robust.Shared.Physics.Components;
+using Robust.Shared.Timing; // LuaM
namespace Content.Server.Shuttles.Systems;
@@ -18,8 +19,13 @@ public sealed partial class ShuttleSystem
[Dependency] private readonly RadarConsoleSystem _radarConsole = default!;
private const float SpaceFrictionStrength = 0.0075f;
- private const float DampenDampingStrength = 0.25f;
+ public const float DampenDampingStrength = 0.25f; // LuaM private > public
private const float AnchorDampingStrength = 2.5f;
+ // LuaM-start:
+ private readonly Dictionary _unmannedSince = new();
+ private static readonly TimeSpan UnmannedGracePeriod = TimeSpan.FromSeconds(3);
+ private static readonly TimeSpan UnmannedDampenPeriod = TimeSpan.FromSeconds(5);
+ // LuaM-end
private void NfInitialize()
{
SubscribeLocalEvent(OnSetInertiaDampening);
@@ -95,6 +101,7 @@ private void OnSetMaxShuttleSpeed(EntityUid uid, ShuttleConsoleComponent compone
maxSpeed = Math.Max(speed, 0f);
pilot.SetMaxVelocity = maxSpeed;
+ component.AutopilotMaxSpeed = maxSpeed; // LuaM sync max speed
// Refresh the shuttle consoles to update the UI
_console.RefreshShuttleConsoles(xform.GridUid.Value);
@@ -148,7 +155,42 @@ public void NfSetPowered(EntityUid uid, ShuttleConsoleComponent component, bool
}
}
}
+ // LuaM-start: | stop shuttles without control
+ private void UpdateUnmannedShuttles()
+ {
+ var now = _gameTiming.CurTime;
+ var query = AllEntityQuery();
+
+ while (query.MoveNext(out var uid, out var shuttle, out var physics, out var xform))
+ {
+ if (_console.IsGridManned(uid))
+ {
+ _unmannedSince.Remove(uid);
+ continue;
+ }
+
+ if (!_unmannedSince.TryGetValue(uid, out var since))
+ {
+ _unmannedSince[uid] = now;
+ continue;
+ }
+
+ var elapsed = now - since;
+
+ if (elapsed < UnmannedGracePeriod)
+ continue;
+
+ var targetMode = elapsed < UnmannedGracePeriod + UnmannedDampenPeriod
+ ? InertiaDampeningMode.Dampen
+ : InertiaDampeningMode.Anchor;
+ if (NfGetInertiaDampeningMode(uid) == targetMode)
+ continue;
+
+ SetInertiaDampening(uid, physics, shuttle, xform, targetMode);
+ }
+ }
+ // LuaM-end
public void NfSetTargetCoordinates(EntityUid uid, ShuttleConsoleComponent component, SetTargetCoordinatesRequest args)
{
if (!TryComp(uid, out var radarConsole))
diff --git a/Resources/Maps/_LuaM/POI/MedicalLuaM.yml b/Resources/Maps/_LuaM/POI/MedicalLuaM.yml
index 3c99e83a81f..aac0e0c00b3 100644
--- a/Resources/Maps/_LuaM/POI/MedicalLuaM.yml
+++ b/Resources/Maps/_LuaM/POI/MedicalLuaM.yml
@@ -4,8 +4,8 @@ meta:
engineVersion: 277.0.0
forkId: ""
forkVersion: ""
- time: 08/04/2026 14:35:39
- entityCount: 4808
+ time: 08/18/2026 03:44:54
+ entityCount: 4807
maps: []
grids:
- 1
@@ -181,12 +181,13 @@ entities:
- type: ThermalSignature
- type: SpreaderGrid
spreadQueues:
- Smoke: []
- MetalFoam: []
Kudzu: []
Puddle: []
+ MetalFoam: []
+ Smoke: []
- type: Shuttle
- dampingModifier: 0.25
+ dampingModifier: 2.5
+ bodyModifier: 2.5
- type: ImplicitRoof
- type: GridPathfinding
- type: Gravity
@@ -4683,7 +4684,8 @@ entities:
3,7:
0: 65526
3,8:
- 0: 65524
+ 5: 4368
+ 0: 61156
4,4:
0: 30464
2: 8
@@ -6962,11 +6964,6 @@ entities:
parent: 1
- type: Physics
bodyType: Static
- - uid: 352
- components:
- - type: Transform
- pos: -12.5,8.5
- parent: 1
- uid: 353
components:
- type: Transform
@@ -22956,17 +22953,17 @@ entities:
immutable: False
temperature: 293.14923
moles:
- Oxygen: 1.7459903
- Nitrogen: 6.568249
+ Oxygen: 1.8856695
+ Nitrogen: 7.0937095
- type: ContainerContainer
containers:
entity_storage: !type:Container
showEnts: False
occludes: True
ents:
- - 2768
- - 2769
- 2770
+ - 2769
+ - 2768
paper_label: !type:ContainerSlot
showEnts: False
occludes: True
@@ -22984,8 +22981,8 @@ entities:
immutable: False
temperature: 293.14923
moles:
- Oxygen: 1.7459903
- Nitrogen: 6.568249
+ Oxygen: 1.8856695
+ Nitrogen: 7.0937095
- type: ContainerContainer
containers:
entity_storage: !type:Container
@@ -23012,17 +23009,17 @@ entities:
immutable: False
temperature: 293.14923
moles:
- Oxygen: 1.7459903
- Nitrogen: 6.568249
+ Oxygen: 1.8856695
+ Nitrogen: 7.0937095
- type: ContainerContainer
containers:
entity_storage: !type:Container
showEnts: False
occludes: True
ents:
- - 2776
- 2777
- 2778
+ - 2776
paper_label: !type:ContainerSlot
showEnts: False
occludes: True
@@ -23651,11 +23648,15 @@ entities:
- type: Transform
pos: -1.5,4.5
parent: 1
+ - type: AmbientSound
+ range: 2
- uid: 2845
components:
- type: Transform
pos: 2.5,4.5
parent: 1
+ - type: AmbientSound
+ range: 2
- proto: MaterialBiomass50
entities:
- uid: 1281
@@ -27860,11 +27861,22 @@ entities:
- type: Transform
pos: 0.5,4.5
parent: 1
+ - type: AmbientSound
+ range: 2
+ - type: ShipShieldEmitter
+ shieldColor: '#1E90FFFF'
- type: PointLight
falloff: 6
softness: 2
energy: 8
radius: 15
+ - type: PacifiedZoneGenerator
+ radius: 75
+ immuneRoles:
+ - SecurityGuard
+ - StationTrafficController
+ - StationRepresentative
+ - DirectorOfCare
- proto: ShuttersNormalOpen
entities:
- uid: 3530
@@ -29176,13 +29188,6 @@ entities:
- type: Transform
pos: 18.5,18.5
parent: 1
-- proto: VendingMachineCentDrobe
- entities:
- - uid: 3717
- components:
- - type: Transform
- pos: -16.5,34.5
- parent: 1
- proto: VendingMachineChefvend
entities:
- uid: 3718
@@ -29260,17 +29265,19 @@ entities:
- type: Transform
pos: 3.5,-1.5
parent: 1
-- proto: VendingMachineFlatpackVend
+- proto: VendingMachineExpeditionaryFlatpackVend
entities:
- - uid: 3729
+ - uid: 3717
components:
- type: Transform
- pos: -8.5,3.5
+ pos: 11.5,3.5
parent: 1
- - uid: 3730
+- proto: VendingMachineFlatpackVend
+ entities:
+ - uid: 3729
components:
- type: Transform
- pos: 11.5,3.5
+ pos: -8.5,3.5
parent: 1
- proto: VendingMachineFuelVend
entities:
@@ -29324,6 +29331,13 @@ entities:
- type: Transform
pos: -5.5,-9.5
parent: 1
+- proto: VendingMachineHydrobe
+ entities:
+ - uid: 352
+ components:
+ - type: Transform
+ pos: -16.5,34.5
+ parent: 1
- proto: VendingMachineJaniDrobe
entities:
- uid: 3741
@@ -35260,6 +35274,7 @@ entities:
parent: 2771
- type: Physics
canCollide: False
+ - type: PacifismAllowedGun
- type: InsideEntityStorage
- uid: 2773
components:
@@ -35267,6 +35282,7 @@ entities:
parent: 2771
- type: Physics
canCollide: False
+ - type: PacifismAllowedGun
- type: InsideEntityStorage
- uid: 2774
components:
@@ -35274,6 +35290,7 @@ entities:
parent: 2771
- type: Physics
canCollide: False
+ - type: PacifismAllowedGun
- type: InsideEntityStorage
- proto: WeaponShotgunEnforcerRegistered
entities:
@@ -35283,6 +35300,7 @@ entities:
parent: 2775
- type: Physics
canCollide: False
+ - type: PacifismAllowedGun
- type: InsideEntityStorage
- uid: 2777
components:
@@ -35290,6 +35308,7 @@ entities:
parent: 2775
- type: Physics
canCollide: False
+ - type: PacifismAllowedGun
- type: InsideEntityStorage
- uid: 2778
components:
@@ -35297,6 +35316,7 @@ entities:
parent: 2775
- type: Physics
canCollide: False
+ - type: PacifismAllowedGun
- type: InsideEntityStorage
- proto: WeaponSubMachineGunVector9x19mmRegistered
entities:
@@ -35308,6 +35328,7 @@ entities:
selectedMode: FullAuto
- type: Physics
canCollide: False
+ - type: PacifismAllowedGun
- type: InsideEntityStorage
- uid: 2769
components:
@@ -35317,6 +35338,7 @@ entities:
selectedMode: FullAuto
- type: Physics
canCollide: False
+ - type: PacifismAllowedGun
- type: InsideEntityStorage
- uid: 2770
components:
@@ -35326,6 +35348,7 @@ entities:
selectedMode: FullAuto
- type: Physics
canCollide: False
+ - type: PacifismAllowedGun
- type: InsideEntityStorage
- proto: WeaponXrayCannon
entities:
diff --git a/Resources/Maps/_Mono/Outpost/colossus_central.yml b/Resources/Maps/_Mono/Outpost/colossus_central.yml
index 3a1cbe28e8f..0071ca349a6 100644
--- a/Resources/Maps/_Mono/Outpost/colossus_central.yml
+++ b/Resources/Maps/_Mono/Outpost/colossus_central.yml
@@ -4,8 +4,8 @@ meta:
engineVersion: 271.2.0
forkId: ""
forkVersion: ""
- time: 03/27/2026 19:43:44
- entityCount: 10733
+ time: 08/15/2026 18:35
+ entityCount: 10734
maps:
- 1
grids:
@@ -54608,11 +54608,6 @@ entities:
- type: Transform
pos: -14.5,68.5
parent: 2
- - uid: 7203
- components:
- - type: Transform
- pos: -35.5,46.5
- parent: 2
- uid: 7204
components:
- type: Transform
@@ -55184,6 +55179,20 @@ entities:
- type: Transform
pos: 0.5,68.5
parent: 2
+- proto: PacifiedZone100
+ entities:
+ - uid: 7203
+ components:
+ - type: Transform
+ pos: -12.5,45.5
+ parent: 2
+ - type: PacifiedZoneGenerator
+ radius: 86
+ immuneRoles:
+ - SecurityGuard
+ - StationTrafficController
+ - StationRepresentative
+ - DirectorOfCare
- proto: PaintingFireaxeCabinet
entities:
- uid: 7274
@@ -60452,6 +60461,22 @@ entities:
- type: Physics
canCollide: False
- type: InsideEntityStorage
+- proto: ShieldGeneratorPOI
+ entities:
+ - uid: 12346
+ components:
+ - type: Transform
+ pos: -35.5,46.5
+ parent: 2
+ - type: AmbientSound
+ range: 5
+ - type: ShipShieldEmitter
+ shieldColor: '#2ECC71FF'
+ - type: PointLight
+ falloff: 6
+ softness: 2
+ energy: 8
+ radius: 15
- proto: ShuttersNormal
entities:
- uid: 8149
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
index d8082b437b1..f777e7f2237 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
@@ -60,10 +60,12 @@
id: ClothingUniformBase
components:
- type: SuitSensor
+ randomMode: false # LuaM
+ mode: SensorCords # LuaM
- type: ToggleableSignature
blip:
radarColor: Cyan
- scale: 0.5
+ scale: 1 # LuaM 0.5 > 1
requireNoGrid: true
- type: DeviceNetwork
deviceNetId: Wireless
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index 600929c0faf..6a3555879cd 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -869,6 +869,10 @@
sprite: Clothing/Uniforms/Jumpsuit/mercenary.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/mercenary.rsi
+ - type: SuitSensor # LuaM
+ mode: SensorCords
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: UnsensoredClothingUniformBase
diff --git a/Resources/Prototypes/_Mono/Entities/Clothing/Jumpsuit/jumpsuits.yml b/Resources/Prototypes/_Mono/Entities/Clothing/Jumpsuit/jumpsuits.yml
index df47bc6730f..6b64b5d2b24 100644
--- a/Resources/Prototypes/_Mono/Entities/Clothing/Jumpsuit/jumpsuits.yml
+++ b/Resources/Prototypes/_Mono/Entities/Clothing/Jumpsuit/jumpsuits.yml
@@ -11,6 +11,8 @@
- type: SuitSensor
randomMode: false
mode: SensorVitals
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -25,6 +27,8 @@
- type: SuitSensor
randomMode: false
mode: SensorVitals
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -52,6 +56,8 @@
- type: SuitSensor
randomMode: false
mode: SensorVitals
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -80,6 +86,8 @@
- type: SuitSensor
randomMode: false
mode: SensorVitals
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -94,6 +102,8 @@
- type: SuitSensor
randomMode: false
mode: SensorVitals
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -108,6 +118,8 @@
- type: SuitSensor
randomMode: false
mode: SensorVitals
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -122,6 +134,8 @@
- type: SuitSensor
randomMode: false
mode: SensorVitals
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -136,6 +150,8 @@
- type: SuitSensor
randomMode: false
mode: SensorOff
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -150,6 +166,8 @@
- type: SuitSensor
randomMode: false
mode: SensorOff
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -164,6 +182,8 @@
- type: SuitSensor
randomMode: false
mode: SensorOff
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -178,6 +198,8 @@
- type: SuitSensor
randomMode: false
mode: SensorOff
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -192,6 +214,8 @@
- type: SuitSensor
randomMode: false
mode: SensorOff
+ - type: ToggleableSignature # LuaM
+ enabled: false
# Trauma Armed Forces
- type: entity
@@ -207,6 +231,8 @@
- type: SuitSensor
randomMode: false
mode: SensorVitals
+ - type: ToggleableSignature # LuaM
+ enabled: false
# Drake Industries
@@ -348,6 +374,8 @@
- type: SuitSensor
randomMode: false
mode: SensorVitals
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -365,6 +393,8 @@
- type: SuitSensor
randomMode: false
mode: SensorVitals
+ - type: ToggleableSignature # LuaM
+ enabled: false
#PMC camo suits
- type: entity
@@ -382,7 +412,9 @@
sprite: _Mono/Clothing/Uniforms/Jumpsuit/combat-suits/CCE/CCE_base.rsi
- type: SuitSensor
randomMode: false
- mode: SensorVitals
+ mode: SensorCords # LuaM SensorVitals > SensorCords
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -399,7 +431,10 @@
sprite: _Mono/Clothing/Uniforms/Jumpsuit/combat-suits/CCE/CCE_worn.rsi
- type: SuitSensor
randomMode: false
- mode: SensorVitals
+ mode: SensorCords # LuaM SensorVitals > SensorCords
+ - type: ToggleableSignature # LuaM
+ enabled: false
+
- type: entity
parent: ClothingUniformBase
@@ -416,7 +451,9 @@
sprite: _Mono/Clothing/Uniforms/Jumpsuit/combat-suits/CCE/CCE_bleached.rsi
- type: SuitSensor
randomMode: false
- mode: SensorVitals
+ mode: SensorCords # LuaM SensorVitals > SensorCords
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -433,7 +470,9 @@
sprite: _Mono/Clothing/Uniforms/Jumpsuit/combat-suits/CCE/CCE_desert.rsi
- type: SuitSensor
randomMode: false
- mode: SensorVitals
+ mode: SensorCords # LuaM SensorVitals > SensorCords
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -450,7 +489,9 @@
sprite: _Mono/Clothing/Uniforms/Jumpsuit/combat-suits/grassland.rsi
- type: SuitSensor
randomMode: false
- mode: SensorVitals
+ mode: SensorCords # LuaM SensorVitals > SensorCords
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -467,7 +508,9 @@
sprite: _Mono/Clothing/Uniforms/Jumpsuit/combat-suits/mudland.rsi
- type: SuitSensor
randomMode: false
- mode: SensorVitals
+ mode: SensorCords # LuaM SensorVitals > SensorCords
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -484,7 +527,9 @@
sprite: _Mono/Clothing/Uniforms/Jumpsuit/combat-suits/misko.rsi
- type: SuitSensor
randomMode: false
- mode: SensorVitals
+ mode: SensorCords # LuaM SensorVitals > SensorCords
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -501,7 +546,9 @@
sprite: _Mono/Clothing/Uniforms/Jumpsuit/combat-suits/lampart_flag.rsi
- type: SuitSensor
randomMode: false
- mode: SensorVitals
+ mode: SensorCords # LuaM SensorVitals > SensorCords
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -518,7 +565,9 @@
sprite: _Mono/Clothing/Uniforms/Jumpsuit/combat-suits/lampart.rsi
- type: SuitSensor
randomMode: false
- mode: SensorVitals
+ mode: SensorCords # LuaM SensorVitals > SensorCords
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -535,7 +584,9 @@
sprite: _Mono/Clothing/Uniforms/Jumpsuit/combat-suits/summer_flora.rsi
- type: SuitSensor
randomMode: false
- mode: SensorVitals
+ mode: SensorCords # LuaM SensorVitals > SensorCords
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -552,7 +603,9 @@
sprite: _Mono/Clothing/Uniforms/Jumpsuit/combat-suits/white_urban.rsi
- type: SuitSensor
randomMode: false
- mode: SensorVitals
+ mode: SensorCords # LuaM SensorVitals > SensorCords
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -574,7 +627,9 @@
color: "#2F2F2F"
- type: SuitSensor
randomMode: false
- mode: SensorVitals
+ mode: SensorCords # LuaM SensorVitals > SensorCords
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -591,7 +646,9 @@
sprite: _Mono/Clothing/Uniforms/Jumpsuit/combat-suits/Digital/digital_blue.rsi
- type: SuitSensor
randomMode: false
- mode: SensorVitals
+ mode: SensorCords # LuaM SensorVitals > SensorCords
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -608,7 +665,9 @@
sprite: _Mono/Clothing/Uniforms/Jumpsuit/combat-suits/Digital/digital_red.rsi
- type: SuitSensor
randomMode: false
- mode: SensorVitals
+ mode: SensorCords # LuaM SensorVitals > SensorCords
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -625,4 +684,6 @@
sprite: _Mono/Clothing/Uniforms/Jumpsuit/combat-suits/Digital/digital_green_and_tan.rsi
- type: SuitSensor
randomMode: false
- mode: SensorVitals
+ mode: SensorCords # LuaM SuitSensor > SensorCords
+ - type: ToggleableSignature # LuaM
+ enabled: false
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml
index 3c7bb5a32d6..93af395310a 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -42,6 +42,10 @@
sprite: _NF/Clothing/Uniforms/Jumpskirt/mercenary.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpskirt/mercenary.rsi
+ - type: SuitSensor # LuaM
+ mode: SensorCords
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformSkirtBase
@@ -64,6 +68,10 @@
sprite: _NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt.rsi
+ - type: SuitSensor # LuaM
+ mode: SensorVitals
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformSkirtBase
@@ -75,6 +83,10 @@
sprite: _NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi
+ - type: SuitSensor # LuaM
+ mode: SensorVitals
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformSkirtBase
@@ -97,6 +109,10 @@
sprite: _NF/Clothing/Uniforms/Jumpskirt/private_security.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpskirt/private_security.rsi
+ - type: SuitSensor # LuaM
+ mode: SensorCords
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformJumpskirtHoP
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
index 866652e3328..c8706dc8374 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -8,6 +8,11 @@
sprite: _NF/Clothing/Uniforms/Jumpsuit/arcadia.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpsuit/arcadia.rsi
+ - type: SuitSensor # LuaM
+ randomMode: false
+ mode: SensorVitals
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -86,6 +91,10 @@
sprite: _NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpsuit/nfsd_jump.rsi
+ - type: SuitSensor # LuaM
+ mode: SensorVitals
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -97,6 +106,10 @@
sprite: _NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpsuit/nfsd_jump_short.rsi
+ - type: SuitSensor # LuaM
+ mode: SensorVitals
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -108,6 +121,10 @@
sprite: _NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_black.rsi
+ - type: SuitSensor # LuaM
+ mode: SensorVitals
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -119,6 +136,10 @@
sprite: _NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_gray.rsi
+ - type: SuitSensor # LuaM
+ mode: SensorVitals
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -130,6 +151,10 @@
sprite: _NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_camo.rsi
+ - type: SuitSensor # LuaM
+ mode: SensorVitals
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -143,7 +168,9 @@
sprite: _NF/Clothing/Uniforms/Jumpsuit/nfsd_tac_cream.rsi
- type: SuitSensor #Mono
randomMode: false
- mode: SensorOff
+ mode: SensorVitals # LuaM SensorOff > SensorVital
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformBase
@@ -212,6 +239,10 @@
sprite: _NF/Clothing/Uniforms/Jumpsuit/private_security.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpsuit/private_security.rsi
+ - type: SuitSensor # LuaM
+ mode: SensorCords
+ - type: ToggleableSignature # LuaM
+ enabled: false
- type: entity
parent: ClothingUniformJumpsuitHoP