Skip to content

Commit 1fac436

Browse files
authored
Revert "Weapons from Delta-V (#2527)" (#2692)
This reverts commit 7dbfe13.
1 parent 753bad3 commit 1fac436

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1
-591
lines changed
-9.07 KB
Binary file not shown.

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml

Lines changed: 0 additions & 81 deletions
This file was deleted.

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml

Lines changed: 0 additions & 67 deletions
This file was deleted.

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

Lines changed: 0 additions & 141 deletions
This file was deleted.

Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -107,19 +107,6 @@
107107
- id: SpeedLoaderMagnum
108108
amount: 2
109109

110-
- type: entity
111-
parent: WeaponCaseShort
112-
id: WeaponCaseShortLucky
113-
suffix: Dungeon, Lucky 37
114-
categories: [ HideSpawnMenu ]
115-
components:
116-
- type: StorageFill
117-
contents:
118-
- id: WeaponRevolverLucky
119-
amount: 1
120-
- id: SpeedLoaderMagnum
121-
amount: 2
122-
123110
- type: entity
124111
parent: WeaponCaseShort
125112
id: WeaponCaseShortRevolverPirate
@@ -354,19 +341,6 @@
354341
- id: MagazineLightRifleLowCapacity
355342
amount: 2
356343

357-
- type: entity
358-
parent: WeaponCaseLong
359-
id: WeaponCaseLongSniperCeremonial
360-
suffix: Dungeon, Ceremonial rifle
361-
categories: [ HideSpawnMenu ]
362-
components:
363-
- type: StorageFill
364-
contents:
365-
- id: WeaponSniperCeremonial
366-
amount: 1
367-
- id: MagazineBoxLightRifle
368-
amount: 2
369-
370344
# Energy
371345
- type: entity
372346
parent: WeaponCaseShort

Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
WeaponRifleNovaliteC1: 1
99
WeaponShotgunDoubleBarreled: 1
1010
WeaponRevolverArgenti: 1
11-
WeaponPistolPollock: 3
12-
WeaponRifleVulcan: 3
13-
WeaponRevolverFitz: 3
14-
WeaponRevolverFaith: 3
1511
BoxShotgunSlug: 1
1612
BoxLethalshot: 1
1713
BoxBeanbag: 1
@@ -39,7 +35,6 @@
3935
WeaponRifleNovaliteC1: 4294967295
4036
WeaponShotgunDoubleBarreled: 4294967295
4137
WeaponRevolverArgenti: 4294967295
42-
WeaponPistolPollock: 4294967295
4338
BoxShotgunSlug: 4294967295
4439
BoxLethalshot: 4294967295
4540
BoxBeanbag: 4294967295
@@ -55,4 +50,4 @@
5550
MagazineNovaliteC1Empty: 4294967295
5651
MagazineLightRifleLowCapacityEmpty: 4294967295
5752
emaggedInventory:
58-
WeaponPistolViper: 1
53+
WeaponPistolViper: 1

Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@
5959
#- WeaponCaseLongShotgunDoubleBarreledExpedition
6060
- WeaponCaseShortSawnExpedition
6161
- WeaponCaseLongMosinExpedition
62-
- WeaponCaseShortLucky
63-
- WeaponCaseLongSniperCeremonial
6462
chance: 1.0
6563
offset: 0.0
6664
rarePrototypes:

Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,6 @@
719719
- WeaponRifleGestio
720720
- BaseBallBatNF
721721
- CrossbowModern
722-
- WeaponPistolPollock
723722
## Ammo boxes
724723
- BoxLethalshot
725724
- MagazineBoxLightRifle

Resources/Prototypes/_NF/Recipes/Lathes/security.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -179,16 +179,6 @@
179179
Plasma: 10
180180
Silver: 5
181181

182-
- type: latheRecipe
183-
id: WeaponPistolPollock
184-
result: WeaponPistolPollock
185-
category: Weapons
186-
completetime: 3
187-
materials:
188-
Steel: 1000
189-
Plastic: 1200
190-
Plasteel: 1200
191-
192182
- type: latheRecipe
193183
id: ClothingEyesHudNfsd
194184
parent: ClothingEyesHudSecurity
Binary file not shown.

0 commit comments

Comments
 (0)