Skip to content

Commit 275eb0a

Browse files
authored
Merge pull request #40 from VividPups/aa
Adding a new gun
2 parents c7a9a68 + aa2dac7 commit 275eb0a

File tree

14 files changed

+121
-0
lines changed

14 files changed

+121
-0
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,9 @@
291291
- WeaponCaseLongRailgunPeregrine # HL. Intended rarity for the Peregrine
292292
#Hardlight start
293293
- WeaponCaseLongVortex
294+
295+
# Triad start
296+
- WeaponCaseLongMisriah # this might need to become tier 5
294297
chance: 1.0
295298
offset: 0.0
296299
rarePrototypes:
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
- type: entity
2+
parent: WeaponCaseLong
3+
id: WeaponCaseLongMisriah
4+
suffix: Dungeon, Misriah
5+
# categories: [ HideSpawnMenu ]
6+
components:
7+
- type: StorageFill
8+
contents:
9+
- id: WeaponRifleMMisriahAutorifle
10+
amount: 1
11+
- id: Magazine762x51mmFMJ
12+
amount: 3
13+
- id: AmmoBox762x51mmFMJ
14+
amount: 2
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
- type: entity
2+
name: Misriah Autorifle (762x51mm)
3+
parent: [BaseWeaponRifle, BaseGunMeleeBlunt, BaseC3SyndicateContraband] # Frontier: BaseSecurityContraband<BaseC3SyndicateContraband
4+
id: WeaponRifleMMisriahAutorifle
5+
description: Standard issue assault rifle issued to marines and special forces; chambered in 762x51mm ammo. Produced by SESWC.
6+
components:
7+
- type: Sprite
8+
sprite: __Triad/Objects/Weapons/Guns/Rifles/ma5b.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: __Triad/Objects/Weapons/Guns/Rifles/ma5b.rsi
16+
quickEquip: false
17+
slots:
18+
- Back
19+
- suitStorage
20+
- type: Gun
21+
fireRate: 6
22+
soundGunshot:
23+
path: /Audio/Weapons/Guns/Gunshots/lmg.ogg
24+
- type: ChamberMagazineAmmoProvider
25+
soundRack:
26+
path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg
27+
- type: ItemSlots
28+
slots:
29+
gun_magazine:
30+
name: Magazine
31+
startingItem: Magazine762x51mmFMJ
32+
insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
33+
ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
34+
priority: 2
35+
whitelist:
36+
tags:
37+
- Magazine762x51mmFMJ
38+
- Magazine762x51mmLowCapacityFMJ
39+
whitelistFailPopup: gun-magazine-whitelist-fail
40+
gun_chamber:
41+
name: Chamber
42+
startingItem: Cartridge762x51mmFMJ
43+
priority: 1
44+
whitelist:
45+
tags:
46+
- Cartridge762x51mmFMJ
47+
- type: ContainerContainer
48+
containers:
49+
gun_magazine: !type:ContainerSlot
50+
gun_chamber: !type:ContainerSlot
51+
- type: MagazineVisuals
52+
magState: mag
53+
steps: 1
54+
zeroVisible: true
55+
- type: Appearance
56+
- type: NFWeaponDetails
57+
manufacturer: weapon-details-manufacturer-SESWC-consortium
631 Bytes
Loading
643 Bytes
Loading
843 Bytes
Loading
843 Bytes
Loading
640 Bytes
Loading
520 Bytes
Loading
544 Bytes
Loading

0 commit comments

Comments
 (0)