123

WWhiteDreamProject · Mar 5, 2025 · 9e5f896 · 9e5f896
1 parent 66160ba
commit 9e5f896
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Content.Client/_White/Overlays/CrayonPreviewOverlay.cs b/Content.Client/_White/Overlays/CrayonPreviewOverlay.cs
@@ -1,4 +1,5 @@
 using Content.Client.Crayon;
+using Content.Shared._White.Hands.Components;
 using Content.Shared.Crayon;
 using Content.Shared.Decals;
 using Content.Shared.Interaction;
@@ -46,7 +47,8 @@ public CrayonPreviewOverlay(SpriteSystem sprite, CrayonComponent comp)
     protected override void Draw(in OverlayDrawArgs args)
     {
         if (!_entMan.EntityExists(_crayonUid) || // failsafe
-            _player.LocalEntity is not EntityUid playerUid)
+            _player.LocalEntity is not EntityUid playerUid ||
+            _entMan.HasComponent<HoldingDropComponent>(playerUid))
             return;
 
         var handle = args.WorldHandle;

diff --git a/Content.Server/Crayon/CrayonSystem.cs b/Content.Server/Crayon/CrayonSystem.cs
@@ -78,7 +78,7 @@ private void OnCrayonAfterInteract(EntityUid uid, CrayonComponent component, Aft
             rot = mover.TargetRelativeRotation;
         }
 
-        if (!_decals.TryAddDecal(component.SelectedState, args.ClickLocation.Offset(new Vector2(-0.5f, -0.5f)), out _, component.Color, rot + component.Angle, cleanable: true))
+        if (!_decals.TryAddDecal(component.SelectedState, args.ClickLocation.Offset(new Vector2(-0.5f, -0.5f)), out _, component.Color, rot + component.Angle + 0.01f, cleanable: true))
             return;
         // WWDP EDIT END
 

diff --git a/Content.Shared/Crayon/SharedCrayonSystem.cs b/Content.Shared/Crayon/SharedCrayonSystem.cs
@@ -74,6 +74,7 @@ private void OnCrayonDropped(EntityUid uid, CrayonComponent component, DroppedEv
     private bool MouseWheelUp(in PointerInputCmdHandler.PointerInputCmdArgs args)
     {
         if (args.Session?.AttachedEntity is not EntityUid playerUid ||
+            HasComp<HoldingDropComponent>(playerUid) ||
             !TryComp<HandsComponent>(playerUid, out var hands))
             return false;
 
@@ -89,6 +90,7 @@ private bool MouseWheelUp(in PointerInputCmdHandler.PointerInputCmdArgs args)
     private bool MouseWheelDown(in PointerInputCmdHandler.PointerInputCmdArgs args)
     {
         if (args.Session?.AttachedEntity is not EntityUid playerUid ||
+            HasComp<HoldingDropComponent>(playerUid) ||
             !TryComp<HandsComponent>(playerUid, out var hands))
             return false;