Revert "Weapons from Delta-V (#2527)"

This reverts commit 7dbfe13.
new-frontiers-14 · Jan 12, 2025 · 432a044 · 432a044
1 parent 753bad3
commit 432a044
Show file tree

Hide file tree

Showing 65 changed files with 1 addition and 591 deletions.
diff --git a/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg b/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
@@ -107,19 +107,6 @@
     - id: SpeedLoaderMagnum
       amount: 2
 
-- type: entity
-  parent: WeaponCaseShort
-  id: WeaponCaseShortLucky
-  suffix: Dungeon, Lucky 37
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: StorageFill
-    contents:
-    - id: WeaponRevolverLucky
-      amount: 1
-    - id: SpeedLoaderMagnum
-      amount: 2
-
 - type: entity
   parent: WeaponCaseShort
   id: WeaponCaseShortRevolverPirate
@@ -354,19 +341,6 @@
     - id: MagazineLightRifleLowCapacity
       amount: 2
 
-- type: entity
-  parent: WeaponCaseLong
-  id: WeaponCaseLongSniperCeremonial
-  suffix: Dungeon, Ceremonial rifle
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: StorageFill
-    contents:
-    - id: WeaponSniperCeremonial
-      amount: 1
-    - id: MagazineBoxLightRifle
-      amount: 2
-
 # Energy
 - type: entity
   parent: WeaponCaseShort

diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml
@@ -8,10 +8,6 @@
     WeaponRifleNovaliteC1: 1 
     WeaponShotgunDoubleBarreled: 1
     WeaponRevolverArgenti: 1 
-    WeaponPistolPollock: 3
-    WeaponRifleVulcan: 3
-    WeaponRevolverFitz: 3
-    WeaponRevolverFaith: 3
     BoxShotgunSlug: 1
     BoxLethalshot: 1
     BoxBeanbag: 1
@@ -39,7 +35,6 @@
     WeaponRifleNovaliteC1: 4294967295
     WeaponShotgunDoubleBarreled: 4294967295
     WeaponRevolverArgenti: 4294967295
-    WeaponPistolPollock: 4294967295
     BoxShotgunSlug: 4294967295
     BoxLethalshot: 4294967295
     BoxBeanbag: 4294967295
@@ -55,4 +50,4 @@
     MagazineNovaliteC1Empty: 4294967295
     MagazineLightRifleLowCapacityEmpty: 4294967295
   emaggedInventory:
-    WeaponPistolViper: 1
+    WeaponPistolViper: 1
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,6 @@
     #- WeaponCaseLongShotgunDoubleBarreledExpedition
     - WeaponCaseShortSawnExpedition
     - WeaponCaseLongMosinExpedition
-    - WeaponCaseShortLucky
-    - WeaponCaseLongSniperCeremonial
     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
@@ -719,7 +719,6 @@
       - WeaponRifleGestio
       - BaseBallBatNF
       - CrossbowModern
-      - WeaponPistolPollock
     ## Ammo boxes
       - BoxLethalshot
       - MagazineBoxLightRifle

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

diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/base.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/bolt-open.png
diff --git a/...rces/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-BELT.png b/...rces/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-BELT.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/icon.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-left.png
diff --git a/...urces/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-right.png b/...urces/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-right.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/mag-0.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/mag-0.png