Merge branch 'Lost-Paradise-Project:master' into master

Lost-Paradise-Project · Sep 24, 2024 · 1832832 · 1832832
2 parents 5524d19 + 4fc8329
commit 1832832
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 18 deletions.
diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml
@@ -638,7 +638,8 @@ Entries:
       message: Теперь некоторые Т3 технологии требуют очищенный алмаз!
     - type: Tweak
       message: >-
-        Портативный монитор датчиков теперь в технологии Продвинутое отслеживание!
+        Портативный монитор датчиков теперь в технологии Продвинутое
+        отслеживание!
     - type: Tweak
       message: >-
         Теперь  технология Базовое отслеживание открывает платы монитора и
@@ -668,3 +669,10 @@ Entries:
   id: 62
   time: '2024-09-23T13:14:50.0000000+00:00'
   url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/185
+- author: SpicyDarkFox
+  changes:
+    - type: Add
+      message: Добавлена возможность выбора анимированных кошачьих хвостиков
+  id: 63
+  time: '2024-09-23T18:30:37.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/193
diff --git a/Resources/Locale/ru-RU/_LostParadise/SponsorMarkingsTier.ftl b/Resources/Locale/ru-RU/_LostParadise/SponsorMarkingsTier.ftl
@@ -1,6 +1,6 @@
 sponsor-markings-tier-0 = ""
 sponsor-markings-tier-1 = { sponsor-markings-tier-0 };
 sponsor-markings-tier-2 = { sponsor-markings-tier-1 };
