diff --git a/Resources/Changelog/1ChangelogADT.yml b/Resources/Changelog/1ChangelogADT.yml index a64ed7ed8f3..f64e4279322 100644 --- a/Resources/Changelog/1ChangelogADT.yml +++ b/Resources/Changelog/1ChangelogADT.yml @@ -3085,3 +3085,8 @@ Entries: в комнате ожидания, двумя тематическими картинами.', type: Add} time: '2024-09-19T01:08:46Z' id: 364 + - author: PyotrIgn + changes: + - {message: Обновлена карта Alley, type: Tweak} + time: '2024-09-19T14:04:42Z' + id: 365 diff --git a/Resources/Locale/ru-RU/ADT/personalization.ftl b/Resources/Locale/ru-RU/ADT/personalization.ftl index 4787e34c227..200cd9fdee3 100644 --- a/Resources/Locale/ru-RU/ADT/personalization.ftl +++ b/Resources/Locale/ru-RU/ADT/personalization.ftl @@ -330,3 +330,7 @@ ent-ADTClothingOuterCoatMaki = Пальто Хонкоматери ent-ADTUrogCrowbarGold = Золотой лом Урог-Джаха .desc = На ломе гравировка "Пиши заявку, сука!!!" .suffix = { "Именное, Vladylya" } + +ent-ADTOwlScimitar = Совиный клинок + .desc = Увесистый клинок, схожий со скимитарами давно ушедшей эпохи, с выжженой на рукояти совой. Побит временем, но всё так же рвётся в бой. + .suffix = Именное, Filo diff --git a/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml b/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml index cbc792dc4a5..06a9244e9ed 100644 --- a/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml +++ b/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml @@ -951,6 +951,7 @@ - Katana - type: DisarmMalus + # dedurog / Урог-Джаха - type: entity name: Urog-Djah's gold crowbar @@ -967,3 +968,32 @@ sprite: ADT/Personalization/gold-crowbar.rsi size: Normal heldPrefix: gold + +# for Filo +- type: entity + name: Owl's Scimitar + parent: BaseItem + id: ADTOwlScimitar + suffix: Filo + description: + components: + - type: Sharp + - type: Sprite + sprite: ADT/Personalization/owl_scimitar/icon.rsi + state: icon + scale: 0.66, 0.66 + - type: MeleeWeapon + attackRate: 0.9 + damage: + types: + Slash: 24 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Clothing + sprite: ADT/Personalization/owl_scimitar/other.rsi + slots: + - Belt + - type: Item + size: Huge + sprite: ADT/Personalization/owl_scimitar/other.rsi + - type: DisarmMalus diff --git a/Resources/Textures/ADT/Personalization/owl_scimitar/icon.rsi/icon.png b/Resources/Textures/ADT/Personalization/owl_scimitar/icon.rsi/icon.png new file mode 100644 index 00000000000..4f583deb308 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/owl_scimitar/icon.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Personalization/owl_scimitar/icon.rsi/meta.json b/Resources/Textures/ADT/Personalization/owl_scimitar/icon.rsi/meta.json new file mode 100644 index 00000000000..1702e62a3ce --- /dev/null +++ b/Resources/Textures/ADT/Personalization/owl_scimitar/icon.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by discord:filokini", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/ADT/Personalization/owl_scimitar/other.rsi/equipped-BELT.png b/Resources/Textures/ADT/Personalization/owl_scimitar/other.rsi/equipped-BELT.png new file mode 100644 index 00000000000..604ef0c2091 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/owl_scimitar/other.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Personalization/owl_scimitar/other.rsi/inhand-left.png b/Resources/Textures/ADT/Personalization/owl_scimitar/other.rsi/inhand-left.png new file mode 100644 index 00000000000..8d1a810135b Binary files /dev/null and b/Resources/Textures/ADT/Personalization/owl_scimitar/other.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Personalization/owl_scimitar/other.rsi/inhand-right.png b/Resources/Textures/ADT/Personalization/owl_scimitar/other.rsi/inhand-right.png new file mode 100644 index 00000000000..cd58a191209 Binary files /dev/null and b/Resources/Textures/ADT/Personalization/owl_scimitar/other.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Personalization/owl_scimitar/other.rsi/meta.json b/Resources/Textures/ADT/Personalization/owl_scimitar/other.rsi/meta.json new file mode 100644 index 00000000000..69ab73bd1de --- /dev/null +++ b/Resources/Textures/ADT/Personalization/owl_scimitar/other.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by discord:filokini", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +}