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

Gun Buffs #1861

Open
wants to merge 48 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
aa09f71
Buff rifle ammo
EctoplasmIsGood Mar 2, 2025
ea30da2
Update antimateriel.yml
EctoplasmIsGood Mar 2, 2025
0523adc
Update shotgun.yml
EctoplasmIsGood Mar 2, 2025
3abf5b0
SMG Buffs (Drozd meta must end)
EctoplasmIsGood Mar 2, 2025
22651d1
Minigun stuff
EctoplasmIsGood Mar 2, 2025
a8c604b
Update hmgs.yml
EctoplasmIsGood Mar 2, 2025
09a9629
Update hmgs.yml
EctoplasmIsGood Mar 2, 2025
d2cf632
Update hmgs.yml
EctoplasmIsGood Mar 2, 2025
c8a2009
Update hmgs.yml
EctoplasmIsGood Mar 2, 2025
1f7a1d7
Update hmgs.yml
EctoplasmIsGood Mar 2, 2025
ad88492
Update hmgs.yml
EctoplasmIsGood Mar 2, 2025
388b0c4
Update hmgs.yml
EctoplasmIsGood Mar 2, 2025
0cb3db2
Update heavy_rifle.yml
EctoplasmIsGood Mar 2, 2025
22af511
Update heavy_rifle.yml
EctoplasmIsGood Mar 2, 2025
c5c6914
Update rifle.yml
EctoplasmIsGood Mar 2, 2025
e15e2c2
Update heavy_rifle.yml
EctoplasmIsGood Mar 2, 2025
c00becb
Update rifle.yml
EctoplasmIsGood Mar 2, 2025
216af31
Update hmgs.yml
EctoplasmIsGood Mar 2, 2025
a20769f
Update rifle.yml
EctoplasmIsGood Mar 2, 2025
7021c23
Update hmgs.yml
EctoplasmIsGood Mar 2, 2025
7f5a13f
Update hmgs.yml
EctoplasmIsGood Mar 2, 2025
46d2d18
Update rifle.yml
EctoplasmIsGood Mar 2, 2025
ef0ae08
Update rifle.yml
EctoplasmIsGood Mar 2, 2025
fca0c55
Update heavy_rifle.yml
EctoplasmIsGood Mar 2, 2025
e64ab06
Update tags.yml
EctoplasmIsGood Mar 2, 2025
21441ce
Update hmgs.yml
EctoplasmIsGood Mar 2, 2025
37649b1
Update hmgs.yml
EctoplasmIsGood Mar 2, 2025
b5ff789
Update hmgs.yml
EctoplasmIsGood Mar 2, 2025
af8dc66
Merge branch 'Simple-Station:master' into GunBuffs
EctoplasmIsGood Mar 2, 2025
8dd4b72
Update heavy_rifle.yml
EctoplasmIsGood Mar 2, 2025
9dfd70e
Update smgs.yml
EctoplasmIsGood Mar 2, 2025
6dd26b0
Update antimateriel.yml
EctoplasmIsGood Mar 2, 2025
6dbbd4c
Update shotgun.yml
EctoplasmIsGood Mar 2, 2025
2232ad8
Update heavy_rifle.yml
EctoplasmIsGood Mar 2, 2025
dbeb2cf
Merge branch 'Simple-Station:master' into GunBuffs
EctoplasmIsGood Mar 3, 2025
60c658a
Update migration.yml
EctoplasmIsGood Mar 3, 2025
a03c45f
Update hmgs.yml
EctoplasmIsGood Mar 3, 2025
21aebf1
Update hmgs.yml
EctoplasmIsGood Mar 3, 2025
7132fb6
Update tags.yml
EctoplasmIsGood Mar 3, 2025
bda6be1
Update migration.yml
EctoplasmIsGood Mar 3, 2025
029f75b
Update security.yml
EctoplasmIsGood Mar 3, 2025
8c45b3a
Update suspicion_loot_table.yml
EctoplasmIsGood Mar 3, 2025
3c1434f
Merge branch 'Simple-Station:master' into GunBuffs
EctoplasmIsGood Mar 3, 2025
bcfef72
Merge branch 'master' into GunBuffs
EctoplasmIsGood Mar 3, 2025
28b0403
Update hmgs.yml
EctoplasmIsGood Mar 3, 2025
a95ffe3
Update hmgs.yml
EctoplasmIsGood Mar 3, 2025
b74d7d3
Update heavy_rifle.yml
EctoplasmIsGood Mar 3, 2025
2be6a99
Update heavy_rifle.yml
EctoplasmIsGood Mar 3, 2025
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 @@ -138,4 +138,3 @@
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: uranium

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
abstract: true
components:
- type: Tag
tags:
tags:
- MagazineHeavyRifle
- type: Item
size: Small
Expand All @@ -26,3 +26,23 @@
steps: 2
zeroVisible: false
- type: Appearance