-sponsor-markings-tier-3 = { sponsor-markings-tier-2 };LPPVulpkaninykiteru_sponsor_hair;LPPVulpkaninhair_sponsor;LPPVulpkaninjagged_sponsor_hair;LPPTajaranHead7;CatTail;CatTailStripes;CatEars;CatEarsStubby;CatEarsCurled;CatEarsTorn;FoxEars;SlimeCatEars;SlimeCatTail;SlimeCatTailStripes;SlimeCatEarsStubby;SlimeCatEarsCurled;SlimeCatEarsTorn;SlimeFoxEars;AugmentsRoboticRightArm-robotic_r_arm;AugmentsRoboticRightArm;AugmentsRoboticRightHand-robotic_r_hand;AugmentsRoboticRightHand;LPPVulpkaninskull_sponsor;LPPVulpkaninprotogen_face;LPPVulpkanintprotogen_torso;LPPVulpkanintprotogen_legs;LPPVulpkanintprotogen_hands;LPPVulpkanintprotogen_hands_ful_gif;LPPVulpkanintprotogen_hands_l_gif;LPPVulpkanintprotogen_hands_r_gif;LPPVulpkanintprotogen_legs_ful_gif;LPPVulpkanintprotogen_legs_l_gif;LPPVulpkanintprotogen_legs_r_gif;LPPVulpkanintprotogen_hands_ful_rgb;LPPVulpkanintprotogen_hands_l_rgb;LPPVulpkanintprotogen_hands_r_rgb;LPPVulpkanintprotogen_legs_ful_rgb;LPPVulpkanintprotogen_legs_l_rgb;LPPVulpkanintprotogen_legs_r_rgb;HumanHairSpicy;HumanHairCotton;HumanHairFingerwave;HumanHairFortuneteller;HumanHairFortunetellerAlt;HumanHairLongdtails;HumanHairLooseSlicked;HumanHairQuadcurls;HumanHairShy;HumanHairWife;LPPAllsuccubus;LPPAlldurak;LPPAllhorn1;LPPAllhorn2;LPPAllhorn3;LPPAllhorn4;LPPAllhorn5;LPPAllhorn6;LPPAlllord;LPPAlloldpain;LPPAlltavrhorn;LPPAlltelehorn;LPPAllvampirehorn;LPPTattooAgent;LPPTattooTear;LPPJaw;LPPVisor;LPPRobohead;LPPIronheart;LPPProsthesisLLeg;LPPProsthesisRLeg;LPPProsthesisLHand;LPPProsthesisRHand;LPPProsthesisLWrist;LPPProsthesisRWrist;CyberlimbRArmBishop;CyberlimbLArmBishop;CyberlimbRHandBishop;CyberlimbLHandBishop;CyberlimbRLegBishop;CyberlimbLLegBishop;CyberlimbLFootBishop;CyberlimbRFootBishop;CyberlimbTorsoBishop;CyberlimbRArmHephaestus;CyberlimbLArmHephaestus;CyberlimbRHandHephaestus;CyberlimbLHandHephaestus;CyberlimbRLegHephaestus;CyberlimbLLegHephaestus;CyberlimbLFootHephaestus;CyberlimbRFootHephaestus;CyberlimbTorsoHephaestus;CyberlimbRArmHephaestusTitan;CyberlimbLArmHephaestusTitan;CyberlimbRHandHephaestusTitan;CyberlimbLHandHephaestusTitan;CyberlimbRLegHephaestusTitan;CyberlimbLLegHephaestusTitan;CyberlimbLFootHephaestusTitan;CyberlimbRFootHephaestusTitan;CyberlimbTorsoHephaestusTitan;CyberlimbRArmMorpheus;CyberlimbLArmMorpheus;CyberlimbRHandMorpheus;CyberlimbLHandMorpheus;CyberlimbRLegMorpheus;CyberlimbLLegMorpheus;CyberlimbLFootMorpheus;CyberlimbRFootMorpheus;CyberlimbTorsoMorpheus;CyberlimbRArmWardtakahashi;CyberlimbLArmWardtakahashi;CyberlimbRHandWardtakahashi;CyberlimbLHandWardtakahashi;CyberlimbRLegWardtakahashi;CyberlimbLLegWardtakahashi;CyberlimbLFootWardtakahashi;CyberlimbRFootWardtakahashi;CyberlimbTorsoWardtakahashiMale;CyberlimbTorsoWardtakahashiFemale;CyberlimbRArmZenghu;CyberlimbLArmZenghu;CyberlimbRHandZenghu;CyberlimbLHandZenghu;CyberlimbRLegZenghu;CyberlimbLLegZenghu;CyberlimbLFootZenghu;CyberlimbRFootZenghu;CyberlimbTorsoZenghu;CyberlimbRArmNanotrasen;CyberlimbLArmNanotrasen;CyberlimbRHandNanotrasen;CyberlimbLHandNanotrasen;CyberlimbRLegNanotrasen;CyberlimbLLegNanotrasen;CyberlimbLFootNanotrasen;CyberlimbRFootNanotrasen;CyberlimbTorsoNanotrasen;CyberlimbRArmXion;CyberlimbLArmXion;CyberlimbRHandXion;CyberlimbLHandXion;CyberlimbRLegXion;CyberlimbLLegXion;CyberlimbLFootXion;CyberlimbRFootXion;CyberlimbTorsoXion;LPPTailLisichkaBolsh;LPPTailLisichka;LPPTailLisichkaPushok;LPPTailLisichkaPyatna;LPPSevenTail;LPPTailVulptail;
+sponsor-markings-tier-3 = { sponsor-markings-tier-2 };LPPVulpkaninykiteru_sponsor_hair;LPPVulpkaninhair_sponsor;LPPVulpkaninjagged_sponsor_hair;LPPTajaranHead7;CatTail;CatTailStripes;CatEars;CatEarsStubby;CatEarsCurled;CatEarsTorn;FoxEars;SlimeCatEars;SlimeCatTail;SlimeCatTailStripes;SlimeCatEarsStubby;SlimeCatEarsCurled;SlimeCatEarsTorn;SlimeFoxEars;AugmentsRoboticRightArm-robotic_r_arm;AugmentsRoboticRightArm;AugmentsRoboticRightHand-robotic_r_hand;AugmentsRoboticRightHand;LPPVulpkaninskull_sponsor;LPPVulpkaninprotogen_face;LPPVulpkanintprotogen_torso;LPPVulpkanintprotogen_legs;LPPVulpkanintprotogen_hands;LPPVulpkanintprotogen_hands_ful_gif;LPPVulpkanintprotogen_hands_l_gif;LPPVulpkanintprotogen_hands_r_gif;LPPVulpkanintprotogen_legs_ful_gif;LPPVulpkanintprotogen_legs_l_gif;LPPVulpkanintprotogen_legs_r_gif;LPPVulpkanintprotogen_hands_ful_rgb;LPPVulpkanintprotogen_hands_l_rgb;LPPVulpkanintprotogen_hands_r_rgb;LPPVulpkanintprotogen_legs_ful_rgb;LPPVulpkanintprotogen_legs_l_rgb;LPPVulpkanintprotogen_legs_r_rgb;HumanHairSpicy;HumanHairCotton;HumanHairFingerwave;HumanHairFortuneteller;HumanHairFortunetellerAlt;HumanHairLongdtails;HumanHairLooseSlicked;HumanHairQuadcurls;HumanHairShy;HumanHairWife;LPPAllsuccubus;LPPAlldurak;LPPAllhorn1;LPPAllhorn2;LPPAllhorn3;LPPAllhorn4;LPPAllhorn5;LPPAllhorn6;LPPAlllord;LPPAlloldpain;LPPAlltavrhorn;LPPAlltelehorn;LPPAllvampirehorn;LPPTattooAgent;LPPTattooTear;LPPJaw;LPPVisor;LPPRobohead;LPPIronheart;LPPProsthesisLLeg;LPPProsthesisRLeg;LPPProsthesisLHand;LPPProsthesisRHand;LPPProsthesisLWrist;LPPProsthesisRWrist;CyberlimbRArmBishop;CyberlimbLArmBishop;CyberlimbRHandBishop;CyberlimbLHandBishop;CyberlimbRLegBishop;CyberlimbLLegBishop;CyberlimbLFootBishop;CyberlimbRFootBishop;CyberlimbTorsoBishop;CyberlimbRArmHephaestus;CyberlimbLArmHephaestus;CyberlimbRHandHephaestus;CyberlimbLHandHephaestus;CyberlimbRLegHephaestus;CyberlimbLLegHephaestus;CyberlimbLFootHephaestus;CyberlimbRFootHephaestus;CyberlimbTorsoHephaestus;CyberlimbRArmHephaestusTitan;CyberlimbLArmHephaestusTitan;CyberlimbRHandHephaestusTitan;CyberlimbLHandHephaestusTitan;CyberlimbRLegHephaestusTitan;CyberlimbLLegHephaestusTitan;CyberlimbLFootHephaestusTitan;CyberlimbRFootHephaestusTitan;CyberlimbTorsoHephaestusTitan;CyberlimbRArmMorpheus;CyberlimbLArmMorpheus;CyberlimbRHandMorpheus;CyberlimbLHandMorpheus;CyberlimbRLegMorpheus;CyberlimbLLegMorpheus;CyberlimbLFootMorpheus;CyberlimbRFootMorpheus;CyberlimbTorsoMorpheus;CyberlimbRArmWardtakahashi;CyberlimbLArmWardtakahashi;CyberlimbRHandWardtakahashi;CyberlimbLHandWardtakahashi;CyberlimbRLegWardtakahashi;CyberlimbLLegWardtakahashi;CyberlimbLFootWardtakahashi;CyberlimbRFootWardtakahashi;CyberlimbTorsoWardtakahashiMale;CyberlimbTorsoWardtakahashiFemale;CyberlimbRArmZenghu;CyberlimbLArmZenghu;CyberlimbRHandZenghu;CyberlimbLHandZenghu;CyberlimbRLegZenghu;CyberlimbLLegZenghu;CyberlimbLFootZenghu;CyberlimbRFootZenghu;CyberlimbTorsoZenghu;CyberlimbRArmNanotrasen;CyberlimbLArmNanotrasen;CyberlimbRHandNanotrasen;CyberlimbLHandNanotrasen;CyberlimbRLegNanotrasen;CyberlimbLLegNanotrasen;CyberlimbLFootNanotrasen;CyberlimbRFootNanotrasen;CyberlimbTorsoNanotrasen;CyberlimbRArmXion;CyberlimbLArmXion;CyberlimbRHandXion;CyberlimbLHandXion;CyberlimbRLegXion;CyberlimbLLegXion;CyberlimbLFootXion;CyberlimbRFootXion;CyberlimbTorsoXion;LPPTailLisichkaBolsh;LPPTailLisichka;LPPTailLisichkaPushok;LPPTailLisichkaPyatna;LPPSevenTail;LPPTailVulptail;FelinidEarsBasic;FelinidEarsCurled;FelinidEarsDroopy;FelinidEarsFuzzy;FelinidEarsStubby;FelinidEarsTall;FelinidEarsTorn;FelinidEarsWide;FelinidTailBasic;FelinidTailBasicWithBow;FelinidTailBasicWithBell;FelinidTailBasicWithBowAndBell;FelinidFluffyTailRings;FelinidFluffyTail;FelinidAlternativeTail
 sponsor-markings-tier-4 = { sponsor-markings-tier-3 };
 sponsor-markings-tier-5 = { sponsor-markings-tier-4 };
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml
@@ -2,7 +2,8 @@
   id: FelinidFluffyTailRings
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Felinid]
+  # speciesRestriction: [Felinid]
+  sponsorOnly: true
   sprites:
   - sprite: DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi
     state: Felinid_fluffy_tail_full
