diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 22e81c09d9..3005e42992 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -130,6 +130,8 @@ fireRate: 3 soundGunshot: collection: m3 # Sunrise-Edit + - type: GunSpreadModifier # Sunrise-add #Port WZ #37731 + spread: 0.6 # Sunrise-add - type: BallisticAmmoProvider capacity: 2 - type: Construction @@ -220,6 +222,8 @@ fireRate: 3 soundGunshot: collection: m3 # Sunrise-Edit + - type: GunSpreadModifier # Sunrise-add #Port WZ #37731 + spread: 1.4 # Sunrise-add - type: BallisticAmmoProvider capacity: 2 - type: Construction diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 980986bbc0..8270c11974 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -1,6 +1,33 @@ +- type: entity + name: BaseWeaponShotgun + parent: BaseWeaponShotgun + id: BaseWeaponShotgunSunrise + description: A rooty tooty point and shooty. + abstract: true + components: + - type: Gun + fireRate: 2 + useKey: true + selectedMode: SemiAuto + - type: MeleeWeapon + angle: 60 + range: 1.1 + damage: + types: + Blunt: 12 + Structural: 8 + bluntStaminaDamageFactor: 2.0 + attackRate: 0.85 + autoAttack: false + - type: AltFireMelee + attackType: Heavy + - type: SpeedModifiedOnWield + walkModifier: 0.9 + sprintModifier: 0.9 + - type: entity name: XM1014 - parent: BaseWeaponShotgun + parent: BaseWeaponShotgunSunrise id: WeaponXM1014 components: - type: Sprite @@ -38,36 +65,39 @@ - type: Clothing sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/paladin-12/tiny.rsi - type: BallisticAmmoProvider - capacity: 5 + capacity: 6 soundRack: path: /Audio/_Sunrise/Weapons/Guns/Shotguns/Different/pump.ogg soundInsert: path: /Audio/_Sunrise/Weapons/Guns/Shotguns/Different/insert.ogg - type: Wieldable - type: UseDelay - delay: 0.5 + delay: 0.25 - type: GunRequiresWield - type: Gun - fireRate: 2.25 + fireRate: 2 soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/Shotguns/paladin_12/paladin12_shot.ogg params: volume: 1 + - type: SpeedModifiedOnWield + walkModifier: 0.95 + sprintModifier: 0.95 - type: entity name: Spas-12 - parent: BaseWeaponShotgun + parent: BaseWeaponShotgunSunrise id: WeaponShotgunSPAS12 components: - type: Sprite - sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/spas_12/big.rsi + sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi - type: Item size: Large shape: - 0,0,4,1 - sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/spas_12/tiny.rsi + sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi - type: Clothing - sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/spas_12/tiny.rsi + sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi - type: BallisticAmmoProvider capacity: 8 - type: Wieldable @@ -78,10 +108,13 @@ fireRate: 2 soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/Shotguns/spas_12/spas12_shot.ogg + - type: SpeedModifiedOnWield + walkModifier: 0.95 + sprintModifier: 0.95 - type: entity name: Trenchgun L-4034 - parent: BaseWeaponShotgun + parent: BaseWeaponShotgunSunrise id: WeaponShotgunTrenchgun4034 components: - type: Sprite @@ -107,7 +140,9 @@ delay: 0.5 - type: GunRequiresWield - type: Gun - fireRate: 1.25 + fireRate: 1 + - type: GunSpreadModifier + spread: 0.6 - type: Construction graph: ShotgunTrenchgun4034Sawn node: start @@ -120,6 +155,23 @@ components: - type: Sprite sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/trenchgun_l_4034_sawn/big.rsi + - type: Gun + fireRate: 1 + useKey: true + selectedMode: SemiAuto + - type: GunSpreadModifier + spread: 1.4 + - type: MeleeWeapon + angle: 60 + range: 1 + damage: + types: + Blunt: 8 + bluntStaminaDamageFactor: 2.0 + attackRate: 1 + autoAttack: false + - type: AltFireMelee + attackType: Light - type: Item size: Normal shape: @@ -128,7 +180,12 @@ - type: Clothing sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/trenchgun_l_4034_sawn/tiny.rsi - type: BallisticAmmoProvider - capacity: 4 + capacity: 5 + - type: UseDelay + delay: 0.25 + - type: SpeedModifiedOnWield + walkModifier: 0.95 + sprintModifier: 0.95 - type: Construction graph: ShotgunTrenchgun4034Sawn node: shotgun4034sawn @@ -169,3 +226,19 @@ - type: GunRequiresWield - type: Gun fireRate: 2 + - type: GunSpreadModifier + spread: 1.2 + - type: SpeedModifiedOnWield + walkModifier: 0.95 + sprintModifier: 0.95 + - type: MeleeWeapon + angle: 60 + range: 1 + damage: + types: + Blunt: 8 + bluntStaminaDamageFactor: 2.0 + attackRate: 1 + autoAttack: false + - type: AltFireMelee + attackType: Light diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/inhand-left.png new file mode 100644 index 0000000000..a8b1ad4af6 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/inhand-right.png new file mode 100644 index 0000000000..344dac0960 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/meta.json new file mode 100644 index 0000000000..b76345b58d --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "sprite wielded by KaiserMaus , original by unknown", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/wielded-inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..8df5062abf Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/wielded-inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..7261d8a55b Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..1b80e18866 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..1b80e18866 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/icon.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/icon.png new file mode 100644 index 0000000000..cf5bc097b3 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/meta.json new file mode 100644 index 0000000000..91d8658254 --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified vgstation at https://github.com/vgstation-coders/vgstation13/pull/20330/commits/1604c9cc61a48585e25b5f9eba3e179c06362372", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +}