Minor fixes wave 2

Content.Server/Carrying/CarryingSystem.cs

@@ -237,7 +237,8 @@ private void OnDoAfter(EntityUid uid, CarriableComponent component, CarryDoAfter
             Carry(args.Args.User, uid);
             args.Handled = true;
         }
-        private void StartCarryDoAfter(EntityUid carrier, EntityUid carried, CarriableComponent component)
+
+        public void StartCarryDoAfter(EntityUid carrier, EntityUid carried, CarriableComponent component)
         {
             if (!TryComp<PhysicsComponent>(carrier, out var carrierPhysics)
                 || !TryComp<PhysicsComponent>(carried, out var carriedPhysics)

Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs

@@ -61,9 +61,13 @@ private void AddInsertAltVerb(EntityUid uid, PseudoItemComponent component, GetV
 
     protected override void OnGettingPickedUpAttempt(EntityUid uid, PseudoItemComponent component, GettingPickedUpAttemptEvent args)
     {
+        // Floof - changed this a bit to actually start a do-after
         // Try to pick the entity up instead first
-        if (args.User != args.Item && _carrying.TryCarry(args.User, uid))
+        if (args.User != args.Item
+            && TryComp<CarriableComponent>(uid, out var carrible)
+            && _carrying.CanCarry(args.User, uid, carrible))
         {
+            _carrying.StartCarryDoAfter(args.User, uid, carrible);
             args.Cancel();
             return;
         }

Content.Server/VendingMachines/VendingMachineSystem.cs

@@ -16,6 +16,7 @@
 using Content.Shared.Emag.Systems;
 using Content.Shared.Emp;
 using Content.Shared.Popups;
+using Content.Shared.Repairable;
 using Content.Shared.Throwing;
 using Content.Shared.UserInterface;
 using Content.Shared.VendingMachines;
@@ -46,6 +47,7 @@ public override void Initialize()
             SubscribeLocalEvent<VendingMachineComponent, MapInitEvent>(OnComponentMapInit);
             SubscribeLocalEvent<VendingMachineComponent, PowerChangedEvent>(OnPowerChanged);
             SubscribeLocalEvent<VendingMachineComponent, BreakageEventArgs>(OnBreak);
+            SubscribeLocalEvent<VendingMachineComponent, SharedRepairableSystem.RepairFinishedEvent>(OnRepaired); // Floofstation
             SubscribeLocalEvent<VendingMachineComponent, GotEmaggedEvent>(OnEmagged);
             SubscribeLocalEvent<VendingMachineComponent, DamageChangedEvent>(OnDamage);
             SubscribeLocalEvent<VendingMachineComponent, PriceCalculationEvent>(OnVendingPrice);
@@ -88,7 +90,6 @@ private void OnVendingPrice(EntityUid uid, VendingMachineComponent component, re
 
             args.Price += price;
         }
-
         protected override void OnComponentInit(EntityUid uid, VendingMachineComponent component, ComponentInit args)
         {
             base.OnComponentInit(uid, component, args);
@@ -139,6 +140,17 @@ private void OnBreak(EntityUid uid, VendingMachineComponent vendComponent, Break
             TryUpdateVisualState(uid, vendComponent);
         }
 
+        // Floofstation
+        private void OnRepaired(EntityUid uid, VendingMachineComponent component, SharedRepairableSystem.RepairFinishedEvent args)
+        {
+            if (args.Cancelled)
+                return;
+
+            // TODO it is not actually safe to assume that the repair repaired enough damage
+            component.Broken = false;
+            TryUpdateVisualState(uid, component);
+        }
+
         private void OnEmagged(EntityUid uid, VendingMachineComponent component, ref GotEmaggedEvent args)
         {
             // only emag if there are emag-only items

Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs

@@ -2,6 +2,7 @@
 using Content.Shared.Bed.Sleep;
 using Content.Shared.DoAfter;
 using Content.Shared.Hands;
+using Content.Shared.Hands.EntitySystems;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Item;
@@ -24,6 +25,8 @@ public abstract partial class SharedPseudoItemSystem : EntitySystem
     [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedActionsSystem _actions = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
 
     [ValidatePrototypeId<TagPrototype>]
     private const string PreventTag = "PreventLabel";
@@ -117,17 +120,35 @@ private void OnEntRemoved(EntityUid uid, PseudoItemComponent component, EntGotRe
     protected virtual void OnGettingPickedUpAttempt(EntityUid uid, PseudoItemComponent component,
         GettingPickedUpAttemptEvent args)
     {
-        if (args.User == args.Item)
-            return;
-
-        Transform(uid).AttachToGridOrMap();
-        args.Cancel();
+        // Floof - this is a terrible idea. This triggers every time ANY system checks if a pseudo-item can be picked up.
+        // WHY DID YOU DO THAT, NYANOTRASEN???
+
+        // if (args.User == args.Item)
+        //     return;
+        //
+        // Transform(uid).AttachToGridOrMap();
+        // args.Cancel();
     }
 
     private void OnDropAttempt(EntityUid uid, PseudoItemComponent component, DropAttemptEvent args)
     {
-        if (component.Active)
-            args.Cancel();
+        if (!component.Active)
+            return;
+
+        // Floof - we try to get the containing container and try to drop it into it
+        // If possible, we do it, since a bagged cat probably can put things back into the bag just like they can pick them up.
+        string? failReason = null;
+        if (_hands.GetActiveItem(uid) is { Valid: true, } droppedItem
+            && _container.TryGetContainingContainer(Transform(uid).ParentUid, uid, out var pseudoItemContainer)
+            && TryComp<StorageComponent>(pseudoItemContainer.Owner, out var targetStorage)
+            && _storage.CanInsert(pseudoItemContainer.Owner, droppedItem, out failReason, targetStorage, ignoreStacks: true)
+        )
+            _storage.Insert(pseudoItemContainer.Owner, droppedItem, out _, uid, targetStorage, stackAutomatically: false);
+
+        if (failReason != null)
+            _popupSystem.PopupEntity(Loc.GetString(failReason), uid, uid);
+
+        args.Cancel();
     }
 
     private void OnInsertAttempt(EntityUid uid, PseudoItemComponent component,
@@ -137,13 +158,15 @@ private void OnInsertAttempt(EntityUid uid, PseudoItemComponent component,
             return;
         // This hopefully shouldn't trigger, but this is a failsafe just in case so we dont bluespace them cats
         args.Cancel();
+        Transform(uid).AttachToGridOrMap(); // We do it here instead, so the item is only re-parented AFTER someone tries to insert it somewhere, e.g. a hand.
     }
 
     // Prevents moving within the bag :)
     private void OnInteractAttempt(EntityUid uid, PseudoItemComponent component, InteractionAttemptEvent args)
     {
-        if (args.Uid == args.Target && component.Active)
-            args.Cancel();
+        // Floof - why the fuck.
+        // if (args.Uid == args.Target && component.Active)
+        //     args.Cancel();
     }
 
     private void OnDoAfter(EntityUid uid, PseudoItemComponent component, DoAfterEvent args)

Content.Shared/Repairable/SharedRepairableSystem.cs

@@ -5,8 +5,9 @@ namespace Content.Shared.Repairable;
 
 public abstract partial class SharedRepairableSystem : EntitySystem
 {
+    // Floof - made public because WHY THE FUCK WAS THIS PRIVATE?!
     [Serializable, NetSerializable]
-    protected sealed partial class RepairFinishedEvent : SimpleDoAfterEvent
+    public sealed partial class RepairFinishedEvent : SimpleDoAfterEvent
     {
     }
 }

Resources/Prototypes/Actions/types.yml

@@ -377,6 +377,7 @@
       itemIconStyle: NoItem
       useDelay: 1 # emote spam
       event: !type:ToggleActionEvent
+      checkCanInteract: false # obviously you can wag while cuffed, duh.
 
 - type: entity
   id: ActionFabricateLollipop

Resources/Prototypes/DeltaV/GameRules/events.yml

@@ -26,39 +26,39 @@
       prob: 0.002
     - id: MobXenoRavager
       prob: 0.002
-    - id: MobXenochargercrusher
+    - id: MobXenoChargerCrusher
       prob: 0.002
-    - id: MobXenodancerpraetorian
+    - id: MobXenoDancerPraetorian
       prob: 0.002
-    - id: MobXenodefender
+    - id: MobXenoDefender
       prob: 0.002
-    - id: MobXenosentinel
+    - id: MobXenoSentinel
       prob: 0.002
-    - id: MobXenohivelord
+    - id: MobXenoHivelord
       prob: 0.001
     - id: MobXenoCarrier
       prob: 0.002
-    - id: MobXenobloodylarva
+    - id: MobXenoBloodyLarva
       prob: 0.003
-    - id: MobXenoparasite
+    - id: MobXenoParasite
       prob: 0.003
-    - id: MobXenolurker
+    - id: MobXenoLurker
       prob: 0.002
-    - id: MobXenowarrior
+    - id: MobXenoWarrior
       prob: 0.002
-    - id: MobXenoacidrunner
+    - id: MobXenoAcidRunner
       prob: 0.002
-    - id: MobXenoacidrunnerprimed
+    - id: MobXenoAcidRunnerPrimed
       prob: 0.002
-    - id: MobXenolarva
+    - id: MobXenoLarva
       prob: 0.003
-    - id: MobXenoboiler
+    - id: MobXenoBoiler
       prob: 0.002
-    - id: MobXenoboxerwarrior
+    - id: MobXenoBoxerWarrior
       prob: 0.002
     - id: MobXenoCarrier
       prob: 0.002
-    - id: MobXenocrusher
+    - id: MobXenoCrusher
       prob: 0.002
     - id: MobXenoQueen
       prob: 0.001
@@ -94,39 +94,39 @@
       prob: 0.001
     - id: MobXenoRavager
       prob: 0.001
-    - id: MobXenochargercrusher
+    - id: MobXenoChargerCrusher
       prob: 0.001
-    - id: MobXenodancerpraetorian
+    - id: MobXenoDancerPraetorian
       prob: 0.001
-    - id: MobXenodefender
+    - id: MobXenoDefender
       prob: 0.001
-    - id: MobXenosentinel
+    - id: MobXenoSentinel
       prob: 0.001
-    - id: MobXenohivelord
+    - id: MobXenoHivelord
       prob: 0.001
     - id: MobXenoCarrier
       prob: 0.001
-    - id: MobXenobloodylarva
+    - id: MobXenoBloodyLarva
       prob: 0.002
-    - id: MobXenoparasite
+    - id: MobXenoParasite
       prob: 0.002
-    - id: MobXenolurker
+    - id: MobXenoLurker
       prob: 0.001
-    - id: MobXenowarrior
+    - id: MobXenoWarrior
       prob: 0.001
-    - id: MobXenoacidrunner
+    - id: MobXenoAcidRunner
       prob: 0.001
-    - id: MobXenoacidrunnerprimed
+    - id: MobXenoAcidRunnerPrimed
       prob: 0.001
-    - id: MobXenolarva
+    - id: MobXenoLarva
       prob: 0.002
-    - id: MobXenoboiler
+    - id: MobXenoBoiler
       prob: 0.001
-    - id: MobXenoboxerwarrior
+    - id: MobXenoBoxerWarrior
       prob: 0.001
     - id: MobXenoCarrier
       prob: 0.001
-    - id: MobXenocrusher
+    - id: MobXenoCrusher
       prob: 0.001
     - id: MobXenoQueen
       prob: 0.001

Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml

@@ -8,16 +8,12 @@
   - type: Item
     sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
     size: Normal
-  - type: GunWieldBonus
-    minAngle: -43
-    maxAngle: -43
-  - type: Wieldable
   - type: Gun
     fireRate: 0.5
     selectedMode: SemiAuto
-    angleDecay: 45
-    minAngle: 44
-    maxAngle: 45
+    angleDecay: 3 # If you wait ~7 seconds between shots, you can actually land more or less accurate shots (with a 10 degree innacuracy)
+    minAngle: 10
+    maxAngle: 30
     availableModes:
     - SemiAuto
     soundGunshot:

Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml

@@ -20,3 +20,6 @@
     node: start #Frontier
     deconstructionTarget: null #Frontier
   - type: Wieldable # Frontier
+  - type: GunWieldBonus
+    minAngle: -9
+    maxAngle: -28 # 1..2 degrees when wielded