Skip to content

Commit 7dbfe13

Browse files
FireFoxPhoenixdvir001whatston3
authored
Weapons from Delta-V (#2527)
* Weapons * Update revolvers.yml * Description * Description * Cases for weapons * Cases * Name Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Name Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Name Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Name Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Name Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * GunWieldBonus Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update weaponryworks.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
1 parent cf73ba9 commit 7dbfe13

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

+591
-1
lines changed

‎Resources/Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg‎

9.07 KB
Binary file not shown.

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

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
- type: entity
2+
name: Mk32 "Universal"
3+
parent: [BaseWeaponPistol, BaseC1Contraband]
4+
id: WeaponPistolUniversal
5+
description: The Mark 32 Offensive Handgun, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo.
6+
components:
7+
- type: Sprite
8+
sprite: DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi
9+
layers:
10+
- state: base
11+
map: ["enum.GunVisualLayers.Base"]
12+
- state: mag-0
13+
map: ["enum.GunVisualLayers.Mag"]
14+
- type: Clothing
15+
sprite: DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi
16+
- type: Gun
17+
fireRate: 3
18+
availableModes:
19+
- SemiAuto
20+
- type: ItemSlots
21+
slots:
22+
gun_magazine:
23+
name: Magazine
24+
startingItem: MagazinePistol
25+
insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
26+
ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
27+
priority: 2
28+
whitelist:
29+
tags:
30+
- MagazinePistol
31+
gun_chamber:
32+
name: Chamber
33+
startingItem: CartridgePistol
34+
priority: 1
35+
whitelist:
36+
tags:
37+
- CartridgePistol
38+
- type: ContainerContainer
39+
containers:
40+
gun_magazine: !type:ContainerSlot
41+
gun_chamber: !type:ContainerSlot
42+
43+
- type: entity
44+
name: Pollock
45+
parent: [BaseWeaponPistol, BaseC1Contraband]
46+
id: WeaponPistolPollock
47+
description: A compact and mass-produced combat pistol. Uses .35 auto ammo.
48+
components:
49+
- type: Sprite
50+
sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi
51+
- type: Clothing
52+
sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi
53+
- type: Gun
54+
fireRate: 5
55+
availableModes:
56+
- SemiAuto
57+
- type: ItemSlots
58+
slots:
59+
gun_magazine:
60+
name: Magazine
61+
startingItem: MagazinePistol
62+
insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
63+
ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
64+
priority: 2
65+
whitelist:
66+
tags:
67+
- MagazinePistol
68+
- MagazinePistolHighCapacity
69+
gun_chamber:
70+
name: Chamber
71+
startingItem: CartridgePistol
72+
priority: 1
73+
whitelist:
74+
tags:
75+
- CartridgePistol
76+
- type: ContainerContainer
77+
containers:
78+
gun_magazine: !type:ContainerSlot
79+
gun_chamber: !type:ContainerSlot
80+
- type: StaticPrice
81+
price: 500

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

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
- type: entity
2+
name: Fitz Special
3+
parent: [BaseWeaponRevolver, BaseC1Contraband]
4+
id: WeaponRevolverFitz
5+
description: A compact and concealable self defence snub revolver. Uses .45 ammo.
6+
components:
7+
- type: Sprite
8+
sprite: DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi
9+
- type: Clothing
10+
sprite: DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi
11+
- type: Gun
12+
selectedMode: SemiAuto
13+
fireRate: 1.75
14+
availableModes:
15+
- SemiAuto
16+
- type: RevolverAmmoProvider
17+
proto: CartridgeMagnum
18+
capacity: 6
19+
chambers: [ True, True, True, True, True, True ]
20+
ammoSlots: [ null, null, null, null, null, null ]
21+
- type: StaticPrice
22+
price: 340
23+
24+
- type: entity
25+
name: Faith
26+
parent: [BaseWeaponRevolver, BaseC1Contraband]
27+
id: WeaponRevolverFaith
28+
description: Delivers blessings in bullet form. Uses .45 ammo.
29+
components:
30+
- type: Sprite
31+
sprite: DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi
32+
- type: Clothing
33+
sprite: DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi
34+
- type: Gun
35+
selectedMode: SemiAuto
36+
fireRate: 1.5
37+
availableModes:
38+
- SemiAuto
39+
- type: RevolverAmmoProvider
40+
proto: CartridgeMagnum
41+
capacity: 4
42+
chambers: [ True, True, True, True ]
43+
ammoSlots: [ null, null, null, null ]
44+
- type: StaticPrice
45+
price: 240
46+
47+
- type: entity
48+
name: Lucky 37
49+
parent: [BaseWeaponRevolver, BaseC1Contraband]
50+
id: WeaponRevolverLucky
51+
description: Luck always beats skill, ya weasel. Uses .45 ammo.
52+
components:
53+
- type: Sprite
54+
sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi
55+
- type: Clothing
56+
sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi
57+
- type: Gun
58+
selectedMode: SemiAuto
59+
fireRate: 2
60+
availableModes:
61+
- SemiAuto
62+
- type: RevolverAmmoProvider
63+
proto: CartridgeMagnum
64+
chambers: [ True, True, True, True, True, True ]
65+
ammoSlots: [ null, null, null, null, null, null ]
66+
- type: StaticPrice
67+
price: 750

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

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
- type: entity
2+
name: Vulcan
3+
parent: [BaseWeaponRifle, BaseGunWieldable]
4+
id: WeaponRifleVulcan
5+
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.
6+
components:
7+
- type: Sprite
8+
sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi
9+
layers:
10+
- state: base
11+
map: ["enum.GunVisualLayers.Base"]
12+
- state: mag-0
13+
map: ["enum.GunVisualLayers.Mag"]
14+
- type: GunWieldBonus
15+
minAngle: -20
16+
maxAngle: -30
17+
- type: Gun
18+
minAngle: 21
19+
maxAngle: 54
20+
angleIncrease: 6
21+
angleDecay: 24
22+
fireRate: 5
23+
selectedMode: SemiAuto
24+
availableModes:
25+
- SemiAuto
26+
- FullAuto
27+
- type: ChamberMagazineAmmoProvider
28+
- type: ItemSlots
29+
slots:
30+
gun_magazine:
31+
name: Magazine
32+
startingItem: MagazineLightRifle
33+
insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
34+
ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
35+
priority: 2
36+
whitelist:
37+
tags:
38+
- MagazineLightRifle
39+
gun_chamber:
40+
name: Chamber
41+
startingItem: CartridgeLightRifle
42+
priority: 1
43+
whitelist:
44+
tags:
45+
- CartridgeLightRifle
46+
- type: ContainerContainer
47+
containers:
48+
gun_magazine: !type:ContainerSlot
49+
gun_chamber: !type:ContainerSlot
50+
- type: MagazineVisuals
51+
magState: mag
52+
steps: 1
53+
zeroVisible: true
54+
- type: Appearance
55+
- type: Clothing
56+
sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi
57+
- type: StaticPrice
58+
price: 1300
59+
60+
- type: entity
61+
name: ceremonial rifle
62+
parent: [BaseWeaponSniper, BaseC2ExpeditionContraband]
63+
id: WeaponSniperCeremonial
64+
description: A ceremonial variant of the Mark 1 Rifle, in tasteful blue and white. Uses .30 rifle ammo.
65+
components:
66+
- type: Sprite
67+
sprite: DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi
68+
- type: Clothing
69+
sprite: DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi
70+
- type: Gun
71+
fireRate: 2
72+
selectedMode: SemiAuto
73+
availableModes:
74+
- SemiAuto
75+
soundGunshot:
76+
path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
77+
- type: BallisticAmmoProvider
78+
capacity: 5
79+
proto: CartridgeLightRifle
80+
whitelist:
81+
tags:
82+
- CartridgeLightRifle
83+
84+
85+
- type: entity
86+
name: CAWS-25 Jackdaw
87+
parent: [BaseWeaponRifle, BaseGunWieldable, BaseC3Contraband]
88+
id: WeaponRifleJackdaw
89+
description: The beginning of the end is heralded by the song of a Jackdaw. Uses .25 caseless ammo.
90+
components:
91+
- type: Item
92+
size: Large
93+
- type: Sprite
94+
sprite: DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi
95+
layers:
96+
- state: base
97+
map: ["enum.GunVisualLayers.Base"]
98+
- state: mag-0
99+
map: ["enum.GunVisualLayers.Mag"]
100+
- type: Gun
101+
minAngle: 22
102+
maxAngle: 36
103+
angleIncrease: 2
104+
angleDecay: 8
105+
fireRate: 8
106+
selectedMode: FullAuto
107+
availableModes:
108+
- SemiAuto
109+
- FullAuto
110+
soundGunshot:
111+
path: /Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg
112+
- type: ChamberMagazineAmmoProvider
113+
- type: ItemSlots
114+
slots:
115+
gun_magazine:
116+
name: Magazine
117+
startingItem: MagazineCaselessRifle
118+
insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
119+
ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
120+
priority: 2
121+
whitelist:
122+
tags:
123+
- MagazineCaselessRifle
124+
gun_chamber:
125+
name: Chamber
126+
startingItem: CartridgeCaselessRifle
127+
priority: 1
128+
whitelist:
129+
tags:
130+
- CartridgeCaselessRifle
131+
- type: ContainerContainer
132+
containers:
133+
gun_magazine: !type:ContainerSlot
134+
gun_chamber: !type:ContainerSlot
135+
- type: MagazineVisuals
136+
magState: mag
137+
steps: 1
138+
zeroVisible: true
139+
- type: Appearance
140+
- type: Clothing
141+
sprite: DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,19 @@
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+
110123
- type: entity
111124
parent: WeaponCaseShort
112125
id: WeaponCaseShortRevolverPirate
@@ -341,6 +354,19 @@
341354
- id: MagazineLightRifleLowCapacity
342355
amount: 2
343356

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+
344370
# Energy
345371
- type: entity
346372
parent: WeaponCaseShort

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
WeaponRifleNovaliteC1: 1
99
WeaponShotgunDoubleBarreled: 1
1010
WeaponRevolverArgenti: 1
11+
WeaponPistolPollock: 3
12+
WeaponRifleVulcan: 3
13+
WeaponRevolverFitz: 3
14+
WeaponRevolverFaith: 3
1115
BoxShotgunSlug: 1
1216
BoxLethalshot: 1
1317
BoxBeanbag: 1
@@ -35,6 +39,7 @@
3539
WeaponRifleNovaliteC1: 4294967295
3640
WeaponShotgunDoubleBarreled: 4294967295
3741
WeaponRevolverArgenti: 4294967295
42+
WeaponPistolPollock: 4294967295
3843
BoxShotgunSlug: 4294967295
3944
BoxLethalshot: 4294967295
4045
BoxBeanbag: 4294967295
@@ -50,4 +55,4 @@
5055
MagazineNovaliteC1Empty: 4294967295
5156
MagazineLightRifleLowCapacityEmpty: 4294967295
5257
emaggedInventory:
53-
WeaponPistolViper: 1
58+
WeaponPistolViper: 1

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

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -719,6 +719,7 @@
719719
- WeaponRifleGestio
720720
- BaseBallBatNF
721721
- CrossbowModern
722+
- WeaponPistolPollock
722723
## Ammo boxes
723724
- BoxLethalshot
724725
- MagazineBoxLightRifle

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,16 @@
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+
182192
- type: latheRecipe
183193
id: ClothingEyesHudNfsd
184194
parent: ClothingEyesHudSecurity

‎Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/base.png‎

842 Bytes
Loading

0 commit comments

Comments
 (0)