diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index 9f8bbf84ba3c12..1c46e898e7abd4 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -30,6 +30,7 @@ research-technology-bluespace-chemistry = Bluespace Chemistry research-technology-cloning = Cloning research-technology-salvage-weapons = Salvage Weapons +research-technology-salvage-cutters = Ion weapons research-technology-draconic-munitions = Draconic Munitions research-technology-explosive-technology = Explosive Technology research-technology-advanced-laser-manipulation = Advanced Laser Manipulation diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/salvage.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/salvage.ftl index 734b84f8f5aec1..f3444c9f1e5720 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/salvage.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/salvage.ftl @@ -13,3 +13,6 @@ ent-CratePartsT3T4 = tier 3/4 parts crate ent-CratePartsT4 = tier 4 parts crate .desc = Contains 5 random tier 4 parts for upgrading machines. .suffix = { "" } +ent-CrateAdvSalvageEquipment = advanced salvage equipment crate + .desc = Contains one advanced set of miner's tools. + .suffix = Filled \ No newline at end of file diff --git a/Resources/Locale/ru-RU/research/technologies.ftl b/Resources/Locale/ru-RU/research/technologies.ftl index a2ec57a07d26a1..30a8b3d51652b1 100644 --- a/Resources/Locale/ru-RU/research/technologies.ftl +++ b/Resources/Locale/ru-RU/research/technologies.ftl @@ -5,6 +5,7 @@ research-discipline-arsenal = Оружейная research-discipline-experimental = Экспериментальная research-discipline-civilian-services = Сервисная research-technology-salvage-weapons = Оружия утилизаторов +research-technology-salvage-cutters = Ионная экипировка research-technology-salvage-equipment = Экипировка для утилизаторов research-technology-advanced-powercells = Продвинутые батареи research-technology-compact-power = Компактное энергопитание diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/salvage.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/salvage.ftl index b95736478bacf4..79b58d0b9873b6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/salvage.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/salvage.ftl @@ -13,9 +13,6 @@ ent-CratePartsT3T4 = ящик деталей 3/4 уровня ent-CratePartsT4 = ящик деталей 4 уровня .desc = Содержит 5 случайных деталей 4 уровня для улучшения оборудования. .suffix = { "" } -ent-CrateMinerEquipment = ящик шахтерских инструментов - .desc = Содержит набор инструментов для двух шахтеров - .suffix = Заполненный -ent-CrateMinerAdvancedEquipment = ящик продвинутых шахтерских инструментов - .desc = Содержит набор продвинутых инструментов для двух шахтеров +ent-CrateAdvSalvageEquipment = ящик продвинутых шахтерских инструментов + .desc = Содержит в себе один продвинутый набор шахтёрских инструментов. .suffix = Заполненный \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml index 71e188d8a00f45..d1694a9924e528 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml @@ -7,24 +7,3 @@ cost: 250 category: Cargo group: market - -- type: cargoProduct - id: CargoCrateMinerEquipment - icon: - sprite: Objects/Weapons/Guns/Battery/cutter.rsi - state: icon - product: CrateMinerEquipment - cost: 7500 - category: Cargo - group: market - -- type: cargoProduct - id: CargoCrateMinerAdvancedEquipment - icon: - sprite: Objects/Weapons/Guns/Battery/cutteradv.rsi - state: icon - product: CrateMinerAdvancedEquipment - cost: 12500 - category: Cargo - group: market - \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index a5e9486ba311f5..b4730466047eb7 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -148,30 +148,13 @@ amount: 5 - type: entity - id: CrateMinerEquipment - name: "mining" - description: For the daring. - suffix: Filled parent: CrateGenericSteel - components: - - type: StorageFill - contents: - - id: WeaponCutter - amount: 2 - - id: OreBagBluespace - amount: 2 - -- type: entity - id: CrateMinerAdvancedEquipment - name: "mining advanced" - description: For the daring. + id: CrateAdvSalvageEquipment + name: advanced salvage equipment suffix: Filled - parent: CrateGenericSteel + description: Contains one advanced plasma cutter and bluespace ore bag. components: - type: StorageFill contents: - - id: WeaponCutterAdv - amount: 2 - - id: OreBagBluespace - amount: 2 - + - id: WeaponCutterAdv + - id: OreBagBluespace diff --git a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml index d700dcde54a063..6f75fbd66b54d2 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml @@ -32,6 +32,10 @@ - type: Sprite sprite: Objects/Specific/Mining/ore_bag_bluespace.rsi state: icon + layers: + - state: icon + - state: icon-unlit + shader: unshaded - type: Clothing sprite: Objects/Specific/Mining/ore_bag_bluespace.rsi quickEquip: false 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 28d6137fd58d97..58956862a54034 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -496,17 +496,22 @@ sprite: Objects/Weapons/Guns/Battery/cutter.rsi state: icon - type: Gun - fireRate: 6 + fireRate: 0.6 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/plasma_cutter.ogg + - type: Item + size: 25 - type: ProjectileBatteryAmmoProvider proto: BulletCutter - fireCost: 10 + fireCost: 200 + - type: Battery + maxCharge: 5000 + startingCharge: 5000 - type: Appearance - type: entity name: Advanced Cutter - parent: BaseWeaponBatterySmall + parent: WeaponCutter id: WeaponCutterAdv description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. components: @@ -514,10 +519,10 @@ sprite: Objects/Weapons/Guns/Battery/cutteradv.rsi state: icon - type: Gun - fireRate: 8 + fireRate: 1 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/plasma_cutter.ogg - type: ProjectileBatteryAmmoProvider - proto: BulletCutter - fireCost: 5 + proto: BulletCutterAdv + fireCost: 100 - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 2f4c36f68bbf26..943b4b8bd6f9d1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -292,6 +292,49 @@ path: "/Audio/Weapons/tap.ogg" soundForce: true +- type: entity + id: BulletCutter + name: cutter bolt + parent: BaseBullet + noSpawn: true + description: Not too bad, but you still don't want to get hit by it. + components: + - type: Reflective + reflective: + - NonEnergy + - type: Sprite + noRot: false + sprite: Objects/Weapons/Guns/Projectiles/bullet_cutter.rsi + layers: + - state: icon + shader: unshaded + - type: GatheringProjectile + amount: 30 + - type: Projectile + deleteOnCollide: false + damage: + types: + Heat: 10 + - type: TimedDespawn + lifetime: 0.2 + - type: PointLight + radius: 2 + color: purple + energy: 1 + +- type: entity + id: BulletCutterAdv + name: cutter bolt advanced + parent: BulletCutter + noSpawn: true + components: + - type: Projectile + damage: + types: + Heat: 15 + - type: TimedDespawn + lifetime: 0.25 + - type: entity name: emitter bolt id: EmitterBolt @@ -766,27 +809,3 @@ lifetime: 0.4 - type: StaminaDamageOnCollide damage: 65 - -- type: entity - id: BulletCutter - name: Cutter bolt - parent: BaseBullet - noSpawn: true - description: Not too bad, but you still don't want to get hit by it. - components: - - type: Reflective - reflective: - - NonEnergy - - type: Sprite - noRot: false - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - layers: - - state: scatterlaser - - type: GatheringProjectile - - type: Projectile - damage: - types: - Heat: 0.5 - # Short lifespan - - type: TimedDespawn - lifetime: 0.4 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 2ff9f0da437402..c1b5f5df95bf59 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -224,6 +224,7 @@ - WeaponCrusherDagger - WeaponForceGun - WeaponProtoKineticAccelerator + - WeaponCutter - WeaponTetherGun - WeaponGrapplingGun - ClothingBackpackHolding diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml index 304d3363c3a818..8253bda6e5f0ce 100644 --- a/Resources/Prototypes/Procedural/salvage_rewards.yml +++ b/Resources/Prototypes/Procedural/salvage_rewards.yml @@ -65,6 +65,8 @@ CrateArmoryLaser: 1.0 CrateArmoryShotgun: 1.0 BoxCursedKatana: 1.0 + # rare equipment + CrateAdvSalvageEquipment: 1.0 # rare armor ClothingOuterArmorRiot: 1.0 # rare chemicals diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 7f273dc6660286..eea1559f2c54ac 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -29,6 +29,16 @@ Glass: 800 Plastic: 500 +- type: latheRecipe + id: WeaponCutter + result: WeaponCutter + completetime: 10 + materials: + Steel: 1100 + Glass: 200 + Gold: 300 + Plasma: 800 + - type: latheRecipe id: WeaponAdvancedLaser result: WeaponAdvancedLaser diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 64f8dc3401aee2..39191ee520376f 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -87,6 +87,18 @@ # Tier 2 +- type: technology + id: SalvageCutters + name: research-technology-salvage-cutters + icon: + sprite: Objects/Weapons/Guns/Battery/cutter.rsi + state: icon + discipline: Arsenal + tier: 2 + cost: 8500 + recipeUnlocks: + - WeaponCutter + - type: technology id: OptimizedBallistics name: research-technology-optimized-ballistics diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/equipped-BELT.png b/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/equipped-BELT.png index 1c69c8195b2826..510c3e3110eed0 100644 Binary files a/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/icon-unlit.png b/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/icon-unlit.png new file mode 100644 index 00000000000000..c84ad70e1c0eb3 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/icon-unlit.png differ diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/inhand-left.png index c7c78e8a2dfd81..528f00a37da392 100644 Binary files a/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/inhand-left.png and b/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/inhand-right.png index da85765a9e600a..fa4c242111976e 100644 Binary files a/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/inhand-right.png and b/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/meta.json b/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/meta.json index 12b34cad4a2156..b58a2f28539802 100644 --- a/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Mining/ore_bag_bluespace.rsi/meta.json @@ -30,6 +30,18 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "icon-unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/bullet_cutter.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/bullet_cutter.rsi/icon.png new file mode 100644 index 00000000000000..3e17ff28fbe773 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/bullet_cutter.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/bullet_cutter.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/bullet_cutter.rsi/meta.json new file mode 100644 index 00000000000000..2a7a7a869dd96b --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/bullet_cutter.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken and modified from tgstation commit: https://github.com/tgstation/tgstation/commit/2b8b045d5a237147d736e3ba3c77c8cc5fb66cb5#diff-db041845cfd01e0f883d2bf4f74cd897b7f63ea5e856e64109d7dd3b6543d1ab", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} \ No newline at end of file