Skip to content

Commit 16fc01c

Browse files
dvir001whatston3
dvir001
and
whatston3
authored
Weapons from Delta-V (#2693)
* Revert "Revert "Weapons from Delta-V (#2527)" (#2692)" This reverts commit 1fac436. * Fix * Fix left * Fix * Fix * Fix * reduce vulcan price, wieldable ceremonial rifle * expedition gun variation, universal buff & swap * add typewriter gun, copy universal sound * Revert "AkExpedition" references * Revert weapon case name change --------- Co-authored-by: Whatstone <whatston3@gmail.com>
1 parent 81dd7c2 commit 16fc01c

File tree

82 files changed

+858
-4
lines changed

Some content is hidden

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

82 files changed

+858
-4
lines changed

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

9.07 KB
Binary file not shown.

‎Resources/Audio/_DV/Weapons/Guns/Gunshots/typewriter.ogg‎

13.2 KB
Binary file not shown.

‎Resources/Audio/_DV/Weapons/Guns/Gunshots/universal.ogg‎

11 KB
Binary file not shown.

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

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
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: _DV/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: _DV/Objects/Weapons/Guns/Pistols/universal.rsi
16+
- type: Gun
17+
fireRate: 4 # Frontier: 3<4
18+
availableModes:
19+
- SemiAuto
20+
soundGunshot:
21+
path: /Audio/_DV/Weapons/Guns/Gunshots/universal.ogg
22+
- type: ItemSlots
23+
slots:
24+
gun_magazine:
25+
name: Magazine
26+
startingItem: MagazinePistol
27+
insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
28+
ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
29+
priority: 2
30+
whitelist:
31+
tags:
32+
- MagazinePistol
33+
gun_chamber:
34+
name: Chamber
35+
startingItem: CartridgePistol
36+
priority: 1
37+
whitelist:
38+
tags:
39+
- CartridgePistol
40+
- type: ContainerContainer
41+
containers:
42+
gun_magazine: !type:ContainerSlot
43+
gun_chamber: !type:ContainerSlot
44+
45+
- type: entity
46+
name: Pollock
47+
parent: [BaseWeaponPistol, BaseC1Contraband]
48+
id: WeaponPistolPollock
49+
description: A compact and mass-produced combat pistol. Uses .35 auto ammo.
50+
components:
51+
- type: Sprite
52+
sprite: _DV/Objects/Weapons/Guns/Pistols/pollock.rsi
53+
- type: Clothing
54+
sprite: _DV/Objects/Weapons/Guns/Pistols/pollock.rsi
55+
- type: Gun
56+
fireRate: 5
57+
availableModes:
58+
- SemiAuto
59+
- type: ItemSlots
60+
slots:
61+
gun_magazine:
62+
name: Magazine
63+
startingItem: MagazinePistol
64+
insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
65+
ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
66+
priority: 2
67+
whitelist:
68+
tags:
69+
- MagazinePistol
70+
- MagazinePistolHighCapacity
71+
gun_chamber:
72+
name: Chamber
73+
startingItem: CartridgePistol
74+
priority: 1
75+
whitelist:
76+
tags:
77+
- CartridgePistol
78+
- type: ContainerContainer
79+
containers:
80+
gun_magazine: !type:ContainerSlot
81+
gun_chamber: !type:ContainerSlot
82+
# - type: StaticPrice # Frontier: use default value
83+
# price: 500

‎Resources/Prototypes/_DV/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: _DV/Objects/Weapons/Guns/Revolvers/fitz.rsi
9+
- type: Clothing
10+
sprite: _DV/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: _DV/Objects/Weapons/Guns/Revolvers/faith.rsi
32+
- type: Clothing
33+
sprite: _DV/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: _DV/Objects/Weapons/Guns/Revolvers/lucky.rsi
55+
- type: Clothing
56+
sprite: _DV/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/_DV/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, BaseC1Contraband] # Frontier: add BaseC1Contraband
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: _DV/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: _DV/Objects/Weapons/Guns/Rifles/vulcan.rsi
57+
# - type: StaticPrice # Frontier: overvalued
58+
# price: 1300
59+
60+
- type: entity
61+
name: ceremonial rifle
62+
parent: [BaseWeaponSniper, BaseGunWieldable, BaseC1Contraband] # Frontier: add BaseGunWieldable, BaseC1Contraband
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: _DV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi
68+
- type: Clothing
69+
sprite: _DV/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] # Frontier: add 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: _DV/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/_DV/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: _DV/Objects/Weapons/Guns/Rifles/jackdaw.rsi

‎Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
- type: entity
2+
name: Typewriter
3+
parent: [BaseWeaponSubMachineGun, BaseGunWieldable, BaseC2Contraband] # Frontier: added BaseC2Contraband
4+
id: WeaponSubMachineGunTypewriter
5+
description: A modern take on the classic design used by mobsters throughout space and time. Types .35 auto ammo.
6+
components:
7+
- type: Sprite
8+
sprite: _DV/Objects/Weapons/Guns/SMGs/typewriter.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: _DV/Objects/Weapons/Guns/SMGs/typewriter.rsi
16+
- type: GunWieldBonus
17+
minAngle: -20
18+
maxAngle: -30
19+
- type: Gun
20+
minAngle: 21
21+
maxAngle: 45
22+
angleIncrease: 5
23+
angleDecay: 20
24+
fireRate: 8
25+
soundGunshot:
26+
path: /Audio/_DV/Weapons/Guns/Gunshots/typewriter.ogg
27+
- type: ChamberMagazineAmmoProvider
28+
- type: ItemSlots
29+
slots:
30+
gun_magazine:
31+
name: Magazine
32+
startingItem: MagazinePistolSubMachineGun
33+
insertSound: /Audio/Weapons/Guns/MagIn/hpistol_magin.ogg
34+
ejectSound: /Audio/Weapons/Guns/MagOut/sfrifle_magout.ogg
35+
priority: 2
36+
whitelist:
37+
tags:
38+
- MagazinePistolSubMachineGun
39+
gun_chamber:
40+
name: Chamber
41+
startingItem: CartridgePistol
42+
priority: 1
43+
whitelist:
44+
tags:
45+
- CartridgePistol
46+
- type: MagazineVisuals
47+
magState: mag
48+
steps: 1
49+
zeroVisible: true
50+
- type: Appearance

0 commit comments

Comments
 (0)