diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl index 4e07a6758b..b155697cef 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl @@ -2,7 +2,7 @@ ent-BaseBlueprint = чертёж .desc = Чертёж какого-то устройства. Его можно поместить в автолат. ent-BlueprintFulton = чертёж фултона .desc = Чертёж со схемой фултона. Его можно поместить в автолат. -ent-BlueprintSeismicCharge = чертёж сейсмического заряда - .desc = Чертеж со схемой сейсмического заряда. Его можно поместить в автолат. +ent-BlueprintMiningDrillDiamond = чертёж алмазного шахтёрского бура + .desc = Чертеж со схемой алмазного бура. Его можно поместить в автолат. ent-BlueprintSoapOmega = чертёж омега мыла .desc = Чертеж со схемой омега мыла. Его можно поместить в автолат. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/mining.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/mining.ftl index 33e699a9fc..9867b945fd 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/mining.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/mining.ftl @@ -10,3 +10,5 @@ ent-Pickaxe = кирка .desc = Зазубренная до совершенства, чтобы вбивать её в камни. ent-MiningDrill = шахтёрский бур .desc = Мощный инструмент, служащий для быстрого бурения горных пород. +ent-MiningDrillDiamond = шахтёрский бур с алмазным сверлом + .desc = Более эффективная версия шахтёрского бура. diff --git a/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml b/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml index 43cbdc2431..18a52f29ee 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml @@ -30,10 +30,10 @@ - type: entity parent: BaseBlueprint - id: BlueprintSeismicCharge - name: seismic charge blueprint - description: A blueprint with a schematic of a seismic charge. It can be inserted into an autolathe. + id: BlueprintMiningDrillDiamond # WD start + name: diamond mining drill blueprint + description: A blueprint with a schematic of a diamond mining drill. It can be inserted into an autolathe. components: - type: Blueprint providedRecipes: - - SeismicCharge + - MiningDrillDiamond # WD end diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml index fa961dca56..8806ba6f89 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml @@ -64,3 +64,25 @@ Brute: 3 types: Structural: 12 + +- type: entity + name: diamond tipped mining drill + parent: MiningDrill + id: MiningDrillDiamond + description: A significantly more efficient mining drill tipped with diamond. + components: + - type: Sprite + sprite: Objects/Tools/handdrilldiamond.rsi + state: handdrill + - type: MeleeWeapon + autoAttack: true + angle: 0 + wideAnimationRotation: -90 + soundHit: + path: "/Audio/Items/drill_hit.ogg" + attackRate: 4 + damage: + groups: + Brute: 6 + types: + Structural: 30 diff --git a/Resources/Prototypes/Recipes/Lathes/salvage.yml b/Resources/Prototypes/Recipes/Lathes/salvage.yml index 567793a23a..cdbfe5fb4d 100644 --- a/Resources/Prototypes/Recipes/Lathes/salvage.yml +++ b/Resources/Prototypes/Recipes/Lathes/salvage.yml @@ -18,11 +18,11 @@ # If they get spammed make it cost silver. - type: latheRecipe - id: SeismicCharge - result: SeismicCharge + id: MiningDrillDiamond # WD start + result: MiningDrillDiamond category: Tools - completetime: 5 # WD Edit from 1 to 5 + completetime: 5 materials: - Plastic: 1500 - Steel: 100 - Silver: 100 + Steel: 1500 + Plastic: 1000 + Silver: 200 # WD end diff --git a/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/handdrill.png b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/handdrill.png new file mode 100644 index 0000000000..8b913e2bd9 Binary files /dev/null and b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/handdrill.png differ diff --git a/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-left.png new file mode 100644 index 0000000000..db6873b739 Binary files /dev/null and b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-right.png new file mode 100644 index 0000000000..37f9d3f44d Binary files /dev/null and b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/meta.json b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/meta.json new file mode 100644 index 0000000000..e9341a75be --- /dev/null +++ b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8fdee6e4e3dacdb7a12efaac132933dc0fc649b4 and modified by alzore_", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "handdrill" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}