Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Weapons from Delta-V" #2692

Merged
merged 1 commit into from
Jan 12, 2025
Merged

Revert "Weapons from Delta-V" #2692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed Resources/Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg
View file
Open in desktop
Binary file not shown.
81 changes: 0 additions & 81 deletions Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
View file
Open in desktop

This file was deleted.

67 changes: 0 additions & 67 deletions Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
View file
Open in desktop

This file was deleted.

141 changes: 0 additions & 141 deletions Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
WeaponRifleNovaliteC1: 1
WeaponShotgunDoubleBarreled: 1
WeaponRevolverArgenti: 1
WeaponPistolPollock: 3
WeaponRifleVulcan: 3
WeaponRevolverFitz: 3
WeaponRevolverFaith: 3
BoxShotgunSlug: 1
BoxLethalshot: 1
BoxBeanbag: 1
Expand Down Expand Up @@ -39,7 +35,6 @@
WeaponRifleNovaliteC1: 4294967295
WeaponShotgunDoubleBarreled: 4294967295
WeaponRevolverArgenti: 4294967295
WeaponPistolPollock: 4294967295
BoxShotgunSlug: 4294967295
BoxLethalshot: 4294967295
BoxBeanbag: 4294967295
Expand All @@ -55,4 +50,4 @@
MagazineNovaliteC1Empty: 4294967295
MagazineLightRifleLowCapacityEmpty: 4294967295
emaggedInventory:
WeaponPistolViper: 1
WeaponPistolViper: 1
2 changes: 0 additions & 2 deletions Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@
#- WeaponCaseLongShotgunDoubleBarreledExpedition
- WeaponCaseShortSawnExpedition
- WeaponCaseLongMosinExpedition
- WeaponCaseShortLucky
- WeaponCaseLongSniperCeremonial
chance: 1.0
offset: 0.0
rarePrototypes:
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,6 @@
- WeaponRifleGestio
- BaseBallBatNF
- CrossbowModern
- WeaponPistolPollock
## Ammo boxes
- BoxLethalshot
- MagazineBoxLightRifle
Expand Down
10 changes: 0 additions & 10 deletions Resources/Prototypes/_NF/Recipes/Lathes/security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file removed Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/base.png
View file
Open in desktop
Binary file not shown.
Binary file removed Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/bolt-open.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...rces/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-BELT.png
View file
Open in desktop
Binary file not shown.
Binary file removed Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/icon.png
View file
Open in desktop
Binary file not shown.
Binary file removed Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-left.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...urces/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-right.png
View file
Open in desktop
Binary file not shown.
Binary file removed Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/mag-0.png
View file
Open in desktop
Binary file not shown.
Loading
Loading