early merge projector rewrite/fixes (#1128)

* cant disguise to thing in a container

* copy cigarette visualiser

* prevent aghost throwing an error

* make disguises die in space

* fuck it rewrite it to not use polymorph

* fix action troll

* oop

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

Content.Client/Polymorph/Systems/ChameleonProjectorSystem.cs

@@ -1,3 +1,4 @@
+using Content.Client.Smoking;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Polymorph.Components;
 using Content.Shared.Polymorph.Systems;
@@ -10,14 +11,19 @@ public sealed class ChameleonProjectorSystem : SharedChameleonProjectorSystem
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
 
     private EntityQuery<AppearanceComponent> _appearanceQuery;
+    private EntityQuery<SpriteComponent> _spriteQuery;
 
     public override void Initialize()
     {
         base.Initialize();
 
         _appearanceQuery = GetEntityQuery<AppearanceComponent>();
+        _spriteQuery = GetEntityQuery<SpriteComponent>();
 
         SubscribeLocalEvent<ChameleonDisguiseComponent, AfterAutoHandleStateEvent>(OnHandleState);
+
+        SubscribeLocalEvent<ChameleonDisguisedComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<ChameleonDisguisedComponent, ComponentShutdown>(OnShutdown);
     }
 
     private void OnHandleState(Entity<ChameleonDisguiseComponent> ent, ref AfterAutoHandleStateEvent args)
@@ -25,9 +31,25 @@ public sealed class ChameleonProjectorSystem : SharedChameleonProjectorSystem
         CopyComp<SpriteComponent>(ent);
         CopyComp<GenericVisualizerComponent>(ent);
         CopyComp<SolutionContainerVisualsComponent>(ent);
+        CopyComp<BurnStateVisualsComponent>(ent);
 
         // reload appearance to hopefully prevent any invisible layers
         if (_appearanceQuery.TryComp(ent, out var appearance))
             _appearance.QueueUpdate(ent, appearance);
     }
+
+    private void OnStartup(Entity<ChameleonDisguisedComponent> ent, ref ComponentStartup args)
+    {
+        if (!_spriteQuery.TryComp(ent, out var sprite))
+            return;
+
+        ent.Comp.WasVisible = sprite.Visible;
+        sprite.Visible = false;
+    }
+
+    private void OnShutdown(Entity<ChameleonDisguisedComponent> ent, ref ComponentShutdown args)
+    {
+        if (_spriteQuery.TryComp(ent, out var sprite))
+            sprite.Visible = ent.Comp.WasVisible;
+    }
 }

Content.Server/Polymorph/Systems/ChameleonProjectorSystem.cs

@@ -1,99 +1,5 @@
-using Content.Server.Polymorph.Components;
-using Content.Shared.Actions;
-using Content.Shared.Construction.Components;
-using Content.Shared.Hands;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Polymorph;
-using Content.Shared.Polymorph.Components;
 using Content.Shared.Polymorph.Systems;
-using Content.Shared.StatusIcon.Components;
-using Robust.Shared.Physics.Components;
 
 namespace Content.Server.Polymorph.Systems;
 
