Reapply "Переделка"

This reverts commit a0ac03a.
Corvax-Frontier · Dec 7, 2024 · b91023e · b91023e
1 parent 935c139
commit b91023e
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 24 deletions.
diff --git a/Resources/Prototypes/Corvax/Recipes/Lathes/security.yml b/Resources/Prototypes/Corvax/Recipes/Lathes/security.yml
@@ -33,14 +33,4 @@
   category: Ammo
   completetime: 3
   materials:
-    Steel: 160
-
-- type: latheRecipe
-  id: WeaponPistolPollock
-  result: WeaponPistolPollock
-  category: Weapons
-  completetime: 3
-  materials:
-    Steel: 1000
-    Plastic: 1200
-    Plasteel: 1200
+    Steel: 160
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -5,7 +5,7 @@
   description: The Mark 32 Offensive Handgun, produced by NanoTrasen's Small Arms Division. Uses .45 magnum ammo. # DeltaV - update Mk32
   components:
   - type: Sprite
-    sprite: DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi #
+    sprite: DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -87,7 +87,6 @@
   parent: [BaseWeaponRifle, BaseGunWieldable, BaseC3Contraband]
   id: WeaponRifleJackdaw
   description: The beginning of the end is heralded by the song of a Jackdaw. Uses .25 caseless ammo.
-  suffix: Deathsquad
   components:
   - type: Item
     size: Large

diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml
@@ -8,10 +8,10 @@
     WeaponRifleNovaliteC1: 1 
     WeaponShotgunDoubleBarreled: 1
     WeaponRevolverArgenti: 1 
-    WeaponPistolPollock: 3 # Corvax-Frontier
-    WeaponRifleVulcan: 3 # Corvax-Frontier
-    WeaponRevolverFitz: 3 # Corvax-Frontier
-    WeaponRevolverFaith: 3 # Corvax-Frontier
+    WeaponPistolPollock: 3
+    WeaponRifleVulcan: 3
+    WeaponRevolverFitz: 3
+    WeaponRevolverFaith: 3
     BoxShotgunSlug: 1
     BoxLethalshot: 1
     BoxBeanbag: 1
@@ -39,10 +39,10 @@
     WeaponRifleNovaliteC1: 4294967295
     WeaponShotgunDoubleBarreled: 4294967295
     WeaponRevolverArgenti: 4294967295
-    WeaponPistolPollock: 4294967295  # Corvax-Frontier
-    WeaponRifleVulcan: 4294967295 # Corvax-Frontier
-    WeaponRevolverFitz: 4294967295 # Corvax-Frontier
-    WeaponRevolverFaith: 4294967295 # Corvax-Frontier
+    WeaponPistolPollock: 4294967295
+    WeaponRifleVulcan: 4294967295
+    WeaponRevolverFitz: 4294967295
+    WeaponRevolverFaith: 4294967295
     BoxShotgunSlug: 4294967295
     BoxLethalshot: 4294967295
     BoxBeanbag: 4294967295

diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
@@ -59,8 +59,8 @@
     #- WeaponCaseLongShotgunDoubleBarreledExpedition
     - WeaponCaseShortSawnExpedition
     - WeaponCaseLongMosinExpedition
-    - WeaponSniperCeremonial # Corvax-Frontier
-    - WeaponRevolverLucky # Corvax-Frontier
+    - WeaponSniperCeremonial
+    - WeaponRevolverLucky
     chance: 1.0
     offset: 0.0
     rarePrototypes:

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -669,7 +669,7 @@
     ## Weapons
       - CombatKnife
       - WeaponLaserSvalinn # After the changes made to windows shouldn't be that much of an issue now if it's widely available
-      - WeaponPistolPollock # Corvax-Frontier
+      - WeaponPistolPollock
       - WeaponLaserPistolNF # After the changes made to windows shouldn't be that much of an issue now if it's widely available
       - WeaponRevolverArgenti
       - WeaponPistolMk58NF

diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/security.yml b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml
@@ -124,3 +124,13 @@
     Glass: 5
     Plasma: 10
     Silver: 5
+
+- type: latheRecipe
+  id: WeaponPistolPollock
+  result: WeaponPistolPollock
+  category: Weapons
+  completetime: 3
+  materials:
+    Steel: 1000
+    Plastic: 1200
+    Plasteel: 1200