From a0fa596fecebc1ac5e5be7b8cd84827e82d3a2e0 Mon Sep 17 00:00:00 2001 From: FrisKisDr Date: Tue, 14 Nov 2023 21:51:33 +1000 Subject: [PATCH 1/2] =?UTF-8?q?HotFix=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80?= =?UTF-8?q?=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BB=D0=B8=D1=86=20?= =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D0=B0=D0=BA=D0=B8=D0=B4=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Changelog/ChangelogADT.yml | 6 ++++++ .../ADT/Novakid/Customization/Markings/novakid.yml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index eb6055dff87..6b8e05f272e 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -576,3 +576,9 @@ Entries: - {message: Фикс спрайтов некоторых вещей ко Дню Рождения Сервера., type: Fix} id: 55606 #костыль отображения в Обновлениях time: '2023-11-14T01:20:00.0000000+00:00' + +- author: Friskis + changes: + - {message: Починка отображения лиц Новакидов, type: Fix} + id: 55608 #костыль отображения в Обновлениях + time: '2023-11-15T07:40:00.0000000+00:00' diff --git a/Resources/Prototypes/ADT/Novakid/Customization/Markings/novakid.yml b/Resources/Prototypes/ADT/Novakid/Customization/Markings/novakid.yml index b0fca319d2f..b81f7823769 100644 --- a/Resources/Prototypes/ADT/Novakid/Customization/Markings/novakid.yml +++ b/Resources/Prototypes/ADT/Novakid/Customization/Markings/novakid.yml @@ -361,7 +361,7 @@ - type: marking id: HeadNovakidDefolt - bodyPart: Head + bodyPart: [ Head ] markingCategory: HeadTop speciesRestriction: [NovakidSpecies] forcedColoring: true From ba1a5befb012acce0f65058bdd57219d52f4e61d Mon Sep 17 00:00:00 2001 From: FrisKisDr Date: Tue, 14 Nov 2023 22:05:55 +1000 Subject: [PATCH 2/2] =?UTF-8?q?=D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20?= =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D0=BE=20=D1=84=D0=B8=D0=BA=D1=81.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Customization/Markings/novakid.yml | 68 +++++++++---------- .../ADT/Novakid/Species/novakid.yml | 3 + 2 files changed, 37 insertions(+), 34 deletions(-) diff --git a/Resources/Prototypes/ADT/Novakid/Customization/Markings/novakid.yml b/Resources/Prototypes/ADT/Novakid/Customization/Markings/novakid.yml index b81f7823769..be963fdacc0 100644 --- a/Resources/Prototypes/ADT/Novakid/Customization/Markings/novakid.yml +++ b/Resources/Prototypes/ADT/Novakid/Customization/Markings/novakid.yml @@ -199,7 +199,7 @@ - type: marking id: NovakidFace1 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -208,7 +208,7 @@ - type: marking id: NovakidFace2 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -217,7 +217,7 @@ - type: marking id: NovakidFace3 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -226,7 +226,7 @@ - type: marking id: NovakidFace4 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -235,7 +235,7 @@ - type: marking id: NovakidFace5 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -244,7 +244,7 @@ - type: marking id: NovakidFace6 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -253,7 +253,7 @@ - type: marking id: NovakidFace7 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -262,7 +262,7 @@ - type: marking id: NovakidFace8 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -271,7 +271,7 @@ - type: marking id: NovakidFace9 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -280,7 +280,7 @@ - type: marking id: NovakidFace10 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -289,7 +289,7 @@ - type: marking id: NovakidFace11 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -298,7 +298,7 @@ - type: marking id: NovakidFace12 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -307,7 +307,7 @@ - type: marking id: NovakidFace13 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -316,7 +316,7 @@ - type: marking id: NovakidFace14 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -325,7 +325,7 @@ - type: marking id: NovakidFace15 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -334,7 +334,7 @@ - type: marking id: NovakidFace16 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -343,7 +343,7 @@ - type: marking id: NovakidFace17 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -352,7 +352,7 @@ - type: marking id: NovakidFace18 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -391,7 +391,7 @@ - type: marking id: NovakidFace19 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -400,7 +400,7 @@ - type: marking id: NovakidFace20 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -409,7 +409,7 @@ - type: marking id: NovakidFace21 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -418,7 +418,7 @@ - type: marking id: NovakidFace22 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -427,7 +427,7 @@ - type: marking id: NovakidFace23 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -436,7 +436,7 @@ - type: marking id: NovakidFace24 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -445,7 +445,7 @@ - type: marking id: NovakidFace25 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -454,7 +454,7 @@ - type: marking id: NovakidFace26 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -463,7 +463,7 @@ - type: marking id: NovakidFace27 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -472,7 +472,7 @@ - type: marking id: NovakidFace28 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -481,7 +481,7 @@ - type: marking id: NovakidFace29 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -490,7 +490,7 @@ - type: marking id: NovakidFace30 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -499,7 +499,7 @@ - type: marking id: NovakidFace31 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -508,7 +508,7 @@ - type: marking id: NovakidFace32 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -517,7 +517,7 @@ - type: marking id: NovakidFace33 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: @@ -526,7 +526,7 @@ - type: marking id: NovakidFace34 - bodyPart: Head + bodyPart: Snout markingCategory: HeadSide speciesRestriction: [NovakidSpecies] sprites: diff --git a/Resources/Prototypes/ADT/Novakid/Species/novakid.yml b/Resources/Prototypes/ADT/Novakid/Species/novakid.yml index c63c68fe31b..e752eca6aeb 100644 --- a/Resources/Prototypes/ADT/Novakid/Species/novakid.yml +++ b/Resources/Prototypes/ADT/Novakid/Species/novakid.yml @@ -36,6 +36,9 @@ id: MobNovakidMarkingLimits onlyWhitelisted: true points: + Head: + points: 1 + required: false Hair: points: 1 required: false