From: RedBookcase Date: Tue, 15 Jul 2025 00:49:27 +0000 (-0700) Subject: Made the Mosin bayonet usable. (#38295) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=34cc49ccf01b06ca00edfb1d7ed8ef71a8c94dfa;p=space-station-14.git Made the Mosin bayonet usable. (#38295) * Made mosin an alt-melee weapon, added reagent fill for the weapon. * fixes --------- Co-authored-by: RedBookcase Co-authored-by: beck-thompson --- diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 5514db42e6..655f866f77 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -46,6 +46,45 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi + layers: + - state: base + - state: base1 + map: [ "enum.SolutionContainerLayers.Fill" ] + visible: false + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 1 + fillBaseName: base + inHandsFillBaseName: -fill- + inHandsMaxFillLevels: 1 + equippedFillBaseName: -fill- + equippedMaxFillLevels: 1 + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Piercing: 12 + angle: 0 + animation: WeaponArcThrust + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: MeleeRequiresWield + - type: AltFireMelee + attackType: Heavy + - type: SolutionContainerManager + solutions: + melee: + maxVol: 2 + - type: MeleeChemicalInjector + solution: melee + - type: RefillableSolution + solution: melee + - type: InjectableSolution + solution: melee + - type: SolutionTransfer + maxTransferAmount: 2 + - type: Sharp + butcherDelayModifier: 2 #It's a bayonet - type: GunRequiresWield - type: StaticPrice price: 500 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/base1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/base1.png new file mode 100644 index 0000000000..eeab79f154 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/base1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-backpack-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-backpack-fill-1.png new file mode 100644 index 0000000000..416958f47a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-backpack-fill-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-suitstorage-fill-1.png new file mode 100644 index 0000000000..416958f47a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-suitstorage-fill-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..fd742402be Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..cce29feaca Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json index e4f1ef8dd8..c9436ead7b 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244", + "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244. Reagent fill sprites by RedBookcase on Github.", "size": { "x": 32, "y": 32 @@ -10,6 +10,9 @@ { "name": "base" }, + { + "name": "base1" + }, { "name": "bolt-open" }, @@ -17,25 +20,49 @@ "name": "inhand-left", "directions": 4 }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, { "name": "inhand-right", "directions": 4 }, + { + "name": "inhand-right-fill-1", + "directions": 4 + }, { "name": "wielded-inhand-left", "directions": 4 }, + { + "name": "wielded-inhand-left-fill-1", + "directions": 4 + }, { "name": "wielded-inhand-right", "directions": 4 }, + { + "name": "wielded-inhand-right-fill-1", + "directions": 4 + }, { "name": "equipped-BACKPACK", "directions": 4 }, + { + "name": "equipped-backpack-fill-1", + "directions": 4 + }, { "name": "equipped-SUITSTORAGE", "directions": 4 + }, + { + "name": "equipped-suitstorage-fill-1", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-left-fill-1.png new file mode 100644 index 0000000000..c2e86175da Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right-fill-1.png new file mode 100644 index 0000000000..2f37e17487 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right-fill-1.png differ