From e5fbe36a00ae6a0d1f86a7d29a4465da995ebf61 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Thu, 23 May 2024 02:05:15 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D0=B0=D1=8F=20=D0=B0?= =?UTF-8?q?=D0=BD=D1=82=D0=B0=D0=B3=20=D0=B2=D0=B5=D1=89=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Changelog/ChangelogADT.yml | 5 ++++ .../Locale/ru-RU/ADT/Catalog/store/uplink.ftl | 3 +++ .../ru-RU/ADT/Objects/Misc/consumable.ftl | 2 ++ Resources/Prototypes/ADT/Catalog/uplink.yml | 17 +++++++++++- .../Objects/Weapons/Melee/iron_tray_knife.yml | 27 +++++++++++++++++++ 5 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/iron_tray_knife.yml diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 3fc997ed4c9..4ea39397780 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1792,3 +1792,8 @@ Entries: id: 55750 #костыль отображения в Обновлениях time: '2024-04-16T01:40:00.0000000+00:00' +- author: мудрый дуб + changes: + - { message: "Теперь у агентов которые подрабатывают - Шефом, Ботаником, Клоуном и Мимом в аплинке появился новый предмет в разделе 'работа' ", type: Tweak} + id: 55750 #костыль отображения в Обновлениях + time: '2024-04-23T02:04:00.0000000+00:00' \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Catalog/store/uplink.ftl b/Resources/Locale/ru-RU/ADT/Catalog/store/uplink.ftl index fa3c23b5f66..f6d4e805944 100644 --- a/Resources/Locale/ru-RU/ADT/Catalog/store/uplink.ftl +++ b/Resources/Locale/ru-RU/ADT/Catalog/store/uplink.ftl @@ -79,3 +79,6 @@ uplink-unilang-implanter-desc = Имплант, позволяющий вам п uplink-jumpboots-name = Продвинутые прыжковые ботинки uplink-jumpboots-desc = Прыжковые ботинки в раскраске Синдиката. Обладают гораздо более повышенной перезарядкой, чем прообраз, а так же могут работать в качестве магнитных ботинок. + +uplink-tray-knife-name = Особо острый поднос +uplink-tray-knife-desc = Они настолько острые, что могут убить! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Objects/Misc/consumable.ftl b/Resources/Locale/ru-RU/ADT/Objects/Misc/consumable.ftl index 700710a1f42..ed7d526f553 100644 --- a/Resources/Locale/ru-RU/ADT/Objects/Misc/consumable.ftl +++ b/Resources/Locale/ru-RU/ADT/Objects/Misc/consumable.ftl @@ -10,3 +10,5 @@ ent-ADTIronTray = железный поднос ent-RollingPin = скалка .desc = Используется для раскатывания теста. .suffix = { "" } +ent-ADTIronTrayKnife = железный поднос + .desc = Поднос для разноса еды и напитков. \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/uplink.yml b/Resources/Prototypes/ADT/Catalog/uplink.yml index 5c312b66d99..220c763752d 100644 --- a/Resources/Prototypes/ADT/Catalog/uplink.yml +++ b/Resources/Prototypes/ADT/Catalog/uplink.yml @@ -482,4 +482,19 @@ tags: - NukeOpsUplink - +- type: listing + id: ADTuplinkHtrayknife + name: uplink-tray-knife-name + description: uplink-tray-knife-desc + productEntity: ADTIronTrayKnife + cost: + Telecrystal: 3 + categories: + - UplinkJob + conditions: + - !type:BuyerJobCondition + whitelist: + - Chef + - Botanist + - Clown + - Mime diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/iron_tray_knife.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/iron_tray_knife.yml new file mode 100644 index 00000000000..64cfff30df4 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/iron_tray_knife.yml @@ -0,0 +1,27 @@ +- type: entity + id: ADTIronTrayKnife + name: Iron tray + suffix: Antag + parent: BaseStorageItem + description: An iron tray to store and service food + components: + - type: Sprite + sprite: ADT/Objects/Misc/iron_tray.rsi + state: icon + - type: Storage + grid: + - 0,0,10,7 + maxItemSize: Small + - type: Item + size: Ginormous + #- type: ItemCooldown + - type: MeleeWeapon + damage: + types: + Blunt: 8 + soundHit: + path: "/Audio/Weapons/smash.ogg" + - type: DamageOtherOnHit + damage: + types: + Blunt: 12 \ No newline at end of file From 09e15c77b0ed16c3d9aee5bc04e963ee408938b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Fri, 24 May 2024 17:02:37 +0300 Subject: [PATCH 2/4] Update ChangelogADT.yml --- Resources/Changelog/ChangelogADT.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 979852f0e6f..6f2523018c7 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1806,6 +1806,7 @@ Entries: - author: мудрый дуб changes: + - { message: "В связи с возобновлением финансирования юридического отдела, NanoTrasen вновь начнет отправлять юристов на космические станции. Теперь ваши правовые вопросы будут решаться непосредственно на месте.", type: Fix} # К коммиту d32f377e72a59c9ccd4dc3128561b7ec7fcefae1 - { message: "Теперь у агентов которые подрабатывают - Шефом, Ботаником, Клоуном и Мимом в аплинке появился новый предмет в разделе 'работа' ", type: Tweak} id: 55754 #костыль отображения в Обновлениях time: '2024-05-23T02:04:00.0000000+00:00' From 43d2c9e439ed2cc6cd1ad65dc1b39bcc8db37b43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Fri, 24 May 2024 17:21:01 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=A1=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20Entities?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Objects/Weapons/Melee/knife.yml | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/knife.yml index 5f3d7983c6c..c9774c798a6 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/knife.yml @@ -127,3 +127,31 @@ enum.ToggleVisuals.Layer: True: {state: icon} False: {state: base} + +- type: entity + id: ADTIronTrayKnife + name: Iron tray + suffix: Antag + parent: BaseStorageItem + description: An iron tray to store and service food + components: + - type: Sprite + sprite: ADT/Objects/Misc/iron_tray.rsi + state: icon + - type: Storage + grid: + - 0,0,10,7 + maxItemSize: Small + - type: Item + size: Ginormous + #- type: ItemCooldown + - type: MeleeWeapon + damage: + types: + Blunt: 8 + soundHit: + path: "/Audio/Weapons/smash.ogg" + - type: DamageOtherOnHit + damage: + types: + Blunt: 12 From c518f421d161e467c6404f9eaffcac4e826c527e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Fri, 24 May 2024 17:21:17 +0300 Subject: [PATCH 4/4] Delete Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/iron_tray_knife.yml --- .../Objects/Weapons/Melee/iron_tray_knife.yml | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/iron_tray_knife.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/iron_tray_knife.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/iron_tray_knife.yml deleted file mode 100644 index 64cfff30df4..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/iron_tray_knife.yml +++ /dev/null @@ -1,27 +0,0 @@ -- type: entity - id: ADTIronTrayKnife - name: Iron tray - suffix: Antag - parent: BaseStorageItem - description: An iron tray to store and service food - components: - - type: Sprite - sprite: ADT/Objects/Misc/iron_tray.rsi - state: icon - - type: Storage - grid: - - 0,0,10,7 - maxItemSize: Small - - type: Item - size: Ginormous - #- type: ItemCooldown - - type: MeleeWeapon - damage: - types: - Blunt: 8 - soundHit: - path: "/Audio/Weapons/smash.ogg" - - type: DamageOtherOnHit - damage: - types: - Blunt: 12 \ No newline at end of file