diff --git a/Resources/Locale/en-US/_CP14/markings/human-hair.ftl b/Resources/Locale/en-US/_CP14/markings/human-hair.ftl index a84dbb2bdb..a61f59f628 100644 --- a/Resources/Locale/en-US/_CP14/markings/human-hair.ftl +++ b/Resources/Locale/en-US/_CP14/markings/human-hair.ftl @@ -11,6 +11,9 @@ marking-CP14HumanHairBigBraid = Full Braid marking-CP14HumanHairCrazyBald = CrazyBald marking-CP14HumanHairBigDoubleBun = Double Bun marking-CP14HumanHairPonyTail7 = Ponytail +marking-CP14HumanHairSideTail4 = Side tail +marking-CP14HumanHairSwept2 = Swept +marking-CP14HumanHairUpdo = Updo marking-CP14HumanHairVLongFringe = Straight bangs marking-CP14HumanHairVolaju = Volaju -marking-CP14HumanHairWisp = Wisp +marking-CP14HumanHairWisp = Wisp \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/markings/tiefling-horns.ftl b/Resources/Locale/en-US/_CP14/markings/tiefling-horns.ftl index 45f8b4bb6f..e21d5bbb9b 100644 --- a/Resources/Locale/en-US/_CP14/markings/tiefling-horns.ftl +++ b/Resources/Locale/en-US/_CP14/markings/tiefling-horns.ftl @@ -6,3 +6,4 @@ marking-CP14TieflingHorns4 = Change marking-CP14TieflingHorns5 = The Devil marking-CP14TieflingHorns5Broken = Broken Devil marking-CP14TieflingHorns6 = Lamb +marking-CP14TieflingHorns7 = Horny horns \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl b/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl index 5ebee935e9..dab7acdb9d 100644 --- a/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl +++ b/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl @@ -11,6 +11,9 @@ marking-CP14HumanHairBigBraid = Хвост во весь рост marking-CP14HumanHairCrazyBald = Безумная проплешина marking-CP14HumanHairBigDoubleBun = Два пунпона marking-CP14HumanHairPonyTail7 = Конский хвост +marking-CP14HumanHairSideTail4 = Хвост сбоку +marking-CP14HumanHairSwept2 = Суровый взгляд +marking-CP14HumanHairUpdo = Пучок marking-CP14HumanHairVLongFringe = Прямая челка marking-CP14HumanHairVolaju = Вояж marking-CP14HumanHairWisp = Огонек \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/markings/tiefling-horns.ftl b/Resources/Locale/ru-RU/_CP14/markings/tiefling-horns.ftl index 10c928b29c..76b9a1fd3b 100644 --- a/Resources/Locale/ru-RU/_CP14/markings/tiefling-horns.ftl +++ b/Resources/Locale/ru-RU/_CP14/markings/tiefling-horns.ftl @@ -5,4 +5,5 @@ marking-CP14TieflingHorns3Broken = Сломанная вертикаль marking-CP14TieflingHorns4 = Мелочь marking-CP14TieflingHorns5 = Дьявол marking-CP14TieflingHorns5Broken = Сломленный дьявол -marking-CP14TieflingHorns6 = Барашек \ No newline at end of file +marking-CP14TieflingHorns6 = Барашек +marking-CP14TieflingHorns7 = Облегающие \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml index b3a3b24007..ef27e4e6b4 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml @@ -16,7 +16,7 @@ parent: CP14ClothingEyesBase id: CP14ClothingEyesMonocle name: monocle - description: Aristocratic, fancy, gold-plated. + description: Aristocratic, fancy. components: - type: Sprite sprite: _CP14/Clothing/Eyes/monocle.rsi @@ -27,7 +27,7 @@ parent: CP14ClothingEyesBase id: CP14ClothingEyesGoldGlasses name: gold glasses - description: Aristocratic, fancy, gold-plated. + description: Aristocratic, fancy. components: - type: Foldable canFoldInsideContainer: true @@ -37,9 +37,9 @@ foldedEquippedPrefix: flipped foldedHeldPrefix: flipped - type: Sprite - sprite: _CP14/Clothing/Eyes/gold_glasses.rsi + sprite: _CP14/Clothing/Eyes/glasses.rsi - type: Clothing - sprite: _CP14/Clothing/Eyes/gold_glasses.rsi + sprite: _CP14/Clothing/Eyes/glasses.rsi - type: entity parent: CP14ClothingEyesBase diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml index 06be1a7e7b..95478839fe 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml @@ -102,6 +102,30 @@ - sprite: _CP14/Mobs/Customization/human_hair.rsi state: ponytail7 +- type: marking + id: CP14HumanHairSideTail4 + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _CP14/Mobs/Customization/human_hair.rsi + state: sidetail4 + +- type: marking + id: CP14HumanHairSwept2 + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _CP14/Mobs/Customization/human_hair.rsi + state: swept2 + +- type: marking + id: CP14HumanHairUpdo + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _CP14/Mobs/Customization/human_hair.rsi + state: updo + - type: marking id: CP14HumanHairVLongFringe bodyPart: Hair diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml index bf1c4a7b26..5e17561181 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml @@ -3,82 +3,79 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [ CP14Tiefling ] + followSkinColor: true sprites: - - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi - state: horn1 + - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi + state: horn1 - type: marking id: CP14TieflingHorns2 bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [ CP14Tiefling ] + followSkinColor: true sprites: - - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi - state: horn2 + - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi + state: horn2 - type: marking id: CP14TieflingHorns3 bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [ CP14Tiefling ] followSkinColor: true - forcedColoring: true sprites: - - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi - state: horn3 + - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi + state: horn3 - type: marking id: CP14TieflingHorns3Broken bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [ CP14Tiefling ] followSkinColor: true - forcedColoring: true sprites: - - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi - state: horn3_broken + - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi + state: horn3_broken - type: marking id: CP14TieflingHorns4 bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [ CP14Tiefling ] followSkinColor: true - forcedColoring: true sprites: - - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi - state: horn4 + - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi + state: horn4 - type: marking id: CP14TieflingHorns5 bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [ CP14Tiefling ] followSkinColor: true - forcedColoring: true sprites: - - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi - state: horn5 + - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi + state: horn5 - type: marking id: CP14TieflingHorns5Broken bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [ CP14Tiefling ] followSkinColor: true - forcedColoring: true sprites: - - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi - state: horn5_broken + - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi + state: horn5_broken - type: marking id: CP14TieflingHorns6 bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [ CP14Tiefling ] followSkinColor: true - forcedColoring: true sprites: - - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi - state: horn6 + - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi + state: horn6 +- type: marking + id: CP14TieflingHorns7 + bodyPart: HeadTop + markingCategory: HeadTop + followSkinColor: true + sprites: + - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi + state: horn7 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Species/tiefling.yml b/Resources/Prototypes/_CP14/Species/tiefling.yml index c73691156b..bdc3b2259a 100644 --- a/Resources/Prototypes/_CP14/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Species/tiefling.yml @@ -21,7 +21,7 @@ id: CP14MobTieflingSprites sprites: Head: CP14MobTieflingHead - HeadTop: CP14MobTieflingMarkingMatchSkin + HeadTop: CP14MobTieflingAnyMarking Hair: CP14MobTieflingAnyMarking FacialHair: CP14MobTieflingAnyMarking Snout: CP14MobTieflingMarkingMatchSkin diff --git a/Resources/Textures/_CP14/Clothing/Eyes/alchemy_glasses.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Eyes/alchemy_glasses.rsi/icon.png index af13e17d22..f8d3505cd3 100644 Binary files a/Resources/Textures/_CP14/Clothing/Eyes/alchemy_glasses.rsi/icon.png and b/Resources/Textures/_CP14/Clothing/Eyes/alchemy_glasses.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Eyes/glasses.rsi/equipped-EYES.png b/Resources/Textures/_CP14/Clothing/Eyes/glasses.rsi/equipped-EYES.png new file mode 100644 index 0000000000..aa7145525b Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Eyes/glasses.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/_CP14/Clothing/Eyes/glasses.rsi/flipped-equipped-EYES.png b/Resources/Textures/_CP14/Clothing/Eyes/glasses.rsi/flipped-equipped-EYES.png new file mode 100644 index 0000000000..ca4e9fd49b Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Eyes/glasses.rsi/flipped-equipped-EYES.png differ diff --git a/Resources/Textures/_CP14/Clothing/Eyes/glasses.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Eyes/glasses.rsi/icon.png new file mode 100644 index 0000000000..2a86b49928 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Eyes/glasses.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Eyes/glasses.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Eyes/glasses.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/equipped-EYES.png b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/equipped-EYES.png deleted file mode 100644 index 5a88088f7e..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/equipped-EYES.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/flipped-equipped-EYES.png b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/flipped-equipped-EYES.png deleted file mode 100644 index e4896be4af..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/flipped-equipped-EYES.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/icon.png deleted file mode 100644 index 2b67970a80..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Eyes/gold_glasses.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/equipped-EYES.png b/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/equipped-EYES.png index 7aeb34f28e..cd375a02b4 100644 Binary files a/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/equipped-EYES.png and b/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/icon.png index 64bb6324ec..931e2cc14c 100644 Binary files a/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/icon.png and b/Resources/Textures/_CP14/Clothing/Eyes/monocle.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/antenna.png b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/antenna.png index b1aacbc33a..d203c02b0a 100644 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/antenna.png and b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/antenna.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/b.png b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/b.png index 4a195a6f33..c390453177 100644 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/b.png and b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/b.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/beehive.png b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/beehive.png index 5d2d1de17f..2bbe1a4137 100644 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/beehive.png and b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/beehive.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/braid.png b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/braid.png index 96f9bd113a..b3e6c50f7e 100644 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/braid.png and b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/braid.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/doublebun.png b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/doublebun.png index 139bb4f4e8..09bf4b1600 100644 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/doublebun.png and b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/doublebun.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json index 584d2ff429..5abd04498f 100644 --- a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json @@ -59,6 +59,18 @@ "name": "ponytail7", "directions": 4 }, + { + "name": "sidetail4", + "directions": 4 + }, + { + "name": "swept2", + "directions": 4 + }, + { + "name": "updo", + "directions": 4 + }, { "name": "vlongfringe", "directions": 4 diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/ponytail7.png b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/ponytail7.png index 6513e36997..914493872f 100644 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/ponytail7.png and b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/ponytail7.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/sidetail4.png b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/sidetail4.png new file mode 100644 index 0000000000..0117405c63 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/sidetail4.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/swept2.png b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/swept2.png new file mode 100644 index 0000000000..7c282b5652 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/swept2.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/updo.png b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/updo.png new file mode 100644 index 0000000000..b1fdfefcf8 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/updo.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/vlongfringe.png b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/vlongfringe.png index 4f0662cb45..9f14156171 100644 Binary files a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/vlongfringe.png and b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/vlongfringe.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/tiefling_horns.rsi/horn7.png b/Resources/Textures/_CP14/Mobs/Customization/tiefling_horns.rsi/horn7.png new file mode 100644 index 0000000000..e991c79004 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/tiefling_horns.rsi/horn7.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/tiefling_horns.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/tiefling_horns.rsi/meta.json index 16008cc40d..8662bc1824 100644 --- a/Resources/Textures/_CP14/Mobs/Customization/tiefling_horns.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Customization/tiefling_horns.rsi/meta.json @@ -38,6 +38,10 @@ { "name": "horn6", "directions": 4 + }, + { + "name": "horn7", + "directions": 4 } ] } \ No newline at end of file