-public sealed class ChameleonProjectorSystem : SharedChameleonProjectorSystem
-{
-    [Dependency] private readonly MetaDataSystem _meta = default!;
-    [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
-    [Dependency] private readonly PolymorphSystem _polymorph = default!;
-    [Dependency] private readonly SharedActionsSystem _actions = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly SharedTransformSystem _xform = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<ChameleonDisguiseComponent, GotEquippedHandEvent>(OnEquippedHand);
-        SubscribeLocalEvent<ChameleonDisguiseComponent, DisguiseToggleNoRotEvent>(OnToggleNoRot);
-        SubscribeLocalEvent<ChameleonDisguiseComponent, DisguiseToggleAnchoredEvent>(OnToggleAnchored);
-    }
-
-    private void OnEquippedHand(Entity<ChameleonDisguiseComponent> ent, ref GotEquippedHandEvent args)
-    {
-        if (!TryComp<PolymorphedEntityComponent>(ent, out var poly))
-            return;
-
-        _polymorph.Revert((ent, poly));
-        args.Handled = true;
-    }
-
-    public override void Disguise(ChameleonProjectorComponent proj, EntityUid user, EntityUid entity)
-    {
-        if (_polymorph.PolymorphEntity(user, proj.Polymorph) is not {} disguise)
-            return;
-
-        // make disguise look real (for simple things at least)
-        var meta = MetaData(entity);
-        _meta.SetEntityName(disguise, meta.EntityName);
-        _meta.SetEntityDescription(disguise, meta.EntityDescription);
-
-        var comp = EnsureComp<ChameleonDisguiseComponent>(disguise);
-        comp.SourceEntity = entity;
-        comp.SourceProto = Prototype(entity)?.ID;
-        Dirty(disguise, comp);
-
-        // no sechud trolling
-        RemComp<StatusIconComponent>(disguise);
-
-        _appearance.CopyData(entity, disguise);
-
-        var mass = CompOrNull<PhysicsComponent>(entity)?.Mass ?? 0f;
-
-        // let the disguise die when its taken enough damage, which then transfers to the player
-        // health is proportional to mass, and capped to not be insane
-        if (TryComp<MobThresholdsComponent>(disguise, out var thresholds))
-        {
-            // if the player is of flesh and blood, cap max health to theirs
-            // so that when reverting damage scales 1:1 and not round removing
-            var playerMax = _mobThreshold.GetThresholdForState(user, MobState.Dead).Float();
-            var max = playerMax == 0f ? proj.MaxHealth : Math.Max(proj.MaxHealth, playerMax);
-
-            var health = Math.Clamp(mass, proj.MinHealth, proj.MaxHealth);
-            _mobThreshold.SetMobStateThreshold(disguise, health, MobState.Critical, thresholds);
-            _mobThreshold.SetMobStateThreshold(disguise, max, MobState.Dead, thresholds);
-        }
-
-        // add actions for controlling transform aspects
-        _actions.AddAction(disguise, proj.NoRotAction);
-        _actions.AddAction(disguise, proj.AnchorAction);
-    }
-
-    private void OnToggleNoRot(Entity<ChameleonDisguiseComponent> ent, ref DisguiseToggleNoRotEvent args)
-    {
-        var xform = Transform(ent);
-        xform.NoLocalRotation = !xform.NoLocalRotation;
-    }
-
-    private void OnToggleAnchored(Entity<ChameleonDisguiseComponent> ent, ref DisguiseToggleAnchoredEvent args)
-    {
-        var uid = ent.Owner;
-        var xform = Transform(uid);
-        if (xform.Anchored)
-            _xform.Unanchor(uid, xform);
-        else
-            _xform.AnchorEntity((uid, xform));
-    }
-}
+public sealed class ChameleonProjectorSystem : SharedChameleonProjectorSystem;

Content.Shared/Clothing/EntitySystems/StealthClothingSystem.cs

@@ -45,10 +45,14 @@ public sealed class StealthClothingSystem : EntitySystem
         if (MetaData(user).EntityLifeStage >= EntityLifeStage.Terminating)
             return false;
 
+        // can't enable stealth if something else already enabled it, and vice versa
+        var stealth = EnsureComp<StealthComponent>(user);
+        if (stealth.Enabled == enabled)
+            return false;
+
         comp.Enabled = enabled;
         Dirty(uid, comp);
 
-        var stealth = EnsureComp<StealthComponent>(user);
         // slightly visible, but doesn't change when moving so it's ok
         var visibility = enabled ? stealth.MinVisibility + comp.Visibility : stealth.MaxVisibility;
         _stealth.SetVisibility(user, visibility, stealth);

Content.Shared/Polymorph/Components/ChameleonDisguiseComponent.cs

