diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 83a8424a8f..5ba09ddb3b 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -127,7 +127,7 @@ - type: Sprite sprite: Clothing/Back/Backpacks/ertleader.rsi - type: Storage - capacity: 200 + capacity: 250 - type: entity parent: ClothingBackpackERTLeader diff --git a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml index b0a75851c1..27546e4c58 100644 --- a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml +++ b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml @@ -10,8 +10,7 @@ - Debug - type: Sprite sprite: Objects/Weapons/Guns/Pistols/debug.rsi - - type: Item - size: 1 + - type: Clothing sprite: Objects/Weapons/Guns/Pistols/debug.rsi - type: Gun fireRate: 100 diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml index 6bd0a50882..cd4f87dbcf 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml @@ -166,8 +166,7 @@ sprite: Objects/Tanks/Jetpacks/mini.rsi slots: - Back - - type: Item - size: 50 + - suitStorage # Filled mini - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index b1c93c789d..6fab383889 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -7,6 +7,12 @@ netsync: false - type: Item size: 50 + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: AmmoCounter - type: Gun fireRate: 2 @@ -29,8 +35,12 @@ parent: BaseWeaponBattery abstract: true components: - - type: Item + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/taser.rsi size: 10 + quickEquip: false + slots: + - Belt - type: entity name: retro laser gun @@ -46,8 +56,6 @@ - state: mag-unshaded-4 map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - - type: Item - sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi - type: HitscanBatteryAmmoProvider proto: RedLaser fireCost: 62.5 @@ -71,7 +79,7 @@ - state: mag-unshaded-4 map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Battery/makeshift.rsi - type: HitscanBatteryAmmoProvider proto: RedLaser @@ -94,7 +102,7 @@ - state: mag-unshaded-4 map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi - type: Gun selectedMode: SemiAuto @@ -118,7 +126,7 @@ - state: mag-unshaded-4 map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Battery/pulse_pistol.rsi - type: Gun selectedMode: SemiAuto @@ -147,7 +155,7 @@ - state: mag-unshaded-4 map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Battery/pulse_carbine.rsi - type: Gun selectedMode: SemiAuto @@ -178,7 +186,7 @@ - state: mag-unshaded-4 map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Battery/pulse_rifle.rsi - type: Gun fireRate: 1.5 @@ -205,7 +213,7 @@ - state: mag-unshaded-4 map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi - type: Gun fireRate: 1.5 @@ -229,7 +237,7 @@ - state: mag-unshaded-0 map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Battery/xray.rsi - type: Gun soundGunshot: @@ -245,7 +253,7 @@ - type: entity name: disabler - parent: BaseWeaponBattery + parent: BaseWeaponBatterySmall id: WeaponDisabler description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. components: @@ -260,8 +268,6 @@ - state: mag-unshaded-0 map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - - type: Item - size: 10 - type: Clothing quickEquip: false slots: @@ -281,7 +287,7 @@ - type: entity name: taser - parent: BaseWeaponBattery + parent: BaseWeaponBatterySmall id: WeaponTaser description: A low-capacity, energy-based stun gun used by security teams to subdue targets at range. # Use Disabler @@ -298,8 +304,6 @@ - state: mag-unshaded-0 map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - - type: Item - size: 10 - type: Clothing quickEquip: false slots: @@ -331,7 +335,7 @@ - state: mag-unshaded-4 map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi - type: Gun soundGunshot: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index 856f1367b0..89bda8748b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -9,6 +9,11 @@ netsync: false - type: Item size: 60 + - type: Clothing + sprite: Objects/Weapons/Guns/LMGs/l6.rsi + quickEquip: false + slots: + - Back - type: Gun minAngle: 4 maxAngle: 20 @@ -60,8 +65,6 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-3 map: ["enum.GunVisualLayers.Mag"] - - type: Item - sprite: Objects/Weapons/Guns/LMGs/l6.rsi - type: MagazineVisuals magState: mag steps: 4 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index e7a299f892..a548a16ffc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -7,6 +7,11 @@ components: - type: Sprite netsync: false + - type: Clothing + sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + quickEquip: false + slots: + - Back - type: Item size: 60 @@ -21,7 +26,7 @@ layers: - state: icon map: ["enum.GunVisualLayers.Base"] - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - type: Gun fireRate: 1 @@ -53,7 +58,7 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Launchers/rocket.rsi - type: Gun fireRate: 0.5 @@ -86,7 +91,7 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Launchers/rocket.rsi - type: Gun fireRate: 6 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index c94019faed..ef57db9612 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -14,6 +14,12 @@ map: ["enum.GunVisualLayers.Mag"] - type: Item size: 10 + - type: Clothing + sprite: Objects/Weapons/Guns/Pistols/viper.rsi + quickEquip: false + slots: + - suitStorage + - Belt - type: Gun fireRate: 6 selectedMode: SemiAuto @@ -58,8 +64,6 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Pistols/viper.rsi - - type: Item - sprite: Objects/Weapons/Guns/Pistols/viper.rsi - type: ItemSlots slots: gun_magazine: @@ -95,7 +99,7 @@ layers: - state: base map: ["enum.GunVisualLayers.Base"] - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Pistols/hm_pistol.rsi - type: Gun selectedMode: SemiAuto @@ -115,7 +119,7 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Pistols/cobra.rsi - type: Gun fireRate: 4 @@ -157,7 +161,7 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Pistols/mk58.rsi - type: Gun fireRate: 5 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 5418ecb364..c75774b43f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -10,6 +10,12 @@ state: icon - type: Item size: 10 + - type: Clothing + sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi + quickEquip: false + slots: + - suitStorage + - Belt - type: Gun selectedMode: SemiAuto fireRate: 1.5 @@ -47,8 +53,6 @@ - state: mag-unshaded-3 map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - - type: Item - sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi - type: RevolverAmmoProvider capacity: 5 chambers: [ True, True, True, True, True ] @@ -67,7 +71,7 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi - type: RevolverAmmoProvider capacity: 6 @@ -82,7 +86,7 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi - type: Gun soundGunshot: @@ -96,7 +100,7 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/python.rsi - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Revolvers/python.rsi - type: entity @@ -107,7 +111,7 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi - type: Gun fireRate: 1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 510e532bd9..07a1dd29e7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -9,6 +9,12 @@ netsync: false - type: Item size: 50 + - type: Clothing + sprite: Objects/Weapons/Guns/Rifles/ak.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: AmmoCounter - type: Gun fireRate: 5 @@ -54,8 +60,6 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - - type: Item - sprite: Objects/Weapons/Guns/Rifles/ak.rsi - type: Gun fireRate: 5 soundGunshot: @@ -102,7 +106,7 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Rifles/carbine.rsi - type: ItemSlots slots: @@ -145,7 +149,7 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Rifles/lecter.rsi - type: Gun soundGunshot: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 15f8d052b9..e2e7ac857e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -9,6 +9,12 @@ netsync: false - type: Item size: 30 + - type: Clothing + sprite: Objects/Weapons/Guns/SMGs/atreides.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: AmmoCounter - type: Gun minAngle: 2 @@ -57,8 +63,6 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - - type: Item - sprite: Objects/Weapons/Guns/SMGs/atreides.rsi - type: Gun fireRate: 10 soundGunshot: @@ -82,7 +86,7 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/SMGs/c20r.rsi - type: Gun soundGunshot: @@ -108,7 +112,7 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/SMGs/vector.rsi - type: Gun fireRate: 6 @@ -164,7 +168,7 @@ - state: mag-unshaded-0 map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/SMGs/wt550.rsi - type: Gun fireRate: 5 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 42d23af018..49b2710e90 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -13,6 +13,12 @@ - type: Item # If you update this also update the bulldog's size. size: 30 + - type: Clothing + sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: AmmoCounter - type: Gun fireRate: 2 @@ -53,8 +59,13 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Item - sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi size: 30 + - type: Clothing + sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Gun fireRate: 2 selectedMode: FullAuto @@ -94,8 +105,6 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi - - type: Item - sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi - type: Gun fireRate: 8 - type: BallisticAmmoProvider @@ -112,7 +121,7 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi - type: BallisticAmmoProvider @@ -124,7 +133,7 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/pump.rsi - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Shotguns/pump.rsi - type: BallisticAmmoProvider capacity: 4 @@ -137,9 +146,10 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi + - type: Clothing + sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi - type: Item size: 10 - sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi - type: Gun fireRate: 4 - type: BallisticAmmoProvider diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 6baa1e83cd..c2a9502503 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -11,7 +11,12 @@ - state: base map: ["enum.GunVisualLayers.Base"] - type: Item - size: 30 + size: 50 + - type: Clothing + sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi + quickEquip: false + slots: + - Back - type: AmmoCounter - type: Gun fireRate: 1 @@ -40,8 +45,6 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi - - type: Item - sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi - type: entity name: Hristov @@ -51,7 +54,7 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi - - type: Item + - type: Clothing sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi - type: BallisticAmmoProvider whitelist: @@ -68,7 +71,8 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Snipers/musket.rsi - - type: Item + - type: Clothing + icon: Objects/Weapons/Guns/Snipers/musket.rsi - type: Gun selectedMode: SemiAuto availableModes: @@ -86,12 +90,13 @@ id: WeaponPistolFlintlock description: A pirate's companion. Yarrr! components: - - type: Sprite - sprite: Objects/Weapons/Guns/Snipers/flintlock.rsi - - type: Item - - type: BallisticAmmoProvider - whitelist: - tags: - - CartridgeAntiMaterial - capacity: 1 - proto: CartridgeAntiMaterial + - type: Sprite + sprite: Objects/Weapons/Guns/Snipers/flintlock.rsi + - type: Clothing + icon: Objects/Weapons/Guns/Snipers/flintlock.rsi + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgeAntiMaterial + capacity: 1 + proto: CartridgeAntiMaterial diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml index 2f7cc0ffd6..57d5d19059 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml @@ -14,8 +14,12 @@ map: [ "enum.PneumaticCannonVisualLayers.Tank" ] visible: false - type: Item - size: 40 + size: 50 + - type: Clothing sprite: Objects/Weapons/Guns/Cannons/pneumatic_cannon.rsi + quickEquip: false + slots: + - Back - type: PneumaticCannon - type: Storage # todo mirror pneum replace with ecs/evnts @@ -51,4 +55,8 @@ fireInterval: 0.4 - type: Item size: 50 + - type: Clothing sprite: Objects/Weapons/Guns/Cannons/pie_cannon.rsi + quickEquip: false + slots: + - Back diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..aff8583f5e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json index c49e5d7013..eb436502d5 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json @@ -1,69 +1,73 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e, backpack sprite by Peptide", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-unshaded-1" - }, - { - "name": "mag-unshaded-2" - }, - { - "name": "mag-unshaded-3" - }, - { - "name": "mag-unshaded-4" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "0-inhand-left", - "directions": 4 - }, - { - "name": "0-inhand-right", - "directions": 4 - }, - { - "name": "25-inhand-left", - "directions": 4 - }, - { - "name": "25-inhand-right", - "directions": 4 - }, - { - "name": "50-inhand-left", - "directions": 4 - }, - { - "name": "50-inhand-right", - "directions": 4 - }, - { - "name": "75-inhand-left", - "directions": 4 - }, - { - "name": "75-inhand-right", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "0-inhand-left", + "directions": 4 + }, + { + "name": "0-inhand-right", + "directions": 4 + }, + { + "name": "25-inhand-left", + "directions": 4 + }, + { + "name": "25-inhand-right", + "directions": 4 + }, + { + "name": "50-inhand-left", + "directions": 4 + }, + { + "name": "50-inhand-right", + "directions": 4 + }, + { + "name": "75-inhand-left", + "directions": 4 + }, + { + "name": "75-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..b2c3f009b3 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json index da85b7e10f..f96746633c 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json @@ -1,37 +1,41 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/9ded73fb85b9106d6bbf1c9a34d1d2fa27ee0e2e", + "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/9ded73fb85b9106d6bbf1c9a34d1d2fa27ee0e2e, backpack sprite by Peptide", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-unshaded-1" - }, - { - "name": "mag-unshaded-2" - }, - { - "name": "mag-unshaded-3" - }, - { - "name": "mag-unshaded-4" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..64ba5562e4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json index 1f744f41fa..664fb7a447 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json @@ -1,37 +1,41 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b6831dab1e1a74c0d91f2229adb87abbb089d31", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b6831dab1e1a74c0d91f2229adb87abbb089d31, backpack sprite by Peptide", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-unshaded-1" - }, - { - "name": "mag-unshaded-2" - }, - { - "name": "mag-unshaded-3" - }, - { - "name": "mag-unshaded-4" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..a3a64a1b00 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json index eafe3e519b..ea9289cea4 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json @@ -1,37 +1,41 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2 backpack sprite by Peptide (copy of pulse rifle)", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-unshaded-1" - }, - { - "name": "mag-unshaded-2" - }, - { - "name": "mag-unshaded-3" - }, - { - "name": "mag-unshaded-4" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..a3a64a1b00 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json index eafe3e519b..dbe738ae80 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json @@ -1,37 +1,41 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2, backpack sprite by Peptide", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-unshaded-1" - }, - { - "name": "mag-unshaded-2" - }, - { - "name": "mag-unshaded-3" - }, - { - "name": "mag-unshaded-4" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..04c21a5440 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json index 21ac937d8c..c8609f2152 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/167a810bc8534a56c74ffa8f1373acd3b1ac70ee/icons/obj/guns/energy/xray.dmi", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/167a810bc8534a56c74ffa8f1373acd3b1ac70ee/icons/obj/guns/energy/xray.dmi, backpack sprite by peptide", "size": { "x": 32, "y": 32 @@ -41,6 +41,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Cannons/pie_cannon.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Cannons/pie_cannon.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..77cbcee447 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Cannons/pie_cannon.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Cannons/pie_cannon.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Cannons/pie_cannon.rsi/meta.json index 5942c0e664..0ecd199786 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Cannons/pie_cannon.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Cannons/pie_cannon.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation at dc9cef40447ee86c2b9fff9f690385cd63b655fa", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation at dc9cef40447ee86c2b9fff9f690385cd63b655fa, backpack sprite by peptide", "size": { "x": 32, "y": 32 @@ -17,6 +17,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Cannons/pneumatic_cannon.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Cannons/pneumatic_cannon.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..322aa6a719 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Cannons/pneumatic_cannon.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Cannons/pneumatic_cannon.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Cannons/pneumatic_cannon.rsi/meta.json index 3aa08b8390..38b327f302 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Cannons/pneumatic_cannon.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Cannons/pneumatic_cannon.rsi/meta.json @@ -1 +1,29 @@ -{"version":1,"name":1,"size":{"x":32,"y":32},"states":[{"name":"pneumaticCannon","directions":1},{"name":"oxygen","directions":1},{"name":"inhand-left","directions":4},{"name":"inhand-right","directions":4}],"license":"CC-BY-SA-3.0","copyright":"tgstation at b2e5316993806b1524ab81237b1735b0591df2a2"} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation at b2e5316993806b1524ab81237b1735b0591df2a2, backpack sprite by peptide", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "pneumaticCannon" + }, + { + "name": "oxygen" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..8d2be6b881 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json index 7f39743823..f8b08e1684 100644 --- a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/lmg.dmi", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/lmg.dmi, backpack sprite by Peptide", "size": { "x": 32, "y": 32 @@ -32,6 +32,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..30a5475a42 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json index 6cf1e1f91b..dcdbc31205 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json @@ -1,22 +1,26 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..f8458af21e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json index 606cfe0db1..bbc0335401 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json @@ -1,36 +1,40 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/21818/commits/8959238828600d01ee7c8165a0dd29007570a454", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/21818/commits/8959238828600d01ee7c8165a0dd29007570a454, backpack sprite by Peptide", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "base" - }, - { - "name": "mag-0" - }, - { - "name": "mag-1" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "rocket0-inhand-left", - "directions": 4 - }, - { - "name": "rocket0-inhand-right", - "directions": 4 - } + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "mag-1" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rocket0-inhand-left", + "directions": 4 + }, + { + "name": "rocket0-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..38a0117dc5 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json index 24bb58570e..abe046d46b 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide", "size": { "x": 32, "y": 32 @@ -23,6 +23,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..ea6b63ddf8 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json index c98adde97d..596211bc7f 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json @@ -1,28 +1,32 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/ff87150c3dfc387c46db7d1c956abf19ddff7819", + "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/ff87150c3dfc387c46db7d1c956abf19ddff7819, backpack sprite by Peptide", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..ea6b63ddf8 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json index 4c54091b28..a692bda3d4 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json @@ -1,28 +1,32 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, backpack sprite by Peptide (copy of carbine)", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..f8731ca83f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json index 73c8dcc1cc..0c845e1aeb 100644 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json @@ -1,31 +1,35 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/58c39351887ee7f3793d96fafa28238ff693756f", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/58c39351887ee7f3793d96fafa28238ff693756f, equipped-BACKPACK modified by Peptide", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-0" - }, - { - "name": "suppressor" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "suppressor" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..fec8e07503 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json index f4afb59d03..46fe76f054 100644 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json @@ -1,46 +1,50 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41804/commits/1baf679a544505960cebd071425f1df60669cdf3", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41804/commits/1baf679a544505960cebd071425f1df60669cdf3, backpack sprite by Peptide", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-0" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - }, - { - "name": "mag-5" - }, - { - "name": "suppressor" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + }, + { + "name": "suppressor" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..f8731ca83f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json index 5b44edf0ea..22283782c5 100644 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json @@ -1,28 +1,32 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified vgtation at https://github.com/vgstation-coders/vgstation13/pull/20330/commits/1604c9cc61a48585e25b5f9eba3e179c06362372", + "copyright": "Taken/modified vgtation at https://github.com/vgstation-coders/vgstation13/pull/20330/commits/1604c9cc61a48585e25b5f9eba3e179c06362372, backpack sprite by Peptide (copy of Atreides)", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..f8731ca83f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json index b4165b3b6c..3e95b07d24 100644 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide (copy of Atreides)", "size": { "x": 32, "y": 32 @@ -143,6 +143,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..a18a000811 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json index ce870cea6b..3358222de3 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json @@ -1,28 +1,32 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b6831dab1e1a74c0d91f2229adb87abbb089d31", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b6831dab1e1a74c0d91f2229adb87abbb089d31, backpack sprite by Peptide", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..a08fd64d65 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json index 303d040d10..d8c7b224b9 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json @@ -1,22 +1,26 @@ { "version": 1, "license": "CC-BY-NC-4.0", - "copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8", + "copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8, backpack sprite by Peptide", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..a18a000811 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json index db87c274ff..840b7790ff 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json @@ -1,22 +1,26 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/27557/commits", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/27557/commits, backpack sprite by Peptide (copy of bulldog)", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..a08fd64d65 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json index 303d040d10..c885742cc1 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json @@ -1,22 +1,26 @@ { "version": 1, "license": "CC-BY-NC-4.0", - "copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8", + "copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8backpack, backpack sprite by Peptide (copy of db)", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..8e00734a49 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json index 303d040d10..d8c7b224b9 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json @@ -1,22 +1,26 @@ { "version": 1, "license": "CC-BY-NC-4.0", - "copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8", + "copyright": "Taken from TerraGov Marine Corps at https://github.com/tgstation/TerraGov-Marine-Corps/pull/7678/commits/e7bc17b894aa4c1f882358016346c3be00236df8, backpack sprite by Peptide", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..56d7dc39a7 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-BACKPACK.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 a79ecc2823..472ddd4096 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 @@ -17,6 +17,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..ac0c7e5ac8 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json index a6f5a3df3f..9b2d3c4dac 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json @@ -1,22 +1,26 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/heavysniper.dmi", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/heavysniper.dmi, back modified by peptide", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "base" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } + { + "name": "base" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] }