From 05645b2bdf704fca6639a35436817172a6535bf6 Mon Sep 17 00:00:00 2001 From: Ady4ik Date: Wed, 6 Dec 2023 22:57:31 +0300 Subject: [PATCH 1/2] Monkey ID Card fix --- .../entities/markers/spawners/mobs.ftl | 2 +- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 2 +- .../Animals/monkey_inventory_template.yml | 33 +++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/SS220/InventoryTemplates/Animals/monkey_inventory_template.yml diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl index de2ae69b7144..fdc969fa0697 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl @@ -74,7 +74,7 @@ ent-SpawnMobAdultSlimesYellowAngry = спавнер слайм жёлтый зл .desc = { ent-MarkerBase.desc } ent-SpawnMobSmile = спавнер слайм Смайл .desc = { ent-MarkerBase.desc } -ent-SpawnMobMonkeyPunpun = спавнер обезьяна Пун Пун +ent-SpawnMobMonkey = спавнер обезьяна Пун Пун .desc = { ent-MarkerBase.desc } ent-SpawnMobBehonker = спавнер бехонкер .desc = { ent-MarkerBase.desc } diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 944b54ab4d16..56b183af3407 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1044,7 +1044,7 @@ - type: SentienceTarget flavorKind: station-event-random-sentience-flavor-primate - type: Inventory - templateId: monkey + templateId: monkeyinventory speciesId: monkey - type: InventorySlots - type: Cuffable diff --git a/Resources/Prototypes/SS220/InventoryTemplates/Animals/monkey_inventory_template.yml b/Resources/Prototypes/SS220/InventoryTemplates/Animals/monkey_inventory_template.yml new file mode 100644 index 000000000000..bd0637a8c997 --- /dev/null +++ b/Resources/Prototypes/SS220/InventoryTemplates/Animals/monkey_inventory_template.yml @@ -0,0 +1,33 @@ +- type: inventoryTemplate + id: monkeyinventory + slots: + - name: mask + slotTexture: mask + slotFlags: MASK + slotGroup: SecondHotbar + uiWindowPos: 1,1 + strippingWindowPos: 1,1 + displayName: Mask + whitelist: + tags: + - PetWearable + components: + - Smokable + + - name: id + slotTexture: id + slotFlags: IDCARD + slotGroup: SecondHotbar + stripTime: 6 + uiWindowPos: 2,1 + strippingWindowPos: 2,4 + displayName: ID + + - name: suitstorage + slotTexture: suit_storage + slotFlags: SUITSTORAGE + slotGroup: SecondHotbar + stripTime: 3 + uiWindowPos: 2,0 + strippingWindowPos: 2,5 + displayName: Suit Storage From b558cca077c8815e4c576f787dcb6b7cf87fd2fc Mon Sep 17 00:00:00 2001 From: Ady4ik <141335742+Ady4ik@users.noreply.github.com> Date: Wed, 6 Dec 2023 23:08:52 +0300 Subject: [PATCH 2/2] Update mobs.ftl --- .../ru-RU/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl index fdc969fa0697..de2ae69b7144 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/mobs.ftl @@ -74,7 +74,7 @@ ent-SpawnMobAdultSlimesYellowAngry = спавнер слайм жёлтый зл .desc = { ent-MarkerBase.desc } ent-SpawnMobSmile = спавнер слайм Смайл .desc = { ent-MarkerBase.desc } -ent-SpawnMobMonkey = спавнер обезьяна Пун Пун +ent-SpawnMobMonkeyPunpun = спавнер обезьяна Пун Пун .desc = { ent-MarkerBase.desc } ent-SpawnMobBehonker = спавнер бехонкер .desc = { ent-MarkerBase.desc }