@@ -10,6 +10,18 @@ namespace Content.Shared.Polymorph.Components;
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
 public sealed partial class ChameleonDisguiseComponent : Component
 {
+    /// <summary>
+    /// The user of this disguise.
+    /// </summary>
+    [DataField]
+    public EntityUid User;
+
+    /// <summary>
+    /// The projector that created this disguise.
+    /// </summary>
+    [DataField]
+    public EntityUid Projector;
+
     /// <summary>
     /// The disguise source entity for copying the sprite.
     /// </summary>

Content.Shared/Polymorph/Components/ChameleonDisguisedComponent.cs

@@ -0,0 +1,30 @@
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Polymorph.Components;
+
+/// <summary>
+/// Added to a player when they use a chameleon projector.
+/// Handles making them invisible and revealing when damaged enough or switching hands.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ChameleonDisguisedComponent : Component
+{
+    /// <summary>
+    /// How much damage can be taken before revealing automatically.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 Integrity = FixedPoint2.Zero;
+
+    /// <summary>
+    /// The disguise entity parented to the player.
+    /// </summary>
+    [DataField]
+    public EntityUid Disguise;
+
+    /// <summary>
+    /// For client, whether the user's sprite was previously visible or not.
+    /// </summary>
+    [DataField]
+    public bool WasVisible;
+}

Content.Shared/Polymorph/Components/ChameleonProjectorComponent.cs

@@ -25,22 +25,26 @@ public sealed partial class ChameleonProjectorComponent : Component
     public EntityWhitelist? Blacklist;
 
     /// <summary>
-    /// Polymorph configuration for the disguise entity.
+    /// Disguise entity to spawn and use.
     /// </summary>
     [DataField(required: true)]
-    public PolymorphConfiguration Polymorph = new();
+    public EntProtoId DisguiseProto = string.Empty;
 
     /// <summary>
     /// Action for disabling your disguise's rotation.
     /// </summary>
     [DataField]
     public EntProtoId NoRotAction = "ActionDisguiseNoRot";
+    [DataField]
+    public EntityUid? NoRotActionEntity;
 
     /// <summary>
     /// Action for anchoring your disguise in place.
     /// </summary>
     [DataField]
     public EntProtoId AnchorAction = "ActionDisguiseAnchor";
+    [DataField]
+    public EntityUid? AnchorActionEntity;
 
     /// <summary>
     /// Minimum health to give the disguise.
@@ -54,6 +58,12 @@ public sealed partial class ChameleonProjectorComponent : Component
     [DataField]
     public float MaxHealth = 100f;
 
+    /// <summary>
+    /// Popup shown to the user when they try to disguise as an entity inside a container.
+    /// </summary>
+    [DataField]
+    public LocId ContainerPopup = "chameleon-projector-inside-container";
+
     /// <summary>
     /// Popup shown to the user when they try to disguise as an invalid entity.
     /// </summary>
@@ -65,4 +75,10 @@ public sealed partial class ChameleonProjectorComponent : Component
     /// </summary>
     [DataField]
     public LocId SuccessPopup = "chameleon-projector-success";
+
+    /// <summary>
+    /// User currently disguised by this projector, if any
+    /// </summary>
+    [DataField]
+    public EntityUid? Disguised;
 }

Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs

@@ -1,31 +1,92 @@
 using Content.Shared.Actions;
+using Content.Shared.Construction.Components;
+using Content.Shared.Damage;
+using Content.Shared.Hands;
 using Content.Shared.Interaction;
+using Content.Shared.Item;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Systems;
 using Content.Shared.Polymorph;
 using Content.Shared.Polymorph.Components;
 using Content.Shared.Popups;
-using Robust.Shared.Serialization.Manager;
+using Robust.Shared.Containers;
+using Robust.Shared.Network;
+using Robust.Shared.Physics.Components;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.Manager;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Content.Shared.Polymorph.Systems;
 
 /// <summary>
