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.

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

New Guns and Mosin Rework and Sawn PKA fix #1143

Closed
wants to merge 32 commits into from
Closed
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c04178b
Is It fix??
VividPups Feb 11, 2024
936fafb
Merge branch 'master' of https://github.com/VividPups/frontier-statio…
VividPups Mar 21, 2024
06df043
New GUNS !
VividPups Mar 22, 2024
e8cf670
Sprite fixs for Revolver and hopefully the SVT
VividPups Mar 22, 2024
5e060a4
Fix this
VividPups Mar 22, 2024
2a30bf9
fix svt hiopefully
VividPups Mar 22, 2024
23bdbf9
Changes spawners back to default where it is just Arcadia stuff
VividPups Mar 22, 2024
16b2080
Add # Text to the files
VividPups Mar 22, 2024
adc5a35
More balancing, lowing Amount of ammo use in the mosin by 5 and also …
VividPups Mar 23, 2024
5c49e91
FIX THIS TIME??????????
VividPups Mar 23, 2024
8516efa
fix now?
VividPups Mar 23, 2024
9dd2b35
updates and fixs
VividPups Mar 23, 2024
fbd2fcc
the FIX for the Sawn PKA
VividPups Mar 23, 2024
773ace6
Update snipers.yml
VividPups Mar 24, 2024
cb35423
Update explosives.yml
VividPups Mar 24, 2024
4b189a7
Not post to be in this PR
VividPups Mar 24, 2024
6eeae7c
Merge branch 'Gun' of https://github.com/VividPups/frontier-station-1…
VividPups Mar 24, 2024
953642c
Update pistols.yml
VividPups Mar 24, 2024
c66434e
Update snipers.yml
VividPups Mar 24, 2024
7ee9f86
Update snipers.yml
VividPups Mar 24, 2024
fd09aaa
Update lesslethalvend.yml
VividPups Mar 24, 2024
a9cad04
Update snipers.yml
VividPups Mar 24, 2024
8b026ad
Update explosives.yml
VividPups Mar 24, 2024
f19c8c2
Update pistols.yml
VividPups Mar 24, 2024
70e699c
Update lesslethalvend.yml
VividPups Mar 24, 2024
05f789a
Update pistols.yml
VividPups Mar 25, 2024
b355034
Update snipers.yml
VividPups Mar 25, 2024
5452d84
remove slips nade
VividPups Mar 25, 2024
f659757
Update janidrobe.yml
VividPups Mar 25, 2024
0bf1efa
Merge branch 'new-frontiers-14:master' into Gun
VividPups Mar 26, 2024
0395a05
Merge branch 'new-frontiers-14:master' into Gun
VividPups Mar 28, 2024
bb192da
Merge branch 'new-frontiers-14:master' into Gun
VividPups Apr 23, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
MagazineBoxLightRiflePractice: 15
MagazineBoxLightRifleRubber: 15
WeaponShotgunDoubleBarreled: 15
WhitePhosphorusGrenade: 3 # Add for Frontier
BoxShotgunSlug: 15
BoxLethalshot: 15
BoxBeanbag: 15
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
- type: vendingMachineInventory
id: JaniDrobeInventory
startingInventory:
SpaceCleanerGrenade: 10 # For you Slips, Frontier
ClothingBackpackMessengerJanitor: 2 # Frontier
ClothingUniformJumpsuitJanitor: 2
ClothingUniformJumpskirtJanitor: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,50 @@
price: 500

- type: entity
name: Kardashev-Mosin
name: Kardashev-Mosin # Mosin Rework was done for Frontier
parent: BaseWeaponSniper
id: WeaponSniperMosin
description: A weapon for hunting, or endless trench warfare. Uses .30 rifle ammo.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
state: base
- type: AmmoCounter
- type: Gun
useKey: false
fireRate: 1.25
selectedMode: SemiAuto
availableModes:
- SemiAuto
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/sniper.ogg
- type: BallisticAmmoProvider
capacity: 5
proto: CartridgeLightRifle
whitelist:
tags:
- CartridgeLightRifle
- type: MeleeWeapon
attackRate: .85
damage:
types:
Piercing: 16
Slash: 5
angle: 0
wideAnimationRotation: -135
- type: DisarmMalus
animation: WeaponArcThrust
soundHit:
path: /Audio/Weapons/bladeslice.ogg
- type: Sharp
- type: Clothing
quickEquip: false
slots:
- back
- suitStorage
sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
- type: StaticPrice
price: 210
price: 500

- type: entity
name: Hristov
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
WeaponRevolverArgentiNonlethal: 10
WeaponShotgunDoubleBarreledRubber: 10
WeaponFlareGun: 20
WeaponPistolValentineNonLethal: 4
WeaponSVTnonlethal: 4
BoxDonkSoftBox: 10
BoxCartridgeCap: 10
MagazineBoxPistolRubber: 10
Expand Down
Loading
Loading