diff --git a/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg b/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg new file mode 100644 index 00000000000..39ceccdf4a1 Binary files /dev/null and b/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg differ diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml new file mode 100644 index 00000000000..42788c31739 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -0,0 +1,81 @@ +- type: entity + name: Mk32 "Universal" + parent: [BaseWeaponPistol, BaseC1Contraband] + id: WeaponPistolUniversal + description: The Mark 32 Offensive Handgun, produced by NanoTrasen's Small Arms Division. Uses .45 magnum ammo. # DeltaV - update Mk32 + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi + - type: Gun + fireRate: 3 + availableModes: + - SemiAuto + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistol + insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + priority: 2 + whitelist: + tags: + - MagazinePistol + gun_chamber: + name: Chamber + startingItem: CartridgePistol + priority: 1 + whitelist: + tags: + - CartridgePistol + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + +- type: entity + name: pollock + parent: [BaseWeaponPistol, BaseC1Contraband] + id: WeaponPistolPollock + description: A compact and mass-produced combat pistol. Uses .35 auto ammo. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi + - type: Gun + fireRate: 5 + availableModes: + - SemiAuto + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistol + insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + priority: 2 + whitelist: + tags: + - MagazinePistol + - MagazinePistolHighCapacity + gun_chamber: + name: Chamber + startingItem: CartridgePistol + priority: 1 + whitelist: + tags: + - CartridgePistol + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: StaticPrice + price: 500 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml new file mode 100644 index 00000000000..fbdac7fa740 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -0,0 +1,67 @@ +- type: entity + name: fitz special + parent: [BaseWeaponRevolver, BaseC1Contraband] + id: WeaponRevolverFitz + description: A compact and concealable self defence snub revolver. Uses .38 special ammo. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi + - type: Gun + selectedMode: SemiAuto + fireRate: 1.75 + availableModes: + - SemiAuto + - type: RevolverAmmoProvider + proto: CartridgeMagnum + capacity: 6 + chambers: [ True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null ] + - type: StaticPrice + price: 340 + +- type: entity + name: faith + parent: [BaseWeaponRevolver, BaseC1Contraband] + id: WeaponRevolverFaith + description: Delivers blessings in bullet form. Uses .38 special ammo. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi + - type: Gun + selectedMode: SemiAuto + fireRate: 1.5 + availableModes: + - SemiAuto + - type: RevolverAmmoProvider + proto: CartridgeMagnum + capacity: 4 + chambers: [ True, True, True, True ] + ammoSlots: [ null, null, null, null ] + - type: StaticPrice + price: 240 + +- type: entity + name: lucky 37 + parent: [BaseWeaponRevolver, BaseC1Contraband] + id: WeaponRevolverLucky + description: Luck always beats skill, ya weasel. Uses .38 special ammo. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi + - type: Gun + selectedMode: SemiAuto + fireRate: 2 + availableModes: + - SemiAuto + proto: CartridgeMagnum + capacity: 6 + chambers: [ True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null ] + - type: StaticPrice + price: 750 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml new file mode 100644 index 00000000000..bc9582e147f --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -0,0 +1,141 @@ +- type: entity + name: vulcan + parent: [BaseWeaponRifle, BaseGunWieldable] + id: WeaponRifleVulcan + description: One of the heaviest small arms to grace Security's armory, this rifle is a modern take on a classic, informally dubbed the "Right Arm of the Free World". Uses .30 rifle ammo. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: GunWieldBonus + minAngle: -20 + maxAngle: -30 + - type: Gun + minAngle: 21 + maxAngle: 54 + angleIncrease: 6 + angleDecay: 24 + fireRate: 5 + selectedMode: SemiAuto + availableModes: + - SemiAuto + - FullAuto + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineLightRifle + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineLightRifle + gun_chamber: + name: Chamber + startingItem: CartridgeLightRifle + priority: 1 + whitelist: + tags: + - CartridgeLightRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi + - type: StaticPrice + price: 1300 + +- type: entity + name: ceremonial rifle + parent: [BaseWeaponSniper, BaseC2ExpeditionContraband] + id: WeaponSniperCeremonial + description: A ceremonial variant of the Mark 1 Rifle, in tasteful blue and white. Uses .30 rifle ammo. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi + - type: Gun + fireRate: 2 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg + - type: BallisticAmmoProvider + capacity: 5 + proto: CartridgeLightRifle + whitelist: + tags: + - CartridgeLightRifle + + +- type: entity + name: CAWS-25 Jackdaw + parent: [BaseWeaponRifle, BaseGunWieldable, BaseC3Contraband] + id: WeaponRifleJackdaw + description: The beginning of the end is heralded by the song of a Jackdaw. Uses .25 caseless ammo. + components: + - type: Item + size: Large + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Gun + minAngle: 2 + maxAngle: 6 + angleIncrease: 2 + angleDecay: 8 + fireRate: 8 + selectedMode: FullAuto + availableModes: + - SemiAuto + - FullAuto + soundGunshot: + path: /Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineCaselessRifle + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineCaselessRifle + gun_chamber: + name: Chamber + startingItem: CartridgeCaselessRifle + priority: 1 + whitelist: + tags: + - CartridgeCaselessRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml index a401a69b2d4..531773b2899 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml @@ -8,6 +8,10 @@ WeaponRifleNovaliteC1: 1 WeaponShotgunDoubleBarreled: 1 WeaponRevolverArgenti: 1 + WeaponPistolPollock: 3 + WeaponRifleVulcan: 3 + WeaponRevolverFitz: 3 + WeaponRevolverFaith: 3 BoxShotgunSlug: 1 BoxLethalshot: 1 BoxBeanbag: 1 @@ -35,6 +39,10 @@ WeaponRifleNovaliteC1: 4294967295 WeaponShotgunDoubleBarreled: 4294967295 WeaponRevolverArgenti: 4294967295 + WeaponPistolPollock: 4294967295 + WeaponRifleVulcan: 4294967295 + WeaponRevolverFitz: 4294967295 + WeaponRevolverFaith: 4294967295 BoxShotgunSlug: 4294967295 BoxLethalshot: 4294967295 BoxBeanbag: 4294967295 diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml index 74e5b6a271d..ef202d52356 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml @@ -59,6 +59,8 @@ #- WeaponCaseLongShotgunDoubleBarreledExpedition - WeaponCaseShortSawnExpedition - WeaponCaseLongMosinExpedition + - WeaponSniperCeremonial + - WeaponRevolverLucky chance: 1.0 offset: 0.0 rarePrototypes: @@ -325,6 +327,7 @@ - WeaponCaseHeavyAsmgtExpeditions - WeaponCaseLongEnforcerExpedition - WeaponCaseLongLaserCannonExpedition + - WeaponRifleJackdaw # Corvax-Frontier chance: 1.0 offset: 0.0 rarePrototypes: diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index 11b4cfedc97..b450482502d 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -669,6 +669,7 @@ ## Weapons - CombatKnife - WeaponLaserSvalinn # After the changes made to windows shouldn't be that much of an issue now if it's widely available + - WeaponPistolPollock - WeaponLaserPistolNF # After the changes made to windows shouldn't be that much of an issue now if it's widely available - WeaponRevolverArgenti - WeaponPistolMk58NF diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/security.yml b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml index 6375216d624..bc9710c3e3e 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml @@ -124,3 +124,13 @@ Glass: 5 Plasma: 10 Silver: 5 + +- type: latheRecipe + id: WeaponPistolPollock + result: WeaponPistolPollock + category: Weapons + completetime: 3 + materials: + Steel: 1000 + Plastic: 1200 + Plasteel: 1200 \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/base.png new file mode 100644 index 00000000000..81d70abe95b Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/bolt-open.png new file mode 100644 index 00000000000..e4d9a014865 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-BELT.png new file mode 100644 index 00000000000..52666b6192e Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/icon.png new file mode 100644 index 00000000000..8cfeb0987a5 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-left.png new file mode 100644 index 00000000000..7e1df839ce9 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-right.png new file mode 100644 index 00000000000..d0e8068dae6 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/mag-0.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/mag-0.png new file mode 100644 index 00000000000..a225b095d1f Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/mag-0.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/meta.json new file mode 100644 index 00000000000..984eb3b8680 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/base.png new file mode 100644 index 00000000000..84eb5da24be Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/bolt-open.png new file mode 100644 index 00000000000..85427c2ab73 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/equipped-BELT.png new file mode 100644 index 00000000000..d102816ef36 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..561b65c8a46 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/icon.png new file mode 100644 index 00000000000..df00b4ff7ad Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/inhand-left.png new file mode 100644 index 00000000000..9300e09c03c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/inhand-right.png new file mode 100644 index 00000000000..608315d7e3c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/mag-0.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/mag-0.png new file mode 100644 index 00000000000..918f5aaf0dc Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/mag-0.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/meta.json new file mode 100644 index 00000000000..40251545d35 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi/bolt-open.png new file mode 100644 index 00000000000..ead925a6a39 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi/equipped-BELT.png new file mode 100644 index 00000000000..a025c457ab1 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi/icon.png new file mode 100644 index 00000000000..dcc847bb3e8 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi/inhand-left.png new file mode 100644 index 00000000000..51f59ed1efa Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi/inhand-right.png new file mode 100644 index 00000000000..113b83b08cc Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi/meta.json new file mode 100644 index 00000000000..f8b192c7c90 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken and modified from https://github.com/BeeStation/BeeStation-Hornet/commit/063d95caba064383fb069190487e633d6c0bc556 | Further modified by Floofers", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "bolt-open" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi/bolt-open.png new file mode 100644 index 00000000000..69aea32f802 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi/equipped-BELT.png new file mode 100644 index 00000000000..13cea8c3a8b Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi/icon.png new file mode 100644 index 00000000000..ff765a7e99f Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi/inhand-left.png new file mode 100644 index 00000000000..a616fd9f013 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi/inhand-right.png new file mode 100644 index 00000000000..053f0597b0e Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi/meta.json new file mode 100644 index 00000000000..f8b192c7c90 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken and modified from https://github.com/BeeStation/BeeStation-Hornet/commit/063d95caba064383fb069190487e633d6c0bc556 | Further modified by Floofers", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "bolt-open" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi/bolt-open.png new file mode 100644 index 00000000000..24d4a957566 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi/equipped-BELT.png new file mode 100644 index 00000000000..ee0d41747a5 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi/icon.png new file mode 100644 index 00000000000..c1ea895e88f Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi/inhand-left.png new file mode 100644 index 00000000000..bbd805c4847 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi/inhand-right.png new file mode 100644 index 00000000000..ba722898dfc Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi/meta.json new file mode 100644 index 00000000000..fe4b90cb446 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken and modified from https://github.com/space-wizards/space-station-14/commit/7eec71dcfc25ff907e62a72e0f50c79a173f97fb | Further modified by Floofers", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "bolt-open" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi/base.png new file mode 100644 index 00000000000..6efb96be377 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..43769040513 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi/inhand-left.png new file mode 100644 index 00000000000..c3fb3fccdd5 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi/inhand-right.png new file mode 100644 index 00000000000..81973eb9a68 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi/meta.json new file mode 100644 index 00000000000..1a45371ba0f --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509. Modified by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/base.png new file mode 100644 index 00000000000..6f6e6c28535 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/bolt-open.png new file mode 100644 index 00000000000..23958df2463 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..1c90f37025c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/icon.png new file mode 100644 index 00000000000..14c83c8517c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/inhand-left.png new file mode 100644 index 00000000000..8f1a6d24846 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/inhand-right.png new file mode 100644 index 00000000000..6f4bc99c8a3 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/mag-0.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/mag-0.png new file mode 100644 index 00000000000..2b3836a5e80 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/mag-0.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/meta.json new file mode 100644 index 00000000000..f3e24a3ea29 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/base.png new file mode 100644 index 00000000000..a570e87127e Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/bolt-open.png new file mode 100644 index 00000000000..c73c70dd263 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..4193e2eb0cf Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/icon.png new file mode 100644 index 00000000000..804e5604e1c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/inhand-left.png new file mode 100644 index 00000000000..9a9a5276fb0 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/inhand-right.png new file mode 100644 index 00000000000..3c21d530456 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/mag-0.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/mag-0.png new file mode 100644 index 00000000000..b85fbe279a1 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/mag-0.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/meta.json new file mode 100644 index 00000000000..ba7ec0bc431 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "drawn by the kind @ squire_snake and hilarious Hyenh#6078 (313846233099927552) and @ 2013toyotacorolla", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} \ No newline at end of file