diff --git a/Resources/Audio/_Harmony/Weapons/Guns/MagIn/Clip Insertion.wav b/Resources/Audio/_Harmony/Weapons/Guns/MagIn/Clip Insertion.wav new file mode 100644 index 000000000000..67df2a4681d7 Binary files /dev/null and b/Resources/Audio/_Harmony/Weapons/Guns/MagIn/Clip Insertion.wav differ diff --git a/Resources/Audio/_Harmony/Weapons/Guns/MagIn/attributions.yml b/Resources/Audio/_Harmony/Weapons/Guns/MagIn/attributions.yml new file mode 100644 index 000000000000..ef278fb45c26 --- /dev/null +++ b/Resources/Audio/_Harmony/Weapons/Guns/MagIn/attributions.yml @@ -0,0 +1,4 @@ +- files: ["Clip Insertion.wav"] + license: "CC-BY-SA-3.0" + copyright: "Created by Nonagon44 for Space Station 14" + source: "https://github.com/Nonagon44" diff --git a/Resources/Audio/_Harmony/Weapons/Guns/MagOut/M1_Garand_Ping.wav b/Resources/Audio/_Harmony/Weapons/Guns/MagOut/M1_Garand_Ping.wav new file mode 100644 index 000000000000..49d8382125e7 Binary files /dev/null and b/Resources/Audio/_Harmony/Weapons/Guns/MagOut/M1_Garand_Ping.wav differ diff --git a/Resources/Audio/_Harmony/Weapons/Guns/MagOut/attributions.yml b/Resources/Audio/_Harmony/Weapons/Guns/MagOut/attributions.yml new file mode 100644 index 000000000000..66395513eba4 --- /dev/null +++ b/Resources/Audio/_Harmony/Weapons/Guns/MagOut/attributions.yml @@ -0,0 +1,4 @@ +- files: ["M1_Garand_Ping.wav", "garand-ping-rattle.wav", "garand-ping-short.wav"] + license: "CC-BY-SA-3.0" + copyright: "Created by Nonagon44 for Space Station 14" + source: "https://github.com/Nonagon44" diff --git a/Resources/Audio/_Harmony/Weapons/Guns/MagOut/garand-ping-rattle.wav b/Resources/Audio/_Harmony/Weapons/Guns/MagOut/garand-ping-rattle.wav new file mode 100644 index 000000000000..531e98bd1e23 Binary files /dev/null and b/Resources/Audio/_Harmony/Weapons/Guns/MagOut/garand-ping-rattle.wav differ diff --git a/Resources/Audio/_Harmony/Weapons/Guns/MagOut/garand-ping-short.wav b/Resources/Audio/_Harmony/Weapons/Guns/MagOut/garand-ping-short.wav new file mode 100644 index 000000000000..6afd613bdf83 Binary files /dev/null and b/Resources/Audio/_Harmony/Weapons/Guns/MagOut/garand-ping-short.wav differ diff --git a/Resources/Prototypes/_Harmony/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/_Harmony/Catalog/Fills/Crates/armory.yml index 61393a57cc0a..0dfbbbbaa01a 100644 --- a/Resources/Prototypes/_Harmony/Catalog/Fills/Crates/armory.yml +++ b/Resources/Prototypes/_Harmony/Catalog/Fills/Crates/armory.yml @@ -4,6 +4,10 @@ name: bolt-action rifle crate description: Contains several high-powered, bolt-action rifles with sufficient ammunition. Packaging is questionable, your mileage will vary. Requires Armory, Security or Supply access to open. components: + - type: Icon + sprite: _Harmony/Structures/Storage/Crates/old_wooden_crate.rsi + - type: Sprite + sprite: _Harmony/Structures/Storage/Crates/old_wooden_crate.rsi - type: EntityStorage capacity: 50 - type: AccessReader diff --git a/Resources/Prototypes/_Harmony/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_Harmony/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index a259d2f6c670..b5dc9fc38b77 100644 --- a/Resources/Prototypes/_Harmony/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/_Harmony/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -1,16 +1,57 @@ - type: entity name: RSC Modèle 1917 - parent: [BaseWeaponSniper, BaseGunWieldable, BaseMajorContraband] + parent: [BaseItem, BaseGunWieldable, BaseMajorContraband] id: WeaponSniperRSC description: Refurbished great war trophy. It used to bear a french name, now it bears Nanotrasen stamp of approval. Uses .30 rifle ammo. + abstract: false components: + - type: Item + size: Huge - type: Sprite sprite: _Harmony/Objects/Weapons/Guns/Snipers/rsc-m1917.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] - type: Clothing sprite: _Harmony/Objects/Weapons/Guns/Snipers/rsc-m1917.rsi quickEquip: false slots: - Back - suitStorage + - type: AmmoCounter + - type: Gun + fireRate: 0.75 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/sniper.ogg + - type: ChamberMagazineAmmoProvider + autoEject: true + soundAutoEject: /Audio/_Harmony/Weapons/Guns/MagOut/garand-ping-rattle.wav + soundRack: + path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_Harmony/Weapons/Guns/MagIn/Clip Insertion.wav + ejectSound: /Audio/_Harmony/Weapons/Guns/MagOut/garand-ping-short.wav + priority: 2 + whitelist: + tags: + - SpeedLoaderRifle + whitelistFailPopup: gun-magazine-whitelist-fail + gun_chamber: + name: Chamber + priority: 1 + whitelist: + tags: + - CartridgeLightRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: Appearance - type: StaticPrice price: 400 diff --git a/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/base.png b/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/base.png new file mode 100644 index 000000000000..be36280cde79 Binary files /dev/null and b/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/base.png differ diff --git a/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/closed.png b/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/closed.png new file mode 100644 index 000000000000..a18419a822be Binary files /dev/null and b/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/closed.png differ diff --git a/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/icon.png b/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/icon.png new file mode 100644 index 000000000000..f6676724477f Binary files /dev/null and b/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/icon.png differ diff --git a/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/locked.png b/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/locked.png new file mode 100644 index 000000000000..174d3c873463 Binary files /dev/null and b/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/locked.png differ diff --git a/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/meta.json b/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/meta.json new file mode 100644 index 000000000000..5c385b5c7a23 --- /dev/null +++ b/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by thesaladmancer on Discord / Twitter", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "welded" + }, + { + "name": "locked" + }, + { + "name": "unlocked" + } + ] +} diff --git a/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/open.png b/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/open.png new file mode 100644 index 000000000000..d2a2d7adf73d Binary files /dev/null and b/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/open.png differ diff --git a/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/unlocked.png b/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/unlocked.png new file mode 100644 index 000000000000..41fc44010081 Binary files /dev/null and b/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/unlocked.png differ diff --git a/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/welded.png b/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/welded.png new file mode 100644 index 000000000000..311739a2701d Binary files /dev/null and b/Resources/Textures/_Harmony/Structures/Storage/Crates/old_wooden_crate.rsi/welded.png differ