@@ -13,7 +14,8 @@
   id: FelinidFluffyTail
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Felinid]
+  # speciesRestriction: [Felinid]
+  sponsorOnly: true
   sprites:
   - sprite: DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi
     state: Felinid_fluffy_tail_full
@@ -22,8 +24,8 @@
   id: FelinidAlternativeTail
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Felinid]
+  #speciesRestriction: [Felinid]
+  sponsorOnly: true
   sprites:
     - sprite: DeltaV/Mobs/Customization/Felinid/alternative_tail.rsi
       state: m_waggingtail_cat_FRONT
-
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/felinid.yml
@@ -4,7 +4,8 @@
   id: FelinidEarsBasic
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Felinid]
+  # speciesRestriction: [Felinid]
+  sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: basic_outer
@@ -15,7 +16,8 @@
   id: FelinidEarsCurled
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Felinid]
+  # speciesRestriction: [Felinid]
+  sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: curled_outer
@@ -26,7 +28,8 @@
   id: FelinidEarsDroopy
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Felinid]
+  # speciesRestriction: [Felinid]
+  sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: droopy_outer
@@ -37,7 +40,8 @@
   id: FelinidEarsFuzzy
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Felinid]
+  # speciesRestriction: [Felinid]
+  sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: basic_outer
@@ -48,7 +52,8 @@
   id: FelinidEarsStubby
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Felinid]
+  # speciesRestriction: [Felinid]
+  sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: stubby_outer
@@ -59,7 +64,8 @@
   id: FelinidEarsTall
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Felinid]
+  # speciesRestriction: [Felinid]
+  sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: tall_outer
@@ -72,7 +78,8 @@
   id: FelinidEarsTorn
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Felinid]
+  # speciesRestriction: [Felinid]
+  sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: torn_outer
@@ -83,7 +90,8 @@
   id: FelinidEarsWide
   bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Felinid]
+  # speciesRestriction: [Felinid]
+  sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: wide_outer
@@ -96,7 +104,8 @@
   id: FelinidTailBasic
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Felinid]
+  # speciesRestriction: [Felinid]
+  sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
     state: basic_tail_tip
@@ -109,7 +118,8 @@
   id: FelinidTailBasicWithBow
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Felinid]
+  # speciesRestriction: [Felinid]
+  sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
     state: basic_tail_tip
@@ -124,7 +134,8 @@
   id: FelinidTailBasicWithBell
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Felinid]
+  # speciesRestriction: [Felinid]
+  sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
     state: basic_tail_tip
@@ -139,7 +150,8 @@
   id: FelinidTailBasicWithBowAndBell
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [Felinid]
+  # speciesRestriction: [Felinid]
+  sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
     state: basic_tail_tip