diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 56d04b0c157..679436ebdfe 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -447,5 +447,5 @@ storagebase: !type:AllSelector children: - id: WeaponShotgunHushpup - - id: BoxLethalshot + - id: BoxShellCaseless # DeltaV switched default to caseless shells - id: TreasureCoinIron diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 21ff848526b..1218e9826f6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -313,6 +313,7 @@ - 0,0,3,0 # smaller than BaseShotgun by 1 tile - type: BallisticAmmoProvider capacity: 4 + proto: ShellShotgunCaseless # DeltaV - Use caseless shells - type: GunRequiresWield - type: Gun soundGunshot: diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml index 34ed18191fb..a7c4d05b301 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml @@ -6,3 +6,20 @@ components: - type: BallisticAmmoProvider proto: ShellSoulbreaker + +- type: entity + parent: AmmoProviderShotgunShell + id: BoxShellCaseless + name: ammunition box (.50 caseless) + description: A box full of caseless shotgun cartridges, designed to leave no trace behind. + components: + - type: BallisticAmmoProvider + proto: ShellShotgunCaseless + - type: Sprite + sprite: _DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + - state: caseless diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml new file mode 100644 index 00000000000..455fc6d68d2 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -0,0 +1,14 @@ +- type: entity + parent: [ ShellShotgun ] + id: ShellShotgunCaseless + name: caseless shell (.50 pellet) + description: An advanced caseless cartridge used by most modern shotguns. Leaves no trace behind while firing standard kinetic ammunition. + components: + - type: CartridgeAmmo + proto: PelletShotgunSpread + deleteOnSpawn: true + - type: Sprite + sprite: _DV/Objects/Weapons/Guns/Ammunition/Casings/caseless_shotgun_shell.rsi + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png new file mode 100644 index 00000000000..f460615079d Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/caseless.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/caseless.png new file mode 100644 index 00000000000..62deacbd2b6 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/caseless.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png new file mode 100644 index 00000000000..d77e6507b00 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-2.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-2.png new file mode 100644 index 00000000000..eaff18cf288 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-2.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-3.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-3.png new file mode 100644 index 00000000000..1563f21fe71 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-3.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-4.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-4.png new file mode 100644 index 00000000000..9a3c99707fe Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-4.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json new file mode 100644 index 00000000000..0343f6528a1 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/space-wizards/space-station-14/commit/af3593a3b7c2a36b0e0c4a19cc846e96f139fb58 with sprites by SpaceRox1244, edited by Carol", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "caseless" + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Casings/caseless_shotgun_shell.rsi/base-spent.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Casings/caseless_shotgun_shell.rsi/base-spent.png new file mode 100644 index 00000000000..caff321cd78 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Casings/caseless_shotgun_shell.rsi/base-spent.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Casings/caseless_shotgun_shell.rsi/base.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Casings/caseless_shotgun_shell.rsi/base.png new file mode 100644 index 00000000000..0f67971d9da Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Casings/caseless_shotgun_shell.rsi/base.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Casings/caseless_shotgun_shell.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Casings/caseless_shotgun_shell.rsi/meta.json new file mode 100644 index 00000000000..1bf47d72733 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Casings/caseless_shotgun_shell.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi, modified by Carol", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "base-spent" + } + ] +}