diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 0922213bda..8a9c4badce 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -63,6 +63,23 @@ - UplinkWeapons saleLimit: 1 +- type: listing + id: UplinkMiniEbow + name: маленький энергетический арбалет + description: Довольно тихое оружие, которое автоматически перезаряжается и оглушает. Хорошо сочетается с другими видами оружия. + icon: { sprite: /Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi, state: icon } + productEntity: EnergyCrossbowMini + cost: + Telecrystal: 10 + categories: + - UplinkWeapons + conditions: + - !type:StoreWhitelistCondition + blacklist: + tags: + - NukeOpsUplink + saleLimit: 1 + - type: listing id: UplinkEsword name: uplink-esword-name diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/bolts.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/bolts.yml new file mode 100644 index 0000000000..f2dbf59b25 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/bolts.yml @@ -0,0 +1,20 @@ +- type: entity + name: energy crossbow bolt + id: BoltEnergyCrossbow + parent: BaseBullet + noSpawn: true + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/plasma.rsi + state: bullet + - type: Ammo + muzzleFlash: null + - type: Projectile + impactEffect: null + damage: + types: + Poison: 15 + - type: StunOnCollide + stunAmount: 2 + knockdownAmount: 2 + diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml new file mode 100644 index 0000000000..bb7ab800bb --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml @@ -0,0 +1,34 @@ +- type: entity + parent: BaseItem + id: EnergyCrossbowMini + name: маленький энергетический арбалет + description: Стреляет энергетическими болтами, которые отравляют и оглушают цель. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/mini-ebow.rsi + - type: Item + size: 10 + sprite: Objects/Weapons/Guns/Battery/mini-ebow.rsi + - type: Clothing + slots: + - Belt + - type: Gun + fireRate: 0.4 + soundGunshot: + path: /Audio/Weapons/click.ogg + - type: RechargeBasicEntityAmmo + rechargeCooldown: 2 + rechargeSound: + path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg + - type: BasicEntityAmmoProvider + proto: BoltEnergyCrossbow + capacity: 1 + count: 1 + - type: AmmoCounter + - type: GenericVisualizer + visuals: + enum.AmmoVisuals.HasAmmo: + base: + True: { state: icon } + False: { state: empty } + - type: Appearance diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/bolt.png b/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/bolt.png new file mode 100644 index 0000000000..70451918e4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/bolt.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/empty.png b/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/empty.png new file mode 100644 index 0000000000..799e188ec8 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/empty.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/icon.png new file mode 100644 index 0000000000..4f19aa0082 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/inhand-left.png new file mode 100644 index 0000000000..df7af5c44d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/inhand-right.png new file mode 100644 index 0000000000..7ca32199cc Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/meta.json new file mode 100644 index 0000000000..7bc851308f --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "empty" + }, + { + "name": "bolt" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/plasma.rsi/bullet.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/plasma.rsi/bullet.png new file mode 100644 index 0000000000..c94779d864 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/plasma.rsi/bullet.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/plasma.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/plasma.rsi/meta.json new file mode 100644 index 0000000000..8436af22e0 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/plasma.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "See copyright for above folder (Weapons/Guns/Projectiles)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bullet" + } + ] +}