- type: entity
id: MagazineBoxRifleMinigun
name: "Minigun Ammo Box (.10 rifle)"
parent: BaseMagazineHeavyRifle
components:
- type: Tag
tags:
- MagazineBoxRifleMinigun
- type: BallisticAmmoProvider
proto: CartridgeMinigun
capacity: 500
- type: Item
- type: Sprite
sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi
- type: MagazineVisuals
magState: mag
steps: 8
zeroVisible: false
- type: Appearance
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
- type: Projectile
damage:
types:
Piercing: 50 # DeltaV - Damage Bumped, was 40
Structural: 200 # DeltaV - was 30
ignoreResistances: true # DeltaV - Hristov be spooky now
Piercing: 70 # AntiMateriel Sniper should hurt real bad
Structural: 400 # Sniper is rarely used this way, but this ammo type exists to burst down CONCRETE and TANKS
ignoreResistances: true
- type: StaminaDamageOnCollide
damage: 50 # DeltaV - was 35
damage: 75 # Getting hit with this should knock you the fuck down
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
- type: Projectile
damage:
types:
Piercing: 5
Piercing: 10
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- type: Projectile
damage:
types:
Piercing: 17
Piercing: 23

- type: entity
id: BulletRiflePractice
Expand Down Expand Up @@ -53,5 +53,5 @@
damage:
types:
Radiation: 7
Piercing: 8
Piercing: 12

Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,13 @@
- type: SolutionContainerManager
solutions:
ammo:
maxVol: 15
maxVol: 30
- type: RefillableSolution
solution: ammo
- type: DrainableSolution
solution: ammo
- type: SolutionInjectOnProjectileHit
transferAmount: 15
transferAmount: 30 # "Hey, you're not meant to have a shotgun its gree- *snores*"
solution: ammo
- type: InjectableSolution
solution: ammo
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
abstract: true
components:
- type: Sprite
- type: Wieldable
unwieldOnUse: false
- type: Item
size: Ginormous
- type: Gun
Expand Down Expand Up @@ -50,18 +52,44 @@
- type: Item
sprite: Objects/Weapons/Guns/HMGs/minigun.rsi
- type: Gun
fireRate: 15
minAngle: 80
maxAngle: 200
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/minigun.ogg
- type: BallisticAmmoProvider
proto: CartridgeMinigun
capacity: 1000
- type: GunWieldBonus
minAngle: -70
maxAngle: -155
- type: ChamberMagazineAmmoProvider
soundRack:
path: /Audio/Weapons/Guns/Cock/lmg_cock.ogg
- type: AmmoCounter
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazineBoxRifleMinigun
insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
priority: 2
whitelist:
tags:
- MagazineBoxRifleMinigun
gun_chamber:
name: Chamber
startingItem: CartridgeMinigun
priority: 1
whitelist:
tags:
- CartridgeMinigun
- type: ContainerContainer
containers:
gun_magazine: !type:ContainerSlot
gun_chamber: !type:ContainerSlot
- type: ClothingSpeedModifier
walkModifier: 0.3
sprintModifier: 0.3
- type: HeldSpeedModifier
- type: MagazineVisuals
magState: mag
steps: 4
zeroVisible: true
- type: Appearance
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
ents: []
148 changes: 75 additions & 73 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
- type: Gun
minAngle: 21
maxAngle: 32
fireRate: 10
shotsPerBurst: 5
availableModes:
- SemiAuto
Expand Down Expand Up @@ -201,53 +202,54 @@
zeroVisible: true
- type: Appearance

