-
Notifications
You must be signed in to change notification settings - Fork 925
Weapons from Delta-V #2527
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.
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
Merged
Cheackraze
merged 16 commits into
new-frontiers-14:master
from
FireFoxPhoenix:Delta-V_weapons
Jan 12, 2025
Merged
Weapons from Delta-V #2527
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
905019d
Weapons
FireFoxPhoenix 6663910
Merge branch 'master' into Delta-V_weapons
dvir001 587bcdb
Update revolvers.yml
FireFoxPhoenix 9589b58
Description
FireFoxPhoenix 594056d
Description
FireFoxPhoenix 60f77e6
Cases for weapons
FireFoxPhoenix b931a30
Cases
FireFoxPhoenix 316bf40
Name
FireFoxPhoenix f8ab391
Name
FireFoxPhoenix 63d4961
Name
FireFoxPhoenix 583142c
Name
FireFoxPhoenix 4d11a63
Name
FireFoxPhoenix f2be354
GunWieldBonus
FireFoxPhoenix 43a54dc
Merge branch 'master' into Delta-V_weapons
FireFoxPhoenix 3ab3b20
Merge branch 'master' into Delta-V_weapons
dvir001 c25f1c9
Update weaponryworks.yml
FireFoxPhoenix File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
81 changes: 81 additions & 0 deletions
81
Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| - type: entity | ||
| name: Mk32 "Universal" | ||
| parent: [BaseWeaponPistol, BaseC1Contraband] | ||
| id: WeaponPistolUniversal | ||
| description: The Mark 32 Offensive Handgun, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo. | ||
| components: | ||
| - type: Sprite | ||
| sprite: DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi | ||
| layers: | ||
| - state: base | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-0 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
| - type: Clothing | ||
| sprite: DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi | ||
| - type: Gun | ||
| fireRate: 3 | ||
| availableModes: | ||
| - SemiAuto | ||
| - type: ItemSlots | ||
| slots: | ||
| gun_magazine: | ||
| name: Magazine | ||
| startingItem: MagazinePistol | ||
| insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg | ||
| ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg | ||
| priority: 2 | ||
| whitelist: | ||
| tags: | ||
| - MagazinePistol | ||
| gun_chamber: | ||
| name: Chamber | ||
| startingItem: CartridgePistol | ||
| priority: 1 | ||
| whitelist: | ||
| tags: | ||
| - CartridgePistol | ||
| - type: ContainerContainer | ||
| containers: | ||
| gun_magazine: !type:ContainerSlot | ||
| gun_chamber: !type:ContainerSlot | ||
|
|
||
| - type: entity | ||
| name: Pollock | ||
| parent: [BaseWeaponPistol, BaseC1Contraband] | ||
| id: WeaponPistolPollock | ||
| description: A compact and mass-produced combat pistol. Uses .35 auto ammo. | ||
| components: | ||
| - type: Sprite | ||
| sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi | ||
| - type: Clothing | ||
| sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi | ||
| - type: Gun | ||
| fireRate: 5 | ||
| availableModes: | ||
| - SemiAuto | ||
| - type: ItemSlots | ||
| slots: | ||
| gun_magazine: | ||
| name: Magazine | ||
| startingItem: MagazinePistol | ||
| insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg | ||
| ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg | ||
| priority: 2 | ||
| whitelist: | ||
| tags: | ||
| - MagazinePistol | ||
| - MagazinePistolHighCapacity | ||
| gun_chamber: | ||
| name: Chamber | ||
| startingItem: CartridgePistol | ||
| priority: 1 | ||
| whitelist: | ||
| tags: | ||
| - CartridgePistol | ||
| - type: ContainerContainer | ||
| containers: | ||
| gun_magazine: !type:ContainerSlot | ||
| gun_chamber: !type:ContainerSlot | ||
| - type: StaticPrice | ||
| price: 500 | ||
67 changes: 67 additions & 0 deletions
67
Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| - type: entity | ||
| name: Fitz Special | ||
| parent: [BaseWeaponRevolver, BaseC1Contraband] | ||
| id: WeaponRevolverFitz | ||
| description: A compact and concealable self defence snub revolver. Uses .45 ammo. | ||
| components: | ||
| - type: Sprite | ||
| sprite: DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi | ||
| - type: Clothing | ||
| sprite: DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi | ||
| - type: Gun | ||
| selectedMode: SemiAuto | ||
| fireRate: 1.75 | ||
| availableModes: | ||
| - SemiAuto | ||
| - type: RevolverAmmoProvider | ||
| proto: CartridgeMagnum | ||
| capacity: 6 | ||
| chambers: [ True, True, True, True, True, True ] | ||
| ammoSlots: [ null, null, null, null, null, null ] | ||
| - type: StaticPrice | ||
| price: 340 | ||
FireFoxPhoenix marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| - type: entity | ||
| name: Faith | ||
| parent: [BaseWeaponRevolver, BaseC1Contraband] | ||
| id: WeaponRevolverFaith | ||
| description: Delivers blessings in bullet form. Uses .45 ammo. | ||
| components: | ||
| - type: Sprite | ||
| sprite: DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi | ||
| - type: Clothing | ||
| sprite: DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi | ||
| - type: Gun | ||
| selectedMode: SemiAuto | ||
| fireRate: 1.5 | ||
| availableModes: | ||
| - SemiAuto | ||
| - type: RevolverAmmoProvider | ||
| proto: CartridgeMagnum | ||
| capacity: 4 | ||
| chambers: [ True, True, True, True ] | ||
| ammoSlots: [ null, null, null, null ] | ||
| - type: StaticPrice | ||
| price: 240 | ||
|
|
||
| - type: entity | ||
| name: Lucky 37 | ||
| parent: [BaseWeaponRevolver, BaseC1Contraband] | ||
| id: WeaponRevolverLucky | ||
| description: Luck always beats skill, ya weasel. Uses .45 ammo. | ||
| components: | ||
| - type: Sprite | ||
| sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi | ||
| - type: Clothing | ||
| sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi | ||
| - type: Gun | ||
| selectedMode: SemiAuto | ||
| fireRate: 2 | ||
| availableModes: | ||
| - SemiAuto | ||
| - type: RevolverAmmoProvider | ||
| proto: CartridgeMagnum | ||
| chambers: [ True, True, True, True, True, True ] | ||
| ammoSlots: [ null, null, null, null, null, null ] | ||
| - type: StaticPrice | ||
| price: 750 | ||
141 changes: 141 additions & 0 deletions
141
Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| - type: entity | ||
| name: Vulcan | ||
| parent: [BaseWeaponRifle, BaseGunWieldable] | ||
| id: WeaponRifleVulcan | ||
| description: One of the heaviest small arms to grace Security's armory, this rifle is a modern take on a classic, informally dubbed the "Right Arm of the Free World". Uses .30 rifle ammo. | ||
| components: | ||
| - type: Sprite | ||
| sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi | ||
| layers: | ||
| - state: base | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-0 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
| - type: GunWieldBonus | ||
| minAngle: -20 | ||
| maxAngle: -30 | ||
| - type: Gun | ||
| minAngle: 21 | ||
| maxAngle: 54 | ||
| angleIncrease: 6 | ||
| angleDecay: 24 | ||
| fireRate: 5 | ||
| selectedMode: SemiAuto | ||
| availableModes: | ||
| - SemiAuto | ||
| - FullAuto | ||
| - type: ChamberMagazineAmmoProvider | ||
| - type: ItemSlots | ||
| slots: | ||
| gun_magazine: | ||
| name: Magazine | ||
| startingItem: MagazineLightRifle | ||
| insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg | ||
| ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg | ||
| priority: 2 | ||
| whitelist: | ||
| tags: | ||
| - MagazineLightRifle | ||
| gun_chamber: | ||
| name: Chamber | ||
| startingItem: CartridgeLightRifle | ||
| priority: 1 | ||
| whitelist: | ||
| tags: | ||
| - CartridgeLightRifle | ||
| - type: ContainerContainer | ||
| containers: | ||
| gun_magazine: !type:ContainerSlot | ||
| gun_chamber: !type:ContainerSlot | ||
| - type: MagazineVisuals | ||
| magState: mag | ||
| steps: 1 | ||
| zeroVisible: true | ||
| - type: Appearance | ||
| - type: Clothing | ||
| sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi | ||
| - type: StaticPrice | ||
| price: 1300 | ||
|
|
||
| - type: entity | ||
| name: ceremonial rifle | ||
| parent: [BaseWeaponSniper, BaseC2ExpeditionContraband] | ||
| id: WeaponSniperCeremonial | ||
| description: A ceremonial variant of the Mark 1 Rifle, in tasteful blue and white. Uses .30 rifle ammo. | ||
| components: | ||
| - type: Sprite | ||
| sprite: DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi | ||
| - type: Clothing | ||
| sprite: DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi | ||
| - type: Gun | ||
| fireRate: 2 | ||
| selectedMode: SemiAuto | ||
| availableModes: | ||
| - SemiAuto | ||
| soundGunshot: | ||
| path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg | ||
| - type: BallisticAmmoProvider | ||
| capacity: 5 | ||
| proto: CartridgeLightRifle | ||
| whitelist: | ||
| tags: | ||
| - CartridgeLightRifle | ||
|
|
||
|
|
||
| - type: entity | ||
| name: CAWS-25 Jackdaw | ||
| parent: [BaseWeaponRifle, BaseGunWieldable, BaseC3Contraband] | ||
| id: WeaponRifleJackdaw | ||
| description: The beginning of the end is heralded by the song of a Jackdaw. Uses .25 caseless ammo. | ||
| components: | ||
| - type: Item | ||
| size: Large | ||
| - type: Sprite | ||
| sprite: DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi | ||
| layers: | ||
| - state: base | ||
| map: ["enum.GunVisualLayers.Base"] | ||
| - state: mag-0 | ||
| map: ["enum.GunVisualLayers.Mag"] | ||
| - type: Gun | ||
| minAngle: 22 | ||
| maxAngle: 36 | ||
| angleIncrease: 2 | ||
| angleDecay: 8 | ||
| fireRate: 8 | ||
| selectedMode: FullAuto | ||
| availableModes: | ||
| - SemiAuto | ||
| - FullAuto | ||
| soundGunshot: | ||
| path: /Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg | ||
| - type: ChamberMagazineAmmoProvider | ||
| - type: ItemSlots | ||
| slots: | ||
| gun_magazine: | ||
| name: Magazine | ||
| startingItem: MagazineCaselessRifle | ||
| insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg | ||
| ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg | ||
| priority: 2 | ||
| whitelist: | ||
| tags: | ||
| - MagazineCaselessRifle | ||
| gun_chamber: | ||
| name: Chamber | ||
| startingItem: CartridgeCaselessRifle | ||
| priority: 1 | ||
| whitelist: | ||
| tags: | ||
| - CartridgeCaselessRifle | ||
| - type: ContainerContainer | ||
| containers: | ||
| gun_magazine: !type:ContainerSlot | ||
| gun_chamber: !type:ContainerSlot | ||
| - type: MagazineVisuals | ||
| magState: mag | ||
| steps: 1 | ||
| zeroVisible: true | ||
| - type: Appearance | ||
| - type: Clothing | ||
| sprite: DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+842 Bytes
Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+831 Bytes
Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/bolt-open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+674 Bytes
...rces/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-BELT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+854 Bytes
Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+809 Bytes
Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+846 Bytes
...urces/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+532 Bytes
Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/mag-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.