diff --git a/Resources/Prototypes/Stories/Catalog/uplink_catalog.yml b/Resources/Prototypes/Stories/Catalog/uplink_catalog.yml index 8b447f10a4..1735c90bda 100644 --- a/Resources/Prototypes/Stories/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Stories/Catalog/uplink_catalog.yml @@ -18,19 +18,6 @@ categories: - UplinkWearables -- type: listing - id: UplinkPistolAnaconda - name: Анаконда - description: Легендарная Анаконда - тяжёлый пистолет, стреляющий уникальными патронами калибра .40 безгильзовый, которые создаются с помощью встроенного фабрикатора. - productEntity: WeaponPistolAnaconda - discountCategory: veryRareDiscounts - discountDownTo: - Telecrystal: 4 - cost: - Telecrystal: 8 - categories: - - UplinkWeaponry - - type: listing id: UplinkClothingEyesThermalVisionMonocular name: Монокль термального зрения diff --git a/Resources/Prototypes/Stories/Entities/Objects/Weapons/Guns/Ammunition/cartridges.yml b/Resources/Prototypes/Stories/Entities/Objects/Weapons/Guns/Ammunition/cartridges.yml deleted file mode 100644 index 2e71d6cd5f..0000000000 --- a/Resources/Prototypes/Stories/Entities/Objects/Weapons/Guns/Ammunition/cartridges.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: entity - id: CartridgeAnaconda - name: патрон (.40 безгильзовый) - parent: BaseCartridgeCaselessRifle - components: - - type: CartridgeAmmo - proto: BulletAnaconda - deleteOnSpawn: true diff --git a/Resources/Prototypes/Stories/Entities/Objects/Weapons/Guns/Ammunition/projectiles.yml b/Resources/Prototypes/Stories/Entities/Objects/Weapons/Guns/Ammunition/projectiles.yml deleted file mode 100644 index a1f66aa919..0000000000 --- a/Resources/Prototypes/Stories/Entities/Objects/Weapons/Guns/Ammunition/projectiles.yml +++ /dev/null @@ -1,10 +0,0 @@ -- type: entity - id: BulletAnaconda - name: пуля (.40 безгильзовый) - parent: BaseBullet - categories: [ HideSpawnMenu ] - components: - - type: Projectile - damage: - types: - Piercing: 26 diff --git a/Resources/Prototypes/Stories/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Stories/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 9e3de597fb..e3ba6bdf0f 100644 --- a/Resources/Prototypes/Stories/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Stories/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -42,49 +42,3 @@ whitelist: tags: - CartridgeMagnum - -- type: entity - name: Анаконда - parent: [ BaseItem, BaseSyndicateContraband ] # Не наследуется от пистолета, так как не использует магазины. Система контрабанды у нас своя, но для постоянности пусть будет контрабандой Синдиката - id: WeaponPistolAnaconda - description: Тяжёлый пистолет, стреляющий патронами калибра .40 безгильзовый, которые создаются с помощью встроенного фабрикатора. - components: - - type: Gun - fireRate: 3 - availableModes: - - SemiAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/hpistol.ogg - - type: Item - size: Small - shape: - - 0,0,1,0 - - 0,1,0,1 - - type: Tag - tags: - - Sidearm - - type: Clothing - sprite: Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi - quickEquip: false - slots: - - suitStorage - - Belt - - type: Sprite - sprite: Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - - type: BasicEntityAmmoProvider - proto: CartridgeAnaconda - capacity: 7 - count: 7 - - type: RechargeBasicEntityAmmo - rechargeCooldown: 4 - rechargeSound: - path: /Audio/Weapons/Guns/Cock/shotgun_close.ogg - - type: AmmoCounter diff --git a/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/base.png b/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/base.png deleted file mode 100644 index 52226198e7..0000000000 Binary files a/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/bolt-open.png b/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/bolt-open.png deleted file mode 100644 index 1fe7a6c0ff..0000000000 Binary files a/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/bolt-open.png and /dev/null differ diff --git a/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/equipped-BELT.png b/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/equipped-BELT.png deleted file mode 100644 index edc4d43c0d..0000000000 Binary files a/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/equipped-BELT.png and /dev/null differ diff --git a/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/equipped-SUITSTORAGE.png deleted file mode 100644 index edc4d43c0d..0000000000 Binary files a/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/equipped-SUITSTORAGE.png and /dev/null differ diff --git a/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/icon.png b/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/icon.png deleted file mode 100644 index 3bf9cd972b..0000000000 Binary files a/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/inhand-left.png b/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/inhand-left.png deleted file mode 100644 index eb4c4a4def..0000000000 Binary files a/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/inhand-right.png b/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/inhand-right.png deleted file mode 100644 index 70aa5cce6e..0000000000 Binary files a/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/mag-0.png b/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/mag-0.png deleted file mode 100644 index 47f569f09c..0000000000 Binary files a/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/mag-0.png and /dev/null differ diff --git a/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/meta.json b/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/meta.json deleted file mode 100644 index e6ae0b06d2..0000000000 --- a/Resources/Textures/Stories/Objects/Weapons/Guns/Pistols/anaconda.rsi/meta.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Created by RustedTim(discord: helloo4771) and edited by Shegare(discord: shegare) for SpaceStories (ss14)", - "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 - } - ] -}