- type: entity
name: Vector
parent: BaseWeaponSubMachineGun
id: WeaponSubMachineGunVector
suffix: Deprecated use Drozd
description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/SMGs/vector.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Clothing
sprite: Objects/Weapons/Guns/SMGs/vector.rsi
- type: Gun
fireRate: 6
selectedMode: FullAuto
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
availableModes:
- FullAuto
fireOnDropChance: 0.1
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazineMagnumSubMachineGun
insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
priority: 2
whitelist:
tags:
- MagazineMagnumSubMachineGun
gun_chamber:
name: Chamber
startingItem: CartridgeMagnum
priority: 1
whitelist:
tags:
- CartridgeMagnum
- type: MagazineVisuals
magState: mag
steps: 1
zeroVisible: true
- type: Appearance
#Commented out the Vector, as it is deprecated.
# - type: entity
# name: Vector
# parent: BaseWeaponSubMachineGun
# id: WeaponSubMachineGunVector
# suffix: Deprecated use Drozd
# description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo.
# components:
# - type: Sprite
# sprite: Objects/Weapons/Guns/SMGs/vector.rsi
# layers:
# - state: base
# map: ["enum.GunVisualLayers.Base"]
# - state: mag-0
# map: ["enum.GunVisualLayers.Mag"]
# - type: Clothing
# sprite: Objects/Weapons/Guns/SMGs/vector.rsi
# - type: Gun
# fireRate: 6
# selectedMode: FullAuto
# soundGunshot:
# path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
# availableModes:
# - FullAuto
# fireOnDropChance: 0.1
# - type: ItemSlots
# slots:
# gun_magazine:
# name: Magazine
# startingItem: MagazineMagnumSubMachineGun
# insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
# ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
# priority: 2
# whitelist:
# tags:
# - MagazineMagnumSubMachineGun
# gun_chamber:
# name: Chamber
# startingItem: CartridgeMagnum
# priority: 1
# whitelist:
# tags:
# - CartridgeMagnum
# - type: MagazineVisuals
# magState: mag
## steps: 1
# zeroVisible: true
# - type: Appearance

- type: entity
name: WT550
Expand All @@ -273,7 +275,7 @@
- type: ChamberMagazineAmmoProvider
boltClosed: null
- type: Gun
fireRate: 5.5
fireRate: 7
minAngle: 1
maxAngle: 6
angleIncrease: 1.5
Expand Down Expand Up @@ -347,28 +349,28 @@
tags:
- CartridgePistol

- type: entity
name: Vector
parent: WeaponSubMachineGunVector
id: WeaponSubMachineGunVectorRubber
description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo.
suffix: Non-Lethal
components:
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazineMagnumSubMachineGunRubber
insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
priority: 2
whitelist:
tags:
- MagazineMagnumSubMachineGun
gun_chamber:
name: Chamber
startingItem: CartridgeMagnumRubber
priority: 1
whitelist:
tags:
- CartridgeMagnum
#- type: entity
# name: Vector
# parent: WeaponSubMachineGunVector
# id: WeaponSubMachineGunVectorRubber
# description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo.
# suffix: Non-Lethal
# components:
# - type: ItemSlots
# slots:
# gun_magazine:
# name: Magazine
# startingItem: MagazineMagnumSubMachineGunRubber
# insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
# ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
# priority: 2
# whitelist:
# tags:
# - MagazineMagnumSubMachineGun
# gun_chamber:
# name: Chamber
# startingItem: CartridgeMagnumRubber
# priority: 1
# whitelist:
# tags:
# - CartridgeMagnum
3 changes: 3 additions & 0 deletions Resources/Prototypes/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -890,6 +890,9 @@
- type: Tag
id: MagazineHeavyRifleBox

- type: Tag
id: MagazineBoxRifleMinigun

- type: Tag
id: MagazineLightRifle

Expand Down
Loading