diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl index 11a0c96b4e..c4244626e9 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl @@ -1,7 +1,8 @@ # Tools ent-CP14BaseSharpeningStone = точильный камень .desc = Позволит заточить притупленное оружие. Если перестараться, вы вполне можете сточить оружие полностью. - +ent-CP14OldLantern = Старая Лампа + .desc = Пережиток прошлого техномагии. Большой, тяжелый, непрактичный. Таким приятно разве что бить по голове. # Weapons/Melee ent-CP14BaseDagger = кинжал @@ -19,6 +20,7 @@ ent-CP14BaseThrowableSpear = метательное копьё ent-CP14BaseTwoHandedSword = двуручный меч .desc = Мощное оружие, требующее огромной силы и умения для эффективного использования. + # Weapons/Ranged ent-CP14BaseLightCrossbow = легкий арбалет @@ -61,4 +63,4 @@ ent-CP14OreIron = железо ent-CP14OreSilver = серебро .desc = Кусочек блестящего, теплого серебра. ent-CP14OreGold = золото - .desc = Кусочек мягкого, чистого золота. \ No newline at end of file + .desc = Кусочек мягкого, чистого золота. diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/flashlight.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/flashlight.yml new file mode 100644 index 0000000000..a92f79972a --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/flashlight.yml @@ -0,0 +1,40 @@ +- type: entity + parent: BaseItem + id: CP14OldLantern + name: Old lantern + description: Relic of the Techomagic's past. Large, weighty, unpractical. At least feels good to crack some skulls with it. + components: + - type: Sprite + sprite: _CP14/Objects/Tools/magic-lamp.rsi + noRot: false + layers: + - state: lamp + - type: MeleeWeapon + attackRate: 0.7 + wideAnimationRotation: 10 + wideAnimation: CP14WeaponArcSlash + damage: + types: + Blunt: 8 + soundHit: + collection: MetalThud + cPAnimationLength: 0.25 + - type: EmitSoundOnLand + sound: + path: /Audio/Items/toolbox_drop.ogg + - type: Item + sprite: _CP14/Objects/Tools/magic-lamp.rsi + size: Large + storedRotation: -90 + - type: Rotatable + - type: PointLight + mask: /Textures/Effects/LightMasks/double_cone.png + color: "#47F8FFFF" + autoRot: true + energy: 4 + radius: 4 + netsync: false + - type: Appearance + + + diff --git a/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/inhand-left.png new file mode 100644 index 0000000000..fccae91ce9 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/inhand-right.png new file mode 100644 index 0000000000..c6ec98c43b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/lamp.png b/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/lamp.png new file mode 100644 index 0000000000..a87d17e841 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/lamp.png differ diff --git a/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/meta.json new file mode 100644 index 0000000000..4806cdbf9c --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "by Agoichi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "lamp", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} \ No newline at end of file