-/// Handles whitelist/blacklist checking.
-/// Actual polymorphing and deactivation is done serverside.
+/// Handles disguise validation, disguising and revealing.
+/// Most appearance copying is done clientside.
 /// </summary>
 public abstract class SharedChameleonProjectorSystem : EntitySystem
 {
+    [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly ISerializationManager _serMan = default!;
+    [Dependency] private readonly MetaDataSystem _meta = default!;
+    [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
+    [Dependency] private readonly SharedActionsSystem _actions = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedTransformSystem _xform = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
+        SubscribeLocalEvent<ChameleonDisguiseComponent, GotEquippedHandEvent>(OnDisguiseEquippedHand);
+        SubscribeLocalEvent<ChameleonDisguiseComponent, ComponentShutdown>(OnDisguiseShutdown);
+
+        SubscribeLocalEvent<ChameleonDisguisedComponent, DamageChangedEvent>(OnDamageChanged);
+
         SubscribeLocalEvent<ChameleonProjectorComponent, AfterInteractEvent>(OnInteract);
+        SubscribeLocalEvent<ChameleonProjectorComponent, DisguiseToggleNoRotEvent>(OnToggleNoRot);
+        SubscribeLocalEvent<ChameleonProjectorComponent, DisguiseToggleAnchoredEvent>(OnToggleAnchored);
+        SubscribeLocalEvent<ChameleonProjectorComponent, HandDeselectedEvent>(OnDeselected);
+        SubscribeLocalEvent<ChameleonProjectorComponent, GotUnequippedHandEvent>(OnUnequipped);
+        SubscribeLocalEvent<ChameleonProjectorComponent, ComponentShutdown>(OnProjectorShutdown);
     }
 
+    #region Disguise entity
+
+    private void OnDisguiseEquippedHand(Entity<ChameleonDisguiseComponent> ent, ref GotEquippedHandEvent args)
+    {
+        TryReveal(ent.Comp.User);
+        args.Handled = true;
+    }
+
+    private void OnDisguiseShutdown(Entity<ChameleonDisguiseComponent> ent, ref ComponentShutdown args)
+    {
+        _actions.RemoveProvidedActions(ent.Comp.User, ent.Comp.Projector);
+    }
+
+    #endregion
+
+    #region Disguised player
+
+    private void OnDamageChanged(Entity<ChameleonDisguisedComponent> ent, ref DamageChangedEvent args)
+    {
+        if (args.DamageDelta is not {} damage)
+            return;
+
+        // reveal once enough damage is taken for the disguise to reveal itself
+        var total = damage.GetTotal();
+        if (total > ent.Comp.Integrity)
+            TryReveal((ent, ent.Comp));
+        else
+            ent.Comp.Integrity -= total;
+    }
+
+    #endregion
+
+    #region Projector
+
     private void OnInteract(Entity<ChameleonProjectorComponent> ent, ref AfterInteractEvent args)
     {
         if (!args.CanReach || args.Target is not {} target)
@@ -34,6 +95,12 @@ public abstract class SharedChameleonProjectorSystem : EntitySystem
         var user = args.User;
         args.Handled = true;
 
+        if (_container.IsEntityInContainer(target))
+        {
+            _popup.PopupClient(Loc.GetString(ent.Comp.ContainerPopup), target, user);
+            return;
+        }
+
         if (IsInvalid(ent.Comp, target))
         {
             _popup.PopupClient(Loc.GetString(ent.Comp.InvalidPopup), target, user);
@@ -41,9 +108,53 @@ public abstract class SharedChameleonProjectorSystem : EntitySystem
         }
 
         _popup.PopupClient(Loc.GetString(ent.Comp.SuccessPopup), target, user);
-        Disguise(ent.Comp, user, target);
+        Disguise(ent, user, target);
     }
 
+    private void OnToggleNoRot(Entity<ChameleonProjectorComponent> ent, ref DisguiseToggleNoRotEvent args)
+    {
+        if (ent.Comp.Disguised is not {} uid)
+            return;
+
+        var xform = Transform(uid);
+        _xform.SetLocalRotationNoLerp(uid, 0, xform);
+        xform.NoLocalRotation = !xform.NoLocalRotation;
+        args.Handled = true;
+    }
+
+    private void OnToggleAnchored(Entity<ChameleonProjectorComponent> ent, ref DisguiseToggleAnchoredEvent args)
+    {
+        if (ent.Comp.Disguised is not {} uid)
+            return;
+
+        var xform = Transform(uid);
+        if (xform.Anchored)
+            _xform.Unanchor(uid, xform);
+        else
+            _xform.AnchorEntity((uid, xform));
+
+        args.Handled = true;
+    }
+
+    private void OnDeselected(Entity<ChameleonProjectorComponent> ent, ref HandDeselectedEvent args)
+    {
+        RevealProjector(ent);
+    }
+
+    private void OnUnequipped(Entity<ChameleonProjectorComponent> ent, ref GotUnequippedHandEvent args)
+    {
+        RevealProjector(ent);
+    }
+
+    private void OnProjectorShutdown(Entity<ChameleonProjectorComponent> ent, ref ComponentShutdown args)
+    {
+        RevealProjector(ent);
+    }
+
+    #endregion
+
+    #region API
+
     /// <summary>
     /// Returns true if an entity cannot be used as a disguise.
     /// </summary>
@@ -56,10 +167,97 @@ public abstract class SharedChameleonProjectorSystem : EntitySystem
     /// <summary>
     /// On server, polymorphs the user into an entity and sets up the disguise.
     /// </summary>
-    public virtual void Disguise(ChameleonProjectorComponent comp, EntityUid user, EntityUid entity)
+    public void Disguise(Entity<ChameleonProjectorComponent> ent, EntityUid user, EntityUid entity)
     {
+        var proj = ent.Comp;
+
+        // no spawning prediction sorry
+        if (_net.IsClient)
+            return;
+
+        // reveal first to allow quick switching
+        TryReveal(user);
+
+        // add actions for controlling transform aspects
+        _actions.AddAction(user, ref proj.NoRotActionEntity, proj.NoRotAction, container: ent);
+        _actions.AddAction(user, ref proj.AnchorActionEntity, proj.AnchorAction, container: ent);
+
+        proj.Disguised = user;
+
+        var xform = Transform(user);
+        var disguise = Spawn(proj.DisguiseProto, xform.Coordinates);
+        var disguiseXform = Transform(disguise);
+        _xform.SetParent(disguise, disguiseXform, user, xform);
+
+        var disguised = AddComp<ChameleonDisguisedComponent>(user);
+        disguised.Disguise = disguise;
+        Dirty(user, disguised);
+
+        // make disguise look real (for simple things at least)
+        var meta = MetaData(entity);
+        _meta.SetEntityName(disguise, meta.EntityName);
+        _meta.SetEntityDescription(disguise, meta.EntityDescription);
+
+        var comp = EnsureComp<ChameleonDisguiseComponent>(disguise);
+        comp.User = user;
+        comp.Projector = ent;
+        comp.SourceEntity = entity;
+        comp.SourceProto = Prototype(entity)?.ID;
+        Dirty(disguise, comp);
+
+        // item disguises can be picked up to be revealed, also makes sure their examine size is correct
+        CopyComp<ItemComponent>((disguise, comp));
+
+        _appearance.CopyData(entity, disguise);
+
+        var mass = CompOrNull<PhysicsComponent>(entity)?.Mass ?? 0f;
+
+        // let the disguise die when its taken enough damage, which then transfers to the player
+        // health is proportional to mass, and capped to not be insane
+        if (TryComp<MobThresholdsComponent>(disguise, out var thresholds) && TryComp<MobThresholdsComponent>(user, out var userThresholds))
+        {
+            // cap disguise integrity at max health so you dont have to kill beforeif the player is of flesh and blood, cap max health to theirs
+            // so that when reverting damage scales 1:1 and not round removing
+            var playerMax = _mobThreshold.GetThresholdForState(user, MobState.Dead, userThresholds).Float();
+            var max = playerMax == 0f ? proj.MaxHealth : Math.Max(proj.MaxHealth, playerMax);
+            disguised.Integrity = max;
+        }
     }
 
+    /// <summary>
+    /// Removes the disguise, if the user is disguised.
+    /// </summary>
+    public bool TryReveal(Entity<ChameleonDisguisedComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return false;
+
+        if (TryComp<ChameleonDisguiseComponent>(ent.Comp.Disguise, out var disguise)
+            && TryComp<ChameleonProjectorComponent>(disguise.Projector, out var proj))
+        {
+            proj.Disguised = null;
+        }
+
+        var xform = Transform(ent);
+        xform.NoLocalRotation = false;
+        _xform.Unanchor(ent, xform);
+
+        Del(ent.Comp.Disguise);
+        RemComp<ChameleonDisguisedComponent>(ent);
+        return true;
+    }
+
+    /// <summary>
+    /// Reveal a projector's user, if any.
+    /// </summary>
+    public void RevealProjector(Entity<ChameleonProjectorComponent> ent)
+    {
+        if (ent.Comp.Disguised is {} user)
+            TryReveal(user);
+    }
+
+    #endregion
+
     /// <summary>
     /// Copy a component from the source entity/prototype to the disguise entity.
     /// </summary>

Resources/Locale/en-US/chameleon-projector/chameleon-projector.ftl

@@ -1,2 +1,3 @@
+chameleon-projector-inside-container = There's no room to scan that!
 chameleon-projector-invalid = You can't disguise as that!
 chameleon-projector-success = Projected new disguise.

Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml

@@ -15,15 +15,12 @@
     blacklist:
       components:
       - ChameleonDisguise # no becoming kleiner
-      - InsideEntityStorage # no clark kent going in phone booth and becoming superman
       - MindContainer # no
       - Pda # PDAs currently make you invisible /!\
-    polymorph:
-      entity: ChameleonDisguise
+    disguiseProto: ChameleonDisguise
 
 - type: entity
   noSpawn: true
-  parent: BaseMob
   id: ChameleonDisguise
   name: Urist McKleiner
   components:
@@ -31,20 +28,8 @@
   - type: Sprite
     sprite: /Textures/Mobs/Species/Human/parts.rsi
     state: full
-  # so people can attempt to pick it up
-  - type: Item
-  # so it can take damage
-  # projector system sets health to be proportional to mass
-  - type: Damageable
-  - type: MobState
-  - type: MobThresholds
-    thresholds:
-      0: Alive
-      1: Critical
-      200: Dead
-  - type: MovementSpeedModifier
-    baseWalkSpeed: 1 # precise movement for the perfect spot
-    baseSprintSpeed: 5 # the jig is up
+  - type: Transform
+    noRot: true # players rotation and anchor is used instead
   - type: ChameleonDisguise
 
 # actions