diff --git a/Resources/Locale/ru-RU/_white/items/apka.ftl b/Resources/Locale/ru-RU/_white/items/apka.ftl new file mode 100644 index 0000000000..eb1ae3e183 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/items/apka.ftl @@ -0,0 +1,4 @@ +ent-WeaponAdvancedProtoKineticAccelerator = продвинутый автоматический протокинетический акселератор + .desc = Сокращённо - ПАПА. Обладает повышенной скорострельностью и эффективно добывает породы любых типов. Крайне опасен в бою. + +research-technology-industrial-mining = Промышленная добыча diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 744100cc95..ad343bf2a8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -420,6 +420,7 @@ layers: - state: chronobolt shader: unshaded + - type: GatheringProjectile # WD - type: Projectile impactEffect: BulletImpactEffectKinetic damage: @@ -487,9 +488,10 @@ damage: types: Blunt: 0 + Structural: 15 # WD # Short lifespan - type: TimedDespawn - lifetime: 0.4 + lifetime: 0.2 # WD - type: entity parent: BaseBullet diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 01d5adf20c..e35d711c04 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -381,6 +381,10 @@ - WeaponForceGun - WeaponLaserSvalinn - WeaponProtoKineticAccelerator + - WeaponAdvancedProtoKineticAccelerator # WD start + - SeismicCharge + - WeaponCrusherDagger + - WeaponCrusher # WD end - WeaponTetherGun - WeaponGrapplingGun - ClothingBackpackHolding diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml index 6a786f2b24..1d33217e98 100644 --- a/Resources/Prototypes/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/Recipes/Lathes/devices.yml @@ -212,6 +212,51 @@ Glass: 500 Silver: 100 +- type: latheRecipe # WD start + id: WeaponAdvancedProtoKineticAccelerator + result: WeaponAdvancedProtoKineticAccelerator + category: Weapons + completetime: 5 + materials: + Steel: 800 + Plasma: 400 + Glass: 200 + Uranium: 200 + Silver: 300 + Gold: 600 + +- type: latheRecipe + id: SeismicCharge + result: SeismicCharge + category: Weapons + completetime: 3 + materials: + Plastic: 800 + Plasma: 100 + Glass: 200 + +- type: latheRecipe + id: WeaponCrusherDagger + result: WeaponCrusherDagger + category: Weapons + completetime: 5 + materials: + Steel: 500 + Plastic: 200 + Silver: 100 + +- type: latheRecipe + id: WeaponCrusher + result: WeaponCrusher + category: Weapons + completetime: 5 + materials: + Steel: 2000 + Plastic: 400 + Glass: 300 + Plasma: 300 + Silver: 200 # WD end + - type: latheRecipe id: WeaponTetherGun result: WeaponTetherGun diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index e22be07067..acc358d51c 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -12,6 +12,7 @@ recipeUnlocks: - WeaponProtoKineticAccelerator - ShuttleGunKineticCircuitboard + - WeaponCrusherDagger # WD # These are roundstart but not replenishable for salvage - type: technology @@ -109,6 +110,22 @@ # Tier 2 +- type: technology # WD start + id: IndustrialMining + name: research-technology-industrial-mining + icon: + sprite: Objects/Weapons/Bombs/seismic.rsi + state: icon + discipline: Arsenal + tier: 2 + cost: 9500 + recipeUnlocks: + - WeaponAdvancedProtoKineticAccelerator + - SeismicCharge + - WeaponCrusher + technologyPrerequisites: + - SalvageWeapons # WD end + - type: technology id: LightweightMagnets name: research-technology-lightweight-magnets diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/apka.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/apka.yml new file mode 100644 index 0000000000..94c88294a2 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/apka.yml @@ -0,0 +1,59 @@ +- type: entity + parent: BaseItem + id: WeaponAdvancedProtoKineticAccelerator + name: advanced proto-kinetic accelerator + description: Apka. + components: + - type: Sprite + sprite: White/Objects/Weapons/advanced_kinetic.rsi + layers: + - state: icon + - state: animation-icon + visible: false + map: [ "empty-icon" ] + - type: Item + sprite: White/Objects/Weapons/advanced_kinetic.rsi + size: Normal + - type: GunWieldBonus + minAngle: -43 + maxAngle: -43 + - type: Wieldable + - type: Gun + angleDecay: 45 + minAngle: 44 + maxAngle: 45 + fireRate: 6 + ShotsPerBurst: 3 + selectedMode: Burst + availableModes: + - Burst + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg + - type: AmmoCounter + - type: Appearance + - type: GenericVisualizer + visuals: + enum.AmmoVisuals.HasAmmo: + empty-icon: + True: { visible: False } + False: { visible: True } + - type: RechargeBasicEntityAmmo + rechargeCooldown: 0.7 + rechargeSound: + path: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg + params: + volume: -1 + pitch: 1.2 + variation: 0.08 + - type: BasicEntityAmmoProvider + proto: BulletKinetic + capacity: 3 + count: 2 + - type: Clothing + sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi + quickEquip: false + slots: + - suitStorage + - Belt + - type: UseDelay + delay: 1 diff --git a/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/animation-icon.png b/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/animation-icon.png new file mode 100644 index 0000000000..5b125162ac Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/animation-icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/equipped-BELT.png new file mode 100644 index 0000000000..0547f4066d Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..0547f4066d Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/icon.png new file mode 100644 index 0000000000..210dd089d4 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/inhand-left.png new file mode 100644 index 0000000000..dc24e45d92 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/inhand-right.png new file mode 100644 index 0000000000..9f099d7b66 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/meta.json new file mode 100644 index 0000000000..50753e83d3 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "icon by RiceMar1244 based on tgstation at https://github.com/tgstation/tgstation/commit/8b7f8ba6a3327c7381967c550f185dffafd11a57; inhand, wield, and belt equip sprites by RiceMar1244. Recolor by keslik", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "animation-icon", + "delays": [ + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/wielded-inhand-left.png b/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..ef9f7190c2 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/wielded-inhand-right.png b/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..bcdd7c988d Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/advanced_kinetic.rsi/wielded-inhand-right.png differ