fixes

Rxup · Nov 5, 2023 · 1a4f7a6 · 1a4f7a6
1 parent c2835f6
commit 1a4f7a6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/Content.Shared/Wieldable/Components/WieldableComponent.cs b/Content.Shared/Wieldable/Components/WieldableComponent.cs
@@ -30,6 +30,9 @@ public sealed partial class WieldableComponent : Component
     public string? WieldedInhandPrefix = "wielded";
 
     public string? OldInhandPrefix = null;
+
+    [DataField("wieldTime")]
+    public double WieldTime; //nothing to do
 }
 
 [Serializable, NetSerializable]

diff --git a/Resources/Prototypes/Backmen/Adminbuse/centcomm_kid.yml b/Resources/Prototypes/Backmen/Adminbuse/centcomm_kid.yml
@@ -342,7 +342,6 @@
 - type: entity
   parent: WeaponShotgun39
   id: WeaponShotgunEnforcerRXBZZ
-  components:
 
 - type: entity
   name: Лектер

diff --git a/Resources/Prototypes/Backmen/Entities/Weapons/Guns/guns64.yml b/Resources/Prototypes/Backmen/Entities/Weapons/Guns/guns64.yml
@@ -2596,7 +2596,7 @@
   parent: BaseWeaponLightMachineGun
   id: WeaponLightMachineGunMG42
   suffix: Пулемёт
-  description: Пулемёт ОПЗ периода Второй мировой войны. Разработан фирмой Metall-und Lackwarenfabrik Johannes Großfuß в 1942 году. После войны поставки данного пулемета возобновили в 2342 году. 
+  description: Пулемёт ОПЗ периода Второй мировой войны. Разработан фирмой Metall-und Lackwarenfabrik Johannes Großfuß в 1942 году. После войны поставки данного пулемета возобновили в 2342 году.
   components:
   - type: Sprite
     sprite: Backmen/Objects/Weapons/Gunsx64/LMGs/mg42/big.rsi
@@ -3267,4 +3267,4 @@
     spreadChance: 0.4
   - type: GrowingKudzu
   - type: TimedDespawn
-    lifetime: 40
+    lifetime: 40
diff --git a/Resources/Prototypes/Backmen/tags.yml b/Resources/Prototypes/Backmen/tags.yml
@@ -33,7 +33,14 @@
 
 - type: Tag
   id: RuinedShop
-  
+
 - type: Tag
   id: Rapier
 
+- type: Tag
+  id: CartridgeRifleLight762
+
+- type: Tag
+  id: NoSpinOnThrow
+
+
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -539,7 +539,7 @@
       - ShellTranquilizer
       - MagazinePistol
       - MagazinePistolSubMachineGun
-      - MagazinePistolTopSubMachineGun
+      - MagazinePistolSubMachineGunTopMounted
       - MagazineRifle
       - MagazineLightRifle
       - MagazineBoxPistol