Merge branch 'ed-31-08-2025-kenku' of https://github.com/crystallpunk-14/crystall-punk-14 into ed-31-08-2025-kenku

* fixes

* Update silva.yml

Content.Client/_CP14/GodRays/CP14GodRaysSystem.cs

@@ -0,0 +1,40 @@
+using Robust.Client.GameObjects;
+using Robust.Shared.Map.Components;
+
+namespace Content.Client._CP14.GodRays;
+
+public sealed partial class CP14GodRaysSystem : EntitySystem
+{
+    [Dependency] private readonly SpriteSystem _sprite = default!;
+    [Dependency] private readonly PointLightSystem _pointLight = default!;
+
+    private EntityQuery<MapLightComponent> _mapLightQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _mapLightQuery = GetEntityQuery<MapLightComponent>();
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var spriteSync = EntityQueryEnumerator<CP14SyncColorWithMapLightComponent>();
+        while (spriteSync.MoveNext(out var uid, out _))
+        {
+            if (!_mapLightQuery.TryComp(Transform(uid).MapUid, out var map))
+                continue;
+
+            //We calculate target color as map color, but transparency is based on map color brightness
+            var targetColor = Color.ToHsv(map.AmbientLightColor);
+            targetColor.W = targetColor.Z / 2;
+
+            var finalColor = Color.FromHsv(targetColor);
+
+            _sprite.SetColor(uid, finalColor);
+            _pointLight.SetColor(uid, finalColor);
+        }
+    }
+}

Content.Client/_CP14/GodRays/CP14SyncColorWithMapLightComponent.cs

@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Client._CP14.GodRays;
+
+/// <summary>
+/// Sync PointLight color and Sprite color with map light color
+/// </summary>
+[RegisterComponent]
+public sealed partial class CP14SyncColorWithMapLightComponent : Component
+{
+}

Content.Server/Entry/IgnoredComponents.cs

@@ -4,7 +4,10 @@ namespace Content.Server.Entry
     public static class IgnoredComponents
     {
         public static string[] List => new[] {
-            "CP14WaveShader", // CP14 Wave shader
+            //CP14 start
+            "CP14SyncColorWithMapLight",
+            "CP14WaveShader",
+            //CP14 rnd
             "ConstructionGhost",
             "IconSmooth",
             "InteractionOutline",

Content.Server/_CP14/Procedural/CP14SpawnProceduralLocationJob.cs

@@ -82,6 +82,9 @@ public sealed class CP14SpawnProceduralLocationJob(
 
         map.SetPaused(mapId, false);
 
+        //Add map components
+        entManager.AddComponents(MapUid, locationConfig.Components);
+
         //Spawn modified config
         await WaitAsyncTask(dungeon.GenerateDungeonAsync(dungeonConfig,
             MapUid,
@@ -89,9 +92,6 @@ public sealed class CP14SpawnProceduralLocationJob(
             position,
             seed));
 
-        //Add map components
-        entManager.AddComponents(MapUid, locationConfig.Components);
-
         return true;
     }
 }

Content.Server/_CP14/Roof/CP14RoofSystem.cs

@@ -0,0 +1,53 @@
+using Content.Shared.Light.EntitySystems;
+using Robust.Shared.Map.Components;
+
+namespace Content.Server._CP14.Roof;
+
+/// <inheritdoc/>
+public sealed class CP14RoofSystem : EntitySystem
+{
+    [Dependency] private readonly SharedMapSystem _maps = default!;
+    [Dependency] private readonly SharedRoofSystem _roof = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<CP14SetGridRoovedComponent, ComponentStartup>(OnRoofStartup);
+        SubscribeLocalEvent<CP14SetGridUnroovedComponent, ComponentStartup>(OnRoofStartup);
+        SubscribeLocalEvent<CP14SetGridRoovedComponent, TileChangedEvent>(OnTileChanged);
+    }
+
+    private void OnTileChanged(Entity<CP14SetGridRoovedComponent> ent, ref TileChangedEvent args)
+    {
+        foreach (var changed in args.Changes)
+        {
+            if (changed.OldTile.IsEmpty)
+                _roof.SetRoof(ent.Owner, changed.GridIndices, true);
+        }
+    }
+
+    private void OnRoofStartup(Entity<CP14SetGridRoovedComponent> ent, ref ComponentStartup args)
+    {
+        if (!TryComp<MapGridComponent>(ent.Owner, out var gridComp))
+            return;
+
+        var enumerator = _maps.GetAllTilesEnumerator(ent, gridComp);
+        while (enumerator.MoveNext(out var tileRef))
+        {
+            _roof.SetRoof(ent.Owner, tileRef.Value.GridIndices, true);
+        }
+    }
+
+    private void OnRoofStartup(Entity<CP14SetGridUnroovedComponent> ent, ref ComponentStartup args)
+    {
+        if (!TryComp<MapGridComponent>(ent.Owner, out var gridComp))
+            return;
+
+        var enumerator = _maps.GetAllTilesEnumerator(ent, gridComp);
+        while (enumerator.MoveNext(out var tileRef))
+        {
+            _roof.SetRoof(ent.Owner, tileRef.Value.GridIndices, false);
+        }
+    }
+}

Content.Server/_CP14/Roof/CP14SetGridRoovedComponent.cs

@@ -0,0 +1,17 @@
+namespace Content.Server._CP14.Roof;
+
+/// <summary>
+/// When added, marks ALL tiles on grid as rooved
+/// </summary>
+[RegisterComponent]
+public sealed partial class CP14SetGridRoovedComponent : Component
+{
+}
+
+/// <summary>
+/// When added, marks ALL tiles on grid as unrooved
+/// </summary>
+[RegisterComponent]
+public sealed partial class CP14SetGridUnroovedComponent : Component
+{
+}

Content.Shared/Actions/SharedActionsSystem.DoAfter.cs

@@ -1,6 +1,8 @@
 using Content.Shared._CP14.Actions;
+using Content.Shared.Actions.Components;
 using Content.Shared.Actions.Events;
 using Content.Shared.DoAfter;
+using Content.Shared.Item;
 
 namespace Content.Shared.Actions;
 
@@ -22,13 +24,21 @@ public abstract partial class SharedActionsSystem
         var netEnt = GetNetEntity(performer);
 
         //CP14 doAfter start event
+        var target = GetEntity(input.EntityTarget);
+        EntityUid? used = null;
+
+        if (TryComp<ActionComponent>(ent, out var action) && HasComp<ItemComponent>(action.Container))
+        {
+            used = action.Container;
+        }
+
         var cp14StartEv = new CP14ActionStartDoAfterEvent(netEnt, input);
         RaiseLocalEvent(ent, cp14StartEv);
         //CP14 end
 
         var actionDoAfterEvent = new ActionDoAfterEvent(netEnt, originalUseDelay, input);
 
-        var doAfterArgs = new DoAfterArgs(EntityManager, performer, delay, actionDoAfterEvent, ent.Owner, performer)
+        var doAfterArgs = new DoAfterArgs(EntityManager, performer, delay, actionDoAfterEvent, ent.Owner, target ?? performer, used) //CP14 edited target and added used
         {
             AttemptFrequency = ent.Comp.AttemptFrequency,
             Broadcast = ent.Comp.Broadcast,
@@ -74,6 +84,11 @@ public abstract partial class SharedActionsSystem
             SetUseDelay(action, TimeSpan.Zero);
         }
 
+        //CP14 start delay after cancelling for preventing spamming
+        if (args.Cancelled)
+            StartUseDelay(action);
+        //CP14 end
+
         if (args.Cancelled)
             return;
 

Content.Shared/CCVar/CCVars.Localization.cs

@@ -8,5 +8,5 @@ public sealed partial class CCVars
     ///     Language used for the in-game localization.
     /// </summary>
     public static readonly CVarDef<string> Language =
-        CVarDef.Create("localization.language", "en-US", CVar.SERVER | CVar.REPLICATED);
+        CVarDef.Create("loc.server_language", "en-US", CVar.SERVER | CVar.REPLICATED);
 }

Content.Shared/_CP14/Procedural/Prototypes/CP14ProceduralModifierPrototype.cs

@@ -43,7 +43,7 @@ public sealed partial class CP14ProceduralModifierPrototype : IPrototype
     /// Can this modifier be generated multiple times within a single location?
     /// </summary>
     [DataField]
-    public bool Unique = false;
+    public bool Unique = true;
 
     /// <summary>
     /// Generation layers that will be added to the location generation after the main layers.

Resources/Changelog/CP14_Changelog.yml

@@ -2229,3 +2229,71 @@
   id: 8271
   time: '2025-09-23T10:23:39.0000000+00:00'
   url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1773
+- author: oldschoolotaku
+  changes:
+  - message: New fancy mustage "Hussar"
+    type: Add
+  id: 8272
+  time: '2025-09-25T11:25:10.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1797
+- author: Nimfar11
+  changes:
+  - message: Adds money to the wallets of some walking dead.
+    type: Add
+  - message: Wallets can be cut into scraps of leather.
+    type: Tweak
+  - message: The walking dead can be women.
+    type: Fix
+  id: 8273
+  time: '2025-09-25T21:26:03.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1799
+- author: KittyCat432
+  changes:
+  - message: Silva's now contain plant organs.
+    type: Tweak
+  - message: Water and life-giving moisture regenerates 0.2 and 4 mana respectively
+      when in a plant organ.
+    type: Tweak
+  - message: Liquid mana now regenerates 3 mana up from 1.5.
+    type: Tweak
+  id: 8274
+  time: '2025-09-26T16:31:02.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1789
+- author: Trosling
+  changes:
+  - message: Underground demi-planes may now have holes in the ceiling, allowing sunlight
+      or rain to pour in. This is affect silvas, plants, vampires and others sunlight-reated
+      things
+    type: Add
+  id: 8275
+  time: '2025-09-27T19:14:11.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1803
+- author: KittyCat432
+  changes:
+  - message: Most spells break when receiving damage again, excluding sprint, ballad
+      spells, and other pure utility spells.
+    type: Tweak
+  - message: Cure wounds/burns and blood purification cost 10 mana instead of 12 again.
+    type: Tweak
+  - message: Shields are more susceptible to breaking from blunt damage and for wooden
+      ones heat aswell.
+    type: Tweak
+  - message: Buckler and wooden shield damage resistances have been modified for the
+      shield to take less damage.
+    type: Tweak
+  - message: All shields have had their health increased by 50.
+    type: Tweak
+  id: 8276
+  time: '2025-09-27T19:17:27.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1804
+- author: TheShuEd
+  changes:
+  - message: Spells are interrupted again if players move far away from target or
+      drop the item used for casting, or loses sight of the target
+    type: Fix
+  - message: After an interrupted spell cast, the cooldown begins again, preventing
+      spamming.
+    type: Fix
+  id: 8277
+  time: '2025-09-28T08:16:52.0000000+00:00'
+  url: https://github.com/crystallpunk-14/crystall-punk-14/pull/1805

Resources/ConfigPresets/_CP14/Dev.toml

@@ -1,8 +1,8 @@
 [whitelist]
 enabled = true
 
-[localization]
-language = "en-US"
+[loc]
+server_language = "en-US"
 
 [log]
 path = "logs"

Resources/Locale/en-US/_CP14/markings/human-facial-hair.ftl

@@ -31,4 +31,5 @@ marking-CP14HumanFacialHairVandyke = evening branch
 marking-CP14HumanFacialHairVolaju = steppe fringe
 marking-CP14HumanFacialHairWalrus = walrus storm
 marking-CP14HumanFacialHairWatson = scholarly classic
-marking-CP14HumanFacialHairWise = runebound
+marking-CP14HumanFacialHairWise = runebound
+marking-CP14HumanFacialHairHussar = hussar

Resources/Locale/en-US/_CP14/species/species-names.ftl

@@ -629,3 +629,67 @@ cp14-species-name-carcat-first-47 = Roar of the Rockfall
 cp14-species-name-carcat-first-48 = Scent of Old Paper  
 cp14-species-name-carcat-first-49 = Night Crossroads  
 cp14-species-name-carcat-first-50 = Gloom of the Primeval Forest  
+
+# CARRIN
+
+cp14-species-name-carrin-male-first-1 = Hayakatih
+cp14-species-name-carrin-male-first-2 = Kiahatak
+cp14-species-name-carrin-male-first-3 = Yakighat
+cp14-species-name-carrin-male-first-4 = Haykatak
+cp14-species-name-carrin-male-first-5 = Katakiyak
+cp14-species-name-carrin-male-first-6 = Yakahat
+cp14-species-name-carrin-male-first-7 = Haigikat
+cp14-species-name-carrin-male-first-8 = Kihatah
+cp14-species-name-carrin-male-first-9 = Yakatik
+cp14-species-name-carrin-male-first-10 = Khatiyakh
+cp14-species-name-carrin-male-first-11 = Hayaktah
+cp14-species-name-carrin-male-first-12 = Kiahatic
+cp14-species-name-carrin-male-first-13 = Yahakat
+cp14-species-name-carrin-male-first-14 = Haykatik
+cp14-species-name-carrin-male-first-15 = Catacah
+cp14-species-name-carrin-male-first-16 = Yakhati
+cp14-species-name-carrin-male-first-17 = Hayagtah
+cp14-species-name-carrin-male-first-18 = Kihayakt
+cp14-species-name-carrin-male-first-19 = Yahikat
+cp14-species-name-carrin-male-first-20 = Hatiqah
+cp14-species-name-carrin-male-first-21 = Kiaktahi
+cp14-species-name-carrin-male-first-22 = Yatahik
+cp14-species-name-carrin-male-first-23 = Haiktahi
+cp14-species-name-carrin-male-first-24 = Kiyakaht
+cp14-species-name-carrin-male-first-25 = Yaktahi
+cp14-species-name-carrin-male-first-26 = Haitikah
+cp14-species-name-carrin-male-first-27 = Kiahatak
+cp14-species-name-carrin-male-first-28 = Yakitah
+cp14-species-name-carrin-male-first-29 = Hayaktahi
+cp14-species-name-carrin-male-first-30 = Kihatik
+cp14-species-name-carrin-male-first-31 = Yahiktah
+cp14-species-name-carrin-male-first-32 = Hatikaha
+cp14-species-name-carrin-male-first-33 = Kiahatyah
+cp14-species-name-carrin-male-first-34 = Yaktahai
+cp14-species-name-carrin-male-first-35 = Haykahti
+
+cp14-species-name-carrin-last-1 = Hayakakat
+cp14-species-name-carrin-last-2 = Kigakatiya
+cp14-species-name-carrin-last-3 = Yakihakai
+cp14-species-name-carrin-last-4 = Hatiyakaiki
+cp14-species-name-carrin-last-5 = Kiyahaitiak
+cp14-species-name-carrin-last-6 = Yagakatiyaha
+cp14-species-name-carrin-last-7 = Hayakatihai
+cp14-species-name-carrin-last-8 = Katakiyyaha
+cp14-species-name-carrin-last-9 = Yikikaitahi
+cp14-species-name-carrin-last-10 = Hayakatiha
+cp14-species-name-carrin-last-11 = Kiitahayaka
+cp14-species-name-carrin-last-12 = Yakyahaitia
+cp14-species-name-carrin-last-13 = Haygyakata
+cp14-species-name-carrin-last-14 = Kiyakataha
+cp14-species-name-carrin-last-15 = Hayakakakaiha
+cp14-species-name-carrin-last-16 = Yikihayakat
+cp14-species-name-carrin-last-17 = Hatiyakyaka
+cp14-species-name-carrin-last-18 = Kaigatahiya
+cp14-species-name-carrin-last-19 = Hayakaitiya
+cp14-species-name-carrin-last-20 = Yikihatahai
+cp14-species-name-carrin-last-21 = Hatiyakahai
+cp14-species-name-carrin-last-22 = Kiahakatia
+cp14-species-name-carrin-last-23 = Yaikakiyaha
+cp14-species-name-carrin-last-24 = Haytiakahai
+cp14-species-name-carrin-last-25 = Kayahakitia

Resources/Locale/en-US/_CP14/species/species.ftl

@@ -5,4 +5,5 @@ cp14-species-name-elf = Elf
 cp14-species-name-goblin = Goblin
 cp14-species-name-silva = Silva
 cp14-species-name-carcat = Carcat
-cp14-species-name-skeleton = Skeleton
+cp14-species-name-skeleton = Skeleton
+cp14-species-name-carrin = Carrin

Resources/Locale/ru-RU/_CP14/markings/human-facial-hair.ftl

@@ -11,4 +11,5 @@ marking-CP14HumanFacialHairMutton = Баранья
 marking-CP14HumanFacialHairPigtail = Косичка
 marking-CP14HumanFacialHairSage = Ман Чу
 marking-CP14HumanFacialHairWatson = Ватсон
-marking-CP14HumanFacialHairWhiskers = Бакенбарды
+marking-CP14HumanFacialHairWhiskers = Бакенбарды
+marking-CP14HumanFacialHairHussar = Гусарские

Resources/Locale/ru-RU/_CP14/species/species-names.ftl

@@ -630,4 +630,68 @@ cp14-species-name-carcat-first-46 = Огонёк Над Трясиной
 cp14-species-name-carcat-first-47 = Грохот Камнепада
 cp14-species-name-carcat-first-48 = Запах Старой Бумаги
 cp14-species-name-carcat-first-49 = Ночной Перекрёсток
-cp14-species-name-carcat-first-50 = Мгла Дремучего Леса
+cp14-species-name-carcat-first-50 = Мгла Дремучего Леса
+
+# CARRIN
+
+cp14-species-name-carrin-male-first-1 = Хаякатих
+cp14-species-name-carrin-male-first-2 = Киахатак
+cp14-species-name-carrin-male-first-3 = Йакигхат
+cp14-species-name-carrin-male-first-4 = Хайкатак
+cp14-species-name-carrin-male-first-5 = Катакияк
+cp14-species-name-carrin-male-first-6 = Йакахат
+cp14-species-name-carrin-male-first-7 = Хайгикат
+cp14-species-name-carrin-male-first-8 = Кихатах
+cp14-species-name-carrin-male-first-9 = Йакатик
+cp14-species-name-carrin-male-first-10 = Хатиякх
+cp14-species-name-carrin-male-first-11 = Хаяктах
+cp14-species-name-carrin-male-first-12 = Киахатик
+cp14-species-name-carrin-male-first-13 = Йахакат
+cp14-species-name-carrin-male-first-14 = Хайкатик
+cp14-species-name-carrin-male-first-15 = Катаках
+cp14-species-name-carrin-male-first-16 = Йакхати
+cp14-species-name-carrin-male-first-17 = Хаягтах
+cp14-species-name-carrin-male-first-18 = Кихаякт
+cp14-species-name-carrin-male-first-19 = Йахикат
+cp14-species-name-carrin-male-first-20 = Хатикях
+cp14-species-name-carrin-male-first-21 = Киактахи
+cp14-species-name-carrin-male-first-22 = Йатахик
+cp14-species-name-carrin-male-first-23 = Хайктахи
+cp14-species-name-carrin-male-first-24 = Киякахт
+cp14-species-name-carrin-male-first-25 = Йактахи
+cp14-species-name-carrin-male-first-26 = Хайтиках
+cp14-species-name-carrin-male-first-27 = Киахатак
+cp14-species-name-carrin-male-first-28 = Йакитах
+cp14-species-name-carrin-male-first-29 = Хаяктахи
+cp14-species-name-carrin-male-first-30 = Кихатик
+cp14-species-name-carrin-male-first-31 = Йахиктах
+cp14-species-name-carrin-male-first-32 = Хатикяха
+cp14-species-name-carrin-male-first-33 = Киахатях
+cp14-species-name-carrin-male-first-34 = Йактахай
+cp14-species-name-carrin-male-first-35 = Хайкахти
+
+cp14-species-name-carrin-last-1 = Хайякакат
+cp14-species-name-carrin-last-2 = Кигакатия
+cp14-species-name-carrin-last-3 = Йакихакаи
+cp14-species-name-carrin-last-4 = Хатиякайки
+cp14-species-name-carrin-last-5 = Кияхайтиак
+cp14-species-name-carrin-last-6 = Йагакатияха
+cp14-species-name-carrin-last-7 = Хаякатихай
+cp14-species-name-carrin-last-8 = Катакийяха
+cp14-species-name-carrin-last-9 = Йикикайтахи
+cp14-species-name-carrin-last-10 = Хайякатиха
+cp14-species-name-carrin-last-11 = Киайтахаяка
+cp14-species-name-carrin-last-12 = Йакяхаитиа
+cp14-species-name-carrin-last-13 = Хайгияката
+cp14-species-name-carrin-last-14 = Кийакатаха
+cp14-species-name-carrin-last-15 = Хаякакайха
+cp14-species-name-carrin-last-16 = Йикихаякат
+cp14-species-name-carrin-last-17 = Хатиякьяка
+cp14-species-name-carrin-last-18 = Кайгатахия
+cp14-species-name-carrin-last-19 = Хаякаития
+cp14-species-name-carrin-last-20 = Йикихатахай
+cp14-species-name-carrin-last-21 = Хатиякахай
+cp14-species-name-carrin-last-22 = Кияхакатиа
+cp14-species-name-carrin-last-23 = Йаикакияха
+cp14-species-name-carrin-last-24 = Хайтиакахай
+cp14-species-name-carrin-last-25 = Каяхакития

Resources/Locale/ru-RU/_CP14/species/species.ftl

@@ -5,4 +5,5 @@ cp14-species-name-elf = Эльф
 cp14-species-name-goblin = Гоблин
 cp14-species-name-silva = Сильва
 cp14-species-name-carcat = Каркат
-cp14-species-name-skeleton = Скелет
+cp14-species-name-skeleton = Скелет
+cp14-species-name-carrin = Каррин

Resources/Prototypes/Body/Organs/diona.yml

@@ -108,7 +108,7 @@
   - type: Item
     size: Small
     heldPrefix: lungs
-  - type: Lung 
+  - type: Lung
   - type: Metabolizer
     removeEmpty: true
     solutionOnBody: false
@@ -137,7 +137,7 @@
   description: "The source of incredible, unending intelligence. Honk."
   components:
   - type: Brain
-  - type: Nymph # This will make the organs turn into a nymph when they're removed. 
+  - type: Nymph # This will make the organs turn into a nymph when they're removed.
     entityPrototype: OrganDionaNymphBrain
     transferMind: true
 
@@ -176,11 +176,11 @@
 
 - type: entity
   id: OrganDionaNymphStomach
-  parent: MobDionaNymphAccent 
+  parent: MobDionaNymphAccent
   categories: [ HideSpawnMenu ]
   name: diona nymph
   suffix: Stomach
-  description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it. 
+  description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it.
   components:
   - type: IsDeadIC
   - type: Body
@@ -192,7 +192,7 @@
   categories: [ HideSpawnMenu ]
   name: diona nymph
   suffix: Lungs
-  description: Contains the lungs of a formerly fully-formed Diona. Breathtaking. 
+  description: Contains the lungs of a formerly fully-formed Diona. Breathtaking.
   components:
   - type: IsDeadIC
   - type: Body

Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml

@@ -450,6 +450,12 @@
       effects:
       - !type:SatiateThirst
         factor: 4
+      - !type:CP14ManaChange #CE change
+        manaDelta: 0.2
+        safe: true
+        conditions:
+        - !type:OrganType
+          type: Plant
     Gas:
       effects:
       - !type:HealthChange

Resources/Prototypes/_CP14/Body/Organs/silva.yml

@@ -0,0 +1,133 @@
+- type: entity
+  id: CP14BaseSilvaOrgan
+  parent: BaseItem
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Diona/organs.rsi
+  - type: Organ
+  - type: Food
+  - type: Extractable
+    grindableSolutionName: organ
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+  - type: FlavorProfile
+    flavors:
+    - people
+
+- type: entity
+  id: CP14OrganSilvaBrain
+  parent: [CP14BaseSilvaOrgan, OrganHumanBrain]
+  categories: [ ForkFiltered ]
+  name: brain
+  description: "The central hub of a silva's pseudo-neurological activity, its root-like tendrils search for its former body."
+  components:
+  - type: Item
+    size: Small
+    heldPrefix: brain
+  - type: Sprite
+    state: brain
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      Lung:
+        maxVol: 100
+        canReact: False
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: GreyMatter
+          Quantity: 5
+
+- type: entity
+  id: CP14OrganSilvaEyes
+  parent: CP14BaseSilvaOrgan
+  categories: [ ForkFiltered ]
+  name: eyes
+  description: "I see you!"
+  components:
+  - type: Sprite
+    layers:
+    - state: eyeball-l
+    - state: eyeball-r
+
+- type: entity
+  id: CP14OrganSilvaStomach
+  parent: CP14BaseSilvaOrgan
+  categories: [ ForkFiltered ]
+  name: stomach
+  description: "The silva's equivalent of a stomach, it reeks of asparagus and vinegar."
+  components:
+  - type: Sprite
+    state: stomach
+  - type: SolutionContainerManager
+    solutions:
+      stomach:
+        maxVol: 50
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+  - type: Stomach
+  - type: Metabolizer
+    maxReagents: 2
+    metabolizerTypes: [ Plant ]
+    removeEmpty: true
+    groups:
+    - id: Food
+    - id: Drink
+    - id: Medicine
+    - id: Poison
+    - id: Narcotic
+    - id: Alcohol
+      rateModifier: 0.1
+  - type: Item
+    size: Small
+    heldPrefix: stomach
+
+- type: entity
+  id: CP14OrganSilvaLungs
+  parent: CP14BaseSilvaOrgan
+  categories: [ ForkFiltered ]
+  name: lungs
+  description: "A spongy mess of slimy, leaf-like structures. Capable of breathing both carbon dioxide and oxygen."
+  components:
+  - type: Sprite
+    state: lungs
+  - type: Item
+    size: Small
+    heldPrefix: lungs
+  - type: Lung
+  - type: Metabolizer
+    removeEmpty: true
+    solutionOnBody: false
+    solution: "Lung"
+    metabolizerTypes: [ Plant ]
+    groups:
+    - id: Gas
+      rateModifier: 100.0
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      Lung:
+        maxVol: 100
+        canReact: False

Resources/Prototypes/_CP14/Body/Prototypes/carrin.yml

@@ -0,0 +1,49 @@
+- type: body
+  id: CP14Carrin
+  name: human
+  root: torso
+  slots:
+    head:
+      part: CP14HeadHuman
+      connections:
+      - torso
+      organs:
+        brain: OrganHumanBrain
+        eyes: OrganHumanEyes
+    torso:
+      part: TorsoHuman
+      connections:
+      - right_arm
+      - left_arm
+      - right_leg
+      - left_leg
+      organs:
+        lungs: OrganAnimalLungs
+        stomach: OrganAnimalStomach
+        liver: OrganAnimalLiver
+        heart: OrganAnimalHeart
+        kidneys: OrganAnimalKidneys
+    right_arm:
+      part: CP14RightArmHuman
+      connections:
+      - right_hand
+    left_arm:
+      part: CP14LeftArmHuman
+      connections:
+      - left_hand
+    right_hand:
+      part: CP14RightHandHuman
+    left_hand:
+      part: CP14LeftHandHuman
+    right_leg:
+      part: CP14RightLegHuman
+      connections:
+      - right_foot
+    left_leg:
+      part: CP14LeftLegHuman
+      connections:
+      - left_foot
+    right_foot:
+      part: CP14RightFootHuman
+    left_foot:
+      part: CP14LeftFootHuman

Resources/Prototypes/_CP14/Body/Prototypes/silva.yml

@@ -8,21 +8,18 @@
       connections:
         - torso
       organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
+        brain: CP14OrganSilvaBrain
+        eyes: CP14OrganSilvaEyes
     torso:
-      part: TorsoHuman
+      part: TorsoDiona
       connections:
         - right_arm
         - left_arm
         - right_leg
         - left_leg
       organs:
-        heart: OrganHumanHeart
-        lungs: OrganHumanLungs
-        stomach: OrganHumanStomach
-        liver: OrganHumanLiver
-        kidneys: OrganHumanKidneys
+        lungs: CP14OrganSilvaLungs
+        stomach: CP14OrganSilvaStomach
     right_arm:
       part: CP14RightArmHuman
       connections:

Resources/Prototypes/_CP14/Datasets/Names/species-names.yml

@@ -114,3 +114,17 @@
   values:
     prefix: cp14-species-name-carcat-first-
     count: 50
+
+# Carrin
+
+- type: localizedDataset
+  id: CP14_Names_Carrin_First
+  values:
+    prefix: cp14-species-name-carrin-male-first-
+    count: 35
+
+- type: localizedDataset
+  id: CP14_Names_Carrin_Last
+  values:
+    prefix: cp14-species-name-carrin-last-
+    count: 25

Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/lightning_strike.yml

@@ -23,6 +23,7 @@
     range: 5
   - type: DoAfterArgs
     delay: 2
+    breakOnDamage: true
   - type: EntityTargetAction
     canTargetSelf: false
     event: !type:CP14EntityTargetModularEffectEvent
@@ -103,4 +104,4 @@
     layers:
     - state: medium_circle
       color: "#e8ff4c"
-      shader: unshaded
+      shader: unshaded

Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/heat.yml

@@ -14,7 +14,7 @@
     proto: CP14RuneHeat
   - type: CP14ActionDangerous
   - type: Action
-    useDelay: 8
+    useDelay: 4
     icon:
       sprite: _CP14/Actions/Spells/fire.rsi
       state: heat

Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/air_saturation.yml

@@ -10,8 +10,8 @@
     manaCost: 5
   - type: DoAfterArgs
     repeat: true
-    delay: 1
-    breakOnMove: true
+    delay: 2
+    breakOnDamage: true
   - type: CP14ActionDoAfterVisuals
     proto: CP14RuneAirSaturation
   - type: Action

Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_heat.yml

@@ -7,7 +7,7 @@
   - type: CP14ActionDoAfterSlowdown
     speedMultiplier: 0.5
   - type: CP14ActionManaCost
-    manaCost: 12
+    manaCost: 10
   - type: CP14ActionTargetMobStatusRequired
   - type: CP14ActionSpeaking
     startSpeech: "Pellis dolorem..."
@@ -21,6 +21,7 @@
       state: cure_burn
   - type: DoAfterArgs
     delay: 1.5
+    breakOnDamage: true
   - type: TargetAction
     range: 7
     interactOnMiss: false

Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_poison.yml

@@ -7,7 +7,7 @@
   - type: CP14ActionDoAfterSlowdown
     speedMultiplier: 0.5
   - type: CP14ActionManaCost
-    manaCost: 12
+    manaCost: 10
   - type: CP14ActionSpeaking
     startSpeech: "Nella coda..."
     endSpeech: "sta il veleno"
@@ -24,6 +24,7 @@
     interactOnMiss: false
   - type: DoAfterArgs
     delay: 1.5
+    breakOnDamage: true
   - type: EntityTargetAction
     whitelist:
       components:

Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_wounds.yml

@@ -7,9 +7,10 @@
   - type: CP14ActionDoAfterSlowdown
     speedMultiplier: 0.5
   - type: CP14ActionManaCost
-    manaCost: 12
+    manaCost: 10
   - type: DoAfterArgs
     delay: 1.5
+    breakOnDamage: true
   - type: CP14ActionSpeaking
     startSpeech: "Et curabuntur..."
     endSpeech: "vulnera tua"

Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml

@@ -27,6 +27,7 @@
     interactOnMiss: false
   - type: DoAfterArgs
     delay: 1.5
+    breakOnDamage: true
   - type: EntityTargetAction
     whitelist:
       components:
@@ -79,4 +80,4 @@
   components:
   - type: CP14SpellStorage
     spells:
-    - CP14ActionSpellSheepPolymorph
+    - CP14ActionSpellSheepPolymorph

Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/flash_light.yml

@@ -13,6 +13,7 @@
     proto: CP14RuneFlashLight
   - type: DoAfterArgs
     delay: 0.5
+    breakOnDamage: true
   - type: Action
     useDelay: 6
     icon:

Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/search_of_life.yml

@@ -14,6 +14,7 @@
     proto: CP14RuneSearchOfLife
   - type: DoAfterArgs
     delay: 1.5
+    breakOnDamage: true
   - type: Action
     useDelay: 30
     icon:

Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Fear.yml

@@ -19,6 +19,7 @@
   - type: DoAfterArgs
     delay: 1.5
     hidden: true
+    breakOnDamage: true
   - type: EntityTargetAction
     canTargetSelf: false
     whitelist:

Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_armor.yml

@@ -10,6 +10,7 @@
     manaCost: 15
   - type: DoAfterArgs
     delay: 1.0
+    breakOnDamage: true
   - type: CP14ActionDoAfterVisuals
     proto: CP14RuneManaTrance
   - type: Action

Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_consume.yml

@@ -15,6 +15,7 @@
     repeat: true
     breakOnMove: true
     delay: 1
+    breakOnDamage: true
   - type: TargetAction
   - type: EntityTargetAction
     whitelist:

Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_gift.yml

@@ -11,6 +11,7 @@
     repeat: true
     breakOnMove: true
     delay: 1
+    breakOnDamage: true
   - type: CP14ActionDoAfterVisuals
     proto: CP14RuneManaGift
   - type: Action

Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_splitting.yml

@@ -12,6 +12,7 @@
     delay: 1
     repeat: true
     breakOnMove: true
+    breakOnDamage: true
   - type: CP14ActionDoAfterVisuals
     proto: CP14RuneMagicSplitting
   - type: Action
@@ -73,4 +74,4 @@
     energy: 2
     netsync: false
   - type: LightFade
-    duration: 1
+    duration: 1

Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_splitting_small.yml

@@ -17,6 +17,7 @@
       state: counter_spell_small
   - type: DoAfterArgs
     delay: 1
+    breakOnDamage: true
   - type: TargetAction
     range: 5
   - type: EntityTargetAction
@@ -37,4 +38,4 @@
         effects:
         - !type:CP14ManaChange
           manaDelta: -5
-          safe: false
+          safe: false

Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_trance.yml

@@ -10,6 +10,7 @@
     repeat: true
     delay: 1
     hidden: true
+    breakOnDamage: true
   - type: CP14ActionDoAfterVisuals
     proto: CP14RuneManaTrance
   - type: Action

Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/freeze.yml

@@ -15,7 +15,7 @@
   - type: CP14ActionDangerous
   - type: DoAfterArgs
     repeat: true
-    breakOnMove: true
+    breakOnDamage: true
     delay: 1.5
     distanceThreshold: 5
   - type: Action

Resources/Prototypes/_CP14/Entities/Effects/god_rays.yml

@@ -0,0 +1,32 @@
+- type: entity
+  id: CP14GodRays
+  categories: [ ForkFiltered ]
+  name: god rays
+  components:
+  - type: Sprite
+    sprite: _CP14/Effects/god_rays.rsi
+    drawdepth: Mobs
+    noRot: true
+    offset: -0.25, 1.5
+    layers:
+      - state: ray
+        shader: unshaded
+  - type: CP14SyncColorWithMapLight
+  - type: PointLight
+    enabled: true
+    energy: 1
+    radius: 5
+    netsync: true
+  - type: LightBehaviour
+    behaviours:
+      - !type:PulseBehaviour
+        interpolate: Cubic
+        maxDuration: 14
+        startValue: 0.5
+        endValue: 1.0
+        property: Energy
+        isLooped: true
+        enabled: true
+  - type: Tag
+    tags:
+      - HideContextMenu

Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml

@@ -22,6 +22,8 @@
         - id: CP14MobUndeadZombieGearEasy1
         - id: CP14MobUndeadZombieGearEasy2
         - id: CP14MobUndeadZombieGearEasy3
+        - id: CP14MobUndeadZombieGearEasy4
+        - id: CP14MobUndeadZombieGearEasy5
 
 # Animal
 

Resources/Prototypes/_CP14/Entities/Markers/roof.yml

@@ -0,0 +1,37 @@
+- type: entity
+  id: CP14RoofMarker
+  name: Roof enable Marker
+  categories: [ ForkFiltered ]
+  parent: MarkerBase
+  components:
+  - type: SetRoof
+    value: true
+  - type: Sprite
+    layers:
+    - state: green
+      shader: unshaded
+
+- type: entity
+  id: CP14NoRoofMarker
+  name: Roof disable Marker
+  categories: [ ForkFiltered ]
+  parent: MarkerBase
+  components:
+  - type: SetRoof
+    value: false
+  - type: Sprite
+    layers:
+    - state: red
+      shader: unshaded
+
+- type: entity
+  parent: CP14NoRoofMarker
+  id: CP14NoRoofMarkerGodRays
+  suffix: God Rays (5%)
+  components:
+  - type: RandomSpawner
+    prototypes:
+    - CP14GodRays
+    chance: 0.05
+    deleteSpawnerAfterSpawn: false
+    

Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/carrin_beak.yml

@@ -0,0 +1,143 @@
+- type: marking
+  id: CP14CarrinBeak
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_beak.rsi
+      state: 1
+
+- type: marking
+  id: CP14CarrinBeak2
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_beak.rsi
+      state: 2
+
+- type: marking
+  id: CP14CarrinBeak3
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_beak.rsi
+      state: 3
+
+- type: marking
+  id: CP14CarrinBeak4
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_beak.rsi
+      state: 4
+
+- type: marking
+  id: CP14CarrinBeak5
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_beak.rsi
+      state: 5
+
+- type: marking
+  id: CP14CarrinBeak6
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_beak.rsi
+      state: 6
+
+- type: marking
+  id: CP14CarrinBeak7
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_beak.rsi
+      state: 7
+
+- type: marking
+  id: CP14CarrinBeak8
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_beak.rsi
+      state: 8
+
+- type: marking
+  id: CP14CarrinBeak9
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_beak.rsi
+      state: 9
+
+- type: marking
+  id: CP14CarrinBeak10
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_beak.rsi
+      state: 10
+
+- type: marking
+  id: CP14CarrinBeak11
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_beak.rsi
+      state: 11
+
+- type: marking
+  id: CP14CarrinBeak12
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_beak.rsi
+      state: 12
+
+- type: marking
+  id: CP14CarrinBeak13
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_beak.rsi
+      state: 13
+
+- type: marking
+  id: CP14CarrinBeak14
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_beak.rsi
+      state: 14
+
+- type: marking
+  id: CP14CarrinBeak15
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_beak.rsi
+      state: 15
+
+- type: marking
+  id: CP14CarrinBeak16
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_beak.rsi
+      state: 16

Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/carrin_facial_hair.yml

@@ -0,0 +1,8 @@
+- type: marking
+  id: CP14CarrinBeard
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_facial_hair.rsi
+      state: 1

Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/carrin_hair.yml

@@ -0,0 +1,53 @@
+- type: marking
+  id: CP14CarrinHair
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_hair.rsi
+      state: 1
+
+- type: marking
+  id: CP14CarrinHair2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_hair.rsi
+      state: 2
+
+- type: marking
+  id: CP14CarrinHair3
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_hair.rsi
+      state: 3
+
+- type: marking
+  id: CP14CarrinHair4
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_hair.rsi
+      state: 4
+
+- type: marking
+  id: CP14CarrinHair5
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_hair.rsi
+      state: 5
+
+- type: marking
+  id: CP14CarrinHair6
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [ CP14Carrin ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/carrin_hair.rsi
+      state: 6

Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_facial_hair.yml

@@ -126,6 +126,14 @@
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
       state: hogan
 
+- type: marking
+  id: CP14HumanFacialHairHussar
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
+      state: hussar
+
 - type: marking
   id: CP14HumanFacialHairJensen
   bodyPart: FacialHair
@@ -269,4 +277,3 @@
   sprites:
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
       state: wise
-

Resources/Prototypes/_CP14/Entities/Mobs/NPC/zombie.yml

@@ -16,6 +16,8 @@
   - type: NpcFactionMember
     factions:
     - CP14Monster
+  - type: RandomHumanoidAppearance
+    randomizeName: false
   - type: NPCImprintingOnSpawnBehaviour
     whitelist:
       tags:
@@ -48,3 +50,20 @@
   - type: Loadout
     prototypes: [ CP14MobUndeadEasy3 ]
 
+- type: entity
+  id: CP14MobUndeadZombieGearEasy4
+  parent: CP14MobUndeadZombie
+  suffix: Zombie. Easy
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Loadout
+    prototypes: [ CP14MobUndeadEasy4 ]
+
+- type: entity
+  id: CP14MobUndeadZombieGearEasy5
+  parent: CP14MobUndeadZombie
+  suffix: Zombie. Easy
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Loadout
+    prototypes: [ CP14MobUndeadEasy5 ]

Resources/Prototypes/_CP14/Entities/Mobs/Player/carrin.yml

@@ -0,0 +1,4 @@
+- type: entity
+  save: false
+  parent: CP14BaseMobCarrin
+  id: CP14MobCarrin

Resources/Prototypes/_CP14/Entities/Mobs/Species/carrin.yml

@@ -0,0 +1,173 @@
+- type: entity
+  parent: CP14BaseMobSpeciesOrganic
+  id: CP14BaseMobCarrin
+  name: Mr. Birb
+  abstract: true
+  components:
+  - type: Sprite
+    layers:
+    - map: [ "enum.HumanoidVisualLayers.Chest" ]
+    - map: [ "enum.HumanoidVisualLayers.Head" ]
+    - map: [ "enum.HumanoidVisualLayers.Eyes" ]
+    - map: [ "vampire_fangs" ]
+      sprite: _CP14/Mobs/Species/Vampire/fangs48.rsi
+      state: carrin #Unique carrin fangs
+      visible: false
+    - map: [ "enum.HumanoidVisualLayers.RArm" ]
+    - map: [ "enum.HumanoidVisualLayers.LArm" ]
+    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
+    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+    - shader: StencilClear
+      sprite: _CP14/Mobs/Species/Human/parts.rsi
+      state: l_leg
+    - shader: StencilMask
+      map: [ "enum.HumanoidVisualLayers.StencilMask" ]
+      sprite: Mobs/Customization/masking_helpers.rsi
+      state: unisex_full
+      visible: false
+    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
+    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
+    - map: [ "pants" ]
+    - map: [ "shoes" ]
+    - map: [ "shirt" ]
+    - map: [ "enum.HumanoidVisualLayers.LHand" ]
+    - map: [ "enum.HumanoidVisualLayers.RHand" ]
+    - map: [ "gloves" ]
+    - map: [ "ears" ]
+    - map: [ "outerClothing" ]
+    - map: [ "cloak" ]
+    - map: [ "eyes" ]
+    - map: [ "belt" ]
+    - map: [ "belt2" ]
+    - map: [ "neck" ]
+    - map: [ "back" ]
+    - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
+    - map: [ "enum.HumanoidVisualLayers.Hair" ]
+    - map: [ "enum.HumanoidVisualLayers.Snout" ] # Snout over hair
+    - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
+    - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
+    - map: [ "enum.HumanoidVisualLayers.Tail" ]
+    - map: [ "mask" ]
+    - map: [ "head" ]
+    - map: [ "pocket1" ]
+    - map: [ "pocket2" ]
+    - map: ["enum.HumanoidVisualLayers.Handcuffs"]
+      color: "#ffffff"
+      sprite: Objects/Misc/handcuffs.rsi
+      state: body-overlay-2
+      visible: false
+  - type: HumanoidAppearance
+    species: CP14Carrin
+  - type: Icon
+    sprite: _CP14/Mobs/Species/Carrin/parts.rsi
+    state: full
+  - type: Vocal
+    sounds:
+      Male: CP14UnisexCarcat    #TODO: change to carrin sound
+      Female: CP14UnisexCarcat
+      Unsexed: CP14UnisexCarcat
+  - type: Speech
+    speechSounds: CP14Carcat #TODO: change to carrin sound
+  - type: Body
+    prototype: CP14Carrin
+    requiredLegs: 2
+  - type: MeleeWeapon
+    soundHit:
+      collection: AlienClaw
+    angle: 30
+    animation: WeaponArcClaw
+    damage:
+      types:
+        Slash: 5 # 5 slash
+  - type: CP14AuraImprint
+    imprintColor: "#52b09e"
+  - type: Inventory
+    templateId: CP14Carcat # Cant wear shoes
+    speciesId: carrin
+    displacements:
+      shirt:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carrin/displacement.rsi
+            state: shirt
+  - type: Hands
+
+- type: entity
+  parent: CP14BaseSpeciesDummy
+  id: CP14MobCarrinDummy
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - map: [ "enum.HumanoidVisualLayers.Chest" ]
+    - map: [ "enum.HumanoidVisualLayers.Head" ]
+    - map: [ "enum.HumanoidVisualLayers.Eyes" ]
+    - map: [ "vampire_fangs" ]
+      sprite: _CP14/Mobs/Species/Vampire/fangs48.rsi
+      state: carrin #Unique carrin fangs
+      visible: false
+    - map: [ "enum.HumanoidVisualLayers.RArm" ]
+    - map: [ "enum.HumanoidVisualLayers.LArm" ]
+    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
+    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+    - shader: StencilClear
+      sprite: _CP14/Mobs/Species/Human/parts.rsi
+      state: l_leg
+    - shader: StencilMask
+      map: [ "enum.HumanoidVisualLayers.StencilMask" ]
+      sprite: Mobs/Customization/masking_helpers.rsi
+      state: unisex_full
+      visible: false
+    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
+    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
+    - map: [ "pants" ]
+    - map: [ "shoes" ]
+    - map: [ "shirt" ]
+    - map: [ "enum.HumanoidVisualLayers.LHand" ]
+    - map: [ "enum.HumanoidVisualLayers.RHand" ]
+    - map: [ "gloves" ]
+    - map: [ "ears" ]
+    - map: [ "outerClothing" ]
+    - map: [ "cloak" ]
+    - map: [ "eyes" ]
+    - map: [ "belt" ]
+    - map: [ "belt2" ]
+    - map: [ "neck" ]
+    - map: [ "back" ]
+    - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
+    - map: [ "enum.HumanoidVisualLayers.Hair" ]
+    - map: [ "enum.HumanoidVisualLayers.Snout" ] # Snout over hair
+    - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
+    - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
+    - map: [ "enum.HumanoidVisualLayers.Tail" ]
+    - map: [ "mask" ]
+    - map: [ "head" ]
+    - map: [ "pocket1" ]
+    - map: [ "pocket2" ]
+    - map: ["enum.HumanoidVisualLayers.Handcuffs"]
+      color: "#ffffff"
+      sprite: Objects/Misc/handcuffs.rsi
+      state: body-overlay-2
+      visible: false
+  - type: HumanoidAppearance
+    species: CP14Carrin
+  - type: Inventory
+    templateId: CP14Carcat
+    speciesId: carrin
+    displacements:
+      shirt:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carrin/displacement.rsi
+            state: shirt
+  - type: Hands
+    leftHandDisplacement:
+      sizeMaps:
+        32:
+          sprite: _CP14/Mobs/Species/Carrin/displacement.rsi
+          state: hand_l
+    rightHandDisplacement:
+      sizeMaps:
+        32:
+          sprite: _CP14/Mobs/Species/Carrin/displacement.rsi
+          state: hand_r

Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml

@@ -29,8 +29,8 @@
     - map: [ "enum.HumanoidVisualLayers.RHand" ]
     - map: [ "gloves" ]
     - map: [ "ears" ]
-    - map: [ "cloak" ]
     - map: [ "outerClothing" ]
+    - map: [ "cloak" ]
     - map: [ "eyes" ]
     - map: [ "belt" ]
     - map: [ "belt2" ]
@@ -185,10 +185,10 @@
         sizeMaps:
           32:
             sprite: _CP14/Mobs/Species/Human/displacement.rsi
-            state: male_neck
+            state: female_neck
           48:
             sprite: _CP14/Mobs/Species/Human/displacement48.rsi
-            state: male_neck
+            state: female_neck
 
 - type: entity
   parent: CP14BaseSpeciesDummy
@@ -238,7 +238,7 @@
         sizeMaps:
           32:
             sprite: _CP14/Mobs/Species/Human/displacement.rsi
-            state: male_neck
+            state: female_neck
           48:
             sprite: _CP14/Mobs/Species/Human/displacement48.rsi
-            state: male_neck
+            state: female_neck

Resources/Prototypes/_CP14/Entities/Objects/Economy/wallet.yml

@@ -39,6 +39,11 @@
     slots: [belt]
   - type: Item
     size: Normal
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: CP14ScrapLeather
+      amount: 1
 
 - type: entity
   id: CP14WalletFilledTest
@@ -69,3 +74,24 @@
     - id: CP14CopperCoin
     - id: CP14CopperCoin
 
+- type: entity
+  id: CP14WalletFilledLootT1
+  parent: CP14Wallet
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: StorageFill
+    contents:
+    - id: CP14GoldCoin1
+      prob: 0.001
+      orGroup: ZombieLootT1
+    - id: CP14SilverCoin5
+      prob: 0.1
+      orGroup: ZombieLootT1
+    - id: CP14SilverCoin1
+      prob: 0.3
+      orGroup: ZombieLootT1
+    - id: CP14CopperCoin5
+      prob: 0.6
+      orGroup: ZombieLootT1
+    - id: CP14CopperCoin1
+      orGroup: ZombieLootT1

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml

@@ -15,16 +15,16 @@
     activeBlockFraction: 0.8
     passiveBlockModifier:
       coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.9
-        Heat: 0.9
+        Blunt: 0.75
+        Slash: 0.6
+        Piercing: 0.6
+        Heat: 0.75
     activeBlockModifier:
       coefficients:
-        Blunt: 0.75
-        Slash: 0.75
-        Piercing: 0.75
-        Heat: 0.75
+        Blunt: 0.5
+        Slash: 0.4
+        Piercing: 0.4
+        Heat: 0.5
       flatReductions:
         Blunt: 1
         Slash: 1
@@ -63,7 +63,7 @@
             acts: [ "Destruction" ]
       - trigger:
           !type:DamageTrigger
-          damage: 100 
+          damage: 150
         behaviors:
           - !type:DoActsBehavior
             acts: [ "Destruction" ]

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shieldBuckler.yml

@@ -15,16 +15,16 @@
     activeBlockFraction: 0.6
     passiveBlockModifier:
       coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.9
-        Heat: 0.9
+        Blunt: 0.75
+        Slash: 0.6
+        Piercing: 0.6
+        Heat: 0.6
     activeBlockModifier:
       coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
-        Heat: 0.8
+        Blunt: 0.5
+        Slash: 0.4
+        Piercing: 0.4
+        Heat: 0.4
   - type: Clothing
     equipDelay: 0.5
     unequipDelay: 0.5
@@ -60,7 +60,7 @@
             acts: [ "Destruction" ]
       - trigger:
           !type:DamageTrigger
-          damage: 75 
+          damage: 125
         behaviors:
           - !type:DoActsBehavior
             acts: [ "Destruction" ]
@@ -69,9 +69,9 @@
               collection: MetalBreak
           - !type:SpawnEntitiesBehavior
             spawn:
-              CP14WoodenPlanks1:
+              CP14IronBar1:
                 min: 1
-                max: 2
+                max: 1
 
 - type: entity
   parent: CP14BaseWeaponShieldBuckler

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/towerShield.yml

@@ -13,16 +13,16 @@
   - type: Blocking
     passiveBlockModifier:
       coefficients:
-        Blunt: 0.8
+        Blunt: 0.9
         Slash: 0.8
         Piercing: 0.8
-        Heat: 0.8
+        Heat: 0.9
     activeBlockModifier:
       coefficients:
-        Blunt: 0.5
+        Blunt: 0.6
         Slash: 0.5
         Piercing: 0.5
-        Heat: 0.5
+        Heat: 0.6
       flatReductions:
         Blunt: 3
         Slash: 3
@@ -62,7 +62,7 @@
             acts: [ "Destruction" ]
       - trigger:
           !type:DamageTrigger
-          damage: 200
+          damage: 250
         behaviors:
           - !type:DoActsBehavior
             acts: [ "Destruction" ]
@@ -91,4 +91,4 @@
   - type: PhysicalComposition
     materialComposition:
       CP14WoodenPlanks: 50
-      CP14Iron: 40
+      CP14Iron: 40

Resources/Prototypes/_CP14/InventoryTemplates/partial_inventory_template.yml

@@ -3,17 +3,17 @@
   slots:
     # Left hotbar
     # 0, y
-    - name: neck
-      slotTexture: neck
-      slotFlags: NECK
-      uiWindowPos: 0,0
-      strippingWindowPos: 1,2
-      displayName: Neck
+    - name: gloves
+      slotTexture: gloves
+      slotFlags: GLOVES
+      uiWindowPos: 0,1
+      strippingWindowPos: 0,2
+      displayName: Gloves
     - name: mask
       slotTexture: mask
       slotFlags: MASK
-      uiWindowPos: 2,3
-      strippingWindowPos: 2,1
+      uiWindowPos: 0,2
+      strippingWindowPos: 2,0
       displayName: Mask
     - name: eyes
       slotTexture: eyes
@@ -22,12 +22,6 @@
       strippingWindowPos: 0,1
       displayName: Eyes
     # 1, y
-    - name: shoes
-      slotTexture: shoes
-      slotFlags: FEET
-      uiWindowPos: 1,0
-      strippingWindowPos: 1,5
-      displayName: Shoes
     - name: pants
       slotTexture: pants
       slotFlags: PANTS
@@ -47,21 +41,18 @@
       strippingWindowPos: 1,1
       displayName: Head
     # 2, y
-    - name: gloves
-      slotTexture: gloves
-      slotFlags: GLOVES
-      uiWindowPos: 2,0
-      strippingWindowPos: 0,2
-      displayName: Gloves
+    - name: shoes
+      slotTexture: shoes
+      slotFlags: FEET
+      uiWindowPos: 2,1
+      strippingWindowPos: 1,5
+      displayName: Shoes
     - name: outerClothing
       slotTexture: suit
       slotFlags: OUTERCLOTHING
-      uiWindowPos: 2,1
-      strippingWindowPos: 2,3
+      uiWindowPos: 2,2
+      strippingWindowPos: 2,1
       displayName: Armor
-      blacklist:
-        tags:
-          - PetOnly
     - name: cloak
       slotTexture: cloak
       slotFlags: CLOAK
@@ -86,6 +77,14 @@
       dependsOn: pants
       displayName: Keys
       stripHidden: true
+    - name: neck
+      slotTexture: neck
+      slotFlags: NECK
+      slotGroup: SecondHotbar
+      uiWindowPos: 0,0
+      strippingWindowPos: 1,2
+      displayName: Neck
+      dependsOn: shirt
     # Right hand
     # Left hand
     - name: belt2

Resources/Prototypes/_CP14/Loadouts/Misc/undead_startinggear.yml

@@ -3,10 +3,12 @@
   equipment:
     shirt: CP14ClothingShirtCottonBlack
     pants: CP14ClothingPantsTrouserDarkBlue
+    belt: CP14WalletFilledLootT1
 
 - type: startingGear
   id: CP14MobUndeadEasy2
   equipment:
+    head: CP14ClothingHeadMetalHeadband
     pants: CP14ClothingPantsLoincloth
 
 - type: startingGear
@@ -16,3 +18,15 @@
     shoes: CP14ClothingShoesSandals
     mask: CP14ClothingMaskSinner
 
+- type: startingGear
+  id: CP14MobUndeadEasy4
+  equipment:
+    cloak: CP14ClothingCloakRitualAttireLeather
+    pants: CP14ClothingPantsGreen
+
+- type: startingGear
+  id: CP14MobUndeadEasy5
+  equipment:
+    pants: CP14ClothingPantsBrown
+    outerClothing: CP14ClothingOuterClothingBrownVest1
+    belt: CP14WalletFilledLootT1

Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave.yml

@@ -5,7 +5,7 @@
     sprite: _CP14/Interface/Misc/demiplane_locations.rsi
     state: caves
   levels:
-    min: 1
+    min: 0
     max: 2
   locationConfig: CP14Caves
   tags:
@@ -14,6 +14,12 @@
   components:
   - type: Biome
     template: CP14CavesIndestructibleFill
+  - type: Roof
+  - type: CP14SetGridRooved
+  - type: SunShadow
+  - type: SunShadowCycle
+  - type: MapLight
+    ambientLightColor: "#BFEEFFFF"
 
 - type: dungeonConfig
   id: CP14Caves

Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_ice.yml

@@ -15,6 +15,12 @@
   components:
   - type: Biome
     template: CP14IceChasmFill
+  - type: Roof
+  - type: CP14SetGridRooved
+  - type: SunShadow
+  - type: SunShadowCycle
+  - type: MapLight
+    ambientLightColor: "#BFEEFFFF"
 
 - type: dungeonConfig
   id: CP14IceCaves

Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_magma.yml

@@ -15,6 +15,12 @@
   components:
   - type: Biome
     template: CP14LavaOceanFill
+  - type: Roof
+  - type: CP14SetGridRooved
+  - type: SunShadow
+  - type: SunShadowCycle
+  - type: MapLight
+    ambientLightColor: "#BFEEFFFF"
 
 - type: dungeonConfig
   id: CP14MagmaCaves

Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_mushroom.yml

@@ -15,6 +15,12 @@
   components:
   - type: Biome
     template: CP14ChasmFill
+  - type: Roof
+  - type: CP14SetGridRooved
+  - type: SunShadow
+  - type: SunShadowCycle
+  - type: MapLight
+    ambientLightColor: "#BFEEFFFF"
 
 - type: dungeonConfig
   id: CP14MushroomCaves

Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_swamp.yml

@@ -17,6 +17,12 @@
   components:
   - type: Biome
     template: CP14CavesIndestructibleFill
+  - type: Roof
+  - type: CP14SetGridRooved
+  - type: SunShadow
+  - type: SunShadowCycle
+  - type: MapLight
+    ambientLightColor: "#BFEEFFFF"
 
 - type: dungeonConfig
   id: CP14SwampGeode

Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/island_grassland.yml

@@ -14,14 +14,14 @@
   - CP14DemiplaneOpenSky
   - CP14DemiplanePeacefulAnimals
   components:
+  - type: Biome
+    template: CP14SandOceanFill
+  - type: Roof
+  - type: SunShadow
+  - type: SunShadowCycle
   - type: MapLight
     ambientLightColor: "#BFEEFFFF"
   - type: CP14CloudShadows
-  - type: Biome
-    template: CP14SandOceanFill
-  - type: SunShadow
-  - type: SunShadowCycle
-  - type: Roof
 
 - type: dungeonConfig
   id: CP14GrasslandIsland

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/MapLight/mapLight.yml

@@ -11,42 +11,6 @@
   - type: MapLight
     ambientLightColor: "#000000"
 
-- type: cp14LocationModifier
-  id: MapLightDarkRed
-  levels:
-    min: 3
-    max: 10
-  categories:
-    MapLight: 1
-  name: cp14-modifier-night
-  components:
-  - type: MapLight
-    ambientLightColor: "#0f0104"
-
-- type: cp14LocationModifier
-  id: MapLightDarkPurple
-  levels:
-    min: 1
-    max: 10
-  categories:
-    MapLight: 1
-  name: cp14-modifier-night
-  components:
-  - type: MapLight
-    ambientLightColor: "#09010f"
-
-- type: cp14LocationModifier
-  id: MapLightDarkGreen
-  levels:
-    min: 1
-    max: 10
-  categories:
-    MapLight: 1
-  name: cp14-modifier-night
-  components:
-  - type: MapLight
-    ambientLightColor: "#000502"
-
 - type: cp14LocationModifier
   id: MapLightDarkNight
   levels:
@@ -69,8 +33,6 @@
   categories:
     MapLight: 1
   generationWeight: 2
-  requiredTags:
-  - CP14DemiplaneOpenSky
   components:
   - type: LightCycle
 
@@ -83,7 +45,6 @@
     MapLight: 1
   generationWeight: 2
   requiredTags:
-  - CP14DemiplaneOpenSky
   - CP14DemiplaneCold
   components:
   - type: LightCycle
@@ -99,7 +60,6 @@
   categories:
     MapLight: 1
   requiredTags:
-  - CP14DemiplaneOpenSky
   - CP14DemiplaneHot
   components:
   - type: LightCycle
@@ -115,7 +75,6 @@
   categories:
     MapLight: 1
   requiredTags:
-  - CP14DemiplaneOpenSky
   - CP14DemiplaneHot
   components:
   - type: LightCycle
@@ -123,3 +82,19 @@
   - type: MapLight
     ambientLightColor: "#d68787"
 
+- type: cp14LocationModifier
+  id: CavesRoofHoles
+  levels:
+    min: 0
+    max: 10
+  generationProb: 0.8
+  categories:
+    MapLight: 0
+  requiredTags:
+  - CP14DemiplaneUnderground
+  layers:
+    - !type:CP14OreDunGen
+      entity: CP14NoRoofMarkerGodRays
+      count: 15
+      minGroupSize: 10
+      maxGroupSize: 30

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Weather/weather.yml

@@ -14,6 +14,8 @@
     max: 10
   categories:
     Weather: 1
+  requiredTags:
+  - CP14DemiplaneOpenSky
   components:
   - type: CP14WeatherController
     entries:
@@ -26,8 +28,6 @@
     max: 10
   categories:
     Weather: 1
-  requiredTags:
-  - CP14DemiplaneOpenSky
   components:
   - type: CP14WeatherController
     entries:
@@ -48,8 +48,6 @@
   name: cp14-modifier-storm
   categories:
     Weather: 1
-  requiredTags:
-  - CP14DemiplaneOpenSky
   components:
   - type: CP14WeatherController
     entries:
@@ -124,6 +122,8 @@
   - type: CP14WeatherController
     entries:
     - visuals: CP14ManaMist
+  requiredTags:
+  - CP14DemiplaneOpenSky
   layers:
     - !type:CP14RoomsDunGen
       count: 8
@@ -142,6 +142,8 @@
   - type: CP14WeatherController
     entries:
     - visuals: CP14AntiManaMist
+  requiredTags:
+  - CP14DemiplaneOpenSky
   layers:
     - !type:CP14RoomsDunGen
       count: 8
@@ -156,6 +158,7 @@
     max: 10
   requiredTags:
   - CP14DemiplaneHot
+  - CP14DemiplaneOpenSky
   categories:
     Weather: 1
   components:

Resources/Prototypes/_CP14/Reagents/Target Effects/positive_effects.yml

@@ -32,6 +32,12 @@
       effects:
       - !type:SatiateThirst
         factor: 15
+      - !type:CP14ManaChange
+        manaDelta: 4
+        safe: true
+        conditions:
+        - !type:OrganType
+          type: Plant
   pricePerUnit: 1.0  # Most basic effect
 
 - type: reagent
@@ -47,7 +53,7 @@
       metabolismRate: 0.05
       effects:
       - !type:CP14ManaChange
-        manaDelta: 1.5
+        manaDelta: 3
         safe: true
   pricePerUnit: 5.0  # 2×Energia (0.4) + 1×Motion (0.2) + Water (0.1) = 0.7 → x7.14 (high value)
 

Resources/Prototypes/_CP14/Species/carrin.yml

@@ -0,0 +1,165 @@
+- type: species
+  id: CP14Carrin
+  name: cp14-species-name-carrin
+  roundStart: true
+  prototype: CP14MobCarrin
+  sprites: CP14MobCarrinSprites
+  markingLimits: CP14MobCarrinMarkingLimits
+  dollPrototype: CP14MobCarrinDummy
+  skinColoration: Hues
+  defaultSkinTone: "#313131"
+  maleFirstNames: CP14_Names_Carrin_First
+  femaleFirstNames: CP14_Names_Carrin_First
+  lastNames: CP14_Names_Carrin_Last
+
+- type: speciesBaseSprites
+  id: CP14MobCarrinSprites
+  sprites:
+    Head: CP14MobCarrinHead
+    HeadTop: CP14MobCarrinMarkingMatchSkin
+    Hair: CP14MobCarrinAnyMarking
+    FacialHair: CP14MobCarrinMarkingMatchSkin
+    Snout: CP14MobCarrinAnyMarking
+    Tail: CP14MobCarrinMarkingMatchSkin
+    Chest: CP14MobCarrinTorso
+    Eyes: CP14MobCarrinEyes
+    LArm: CP14MobCarrinLArm
+    RArm: CP14MobCarrinRArm
+    LHand: CP14MobCarrinLHand
+    RHand: CP14MobCarrinRHand
+    LLeg: CP14MobCarrinLLeg
+    RLeg: CP14MobCarrinRLeg
+    LFoot: CP14MobCarrinLFoot
+    RFoot: CP14MobCarrinRFoot
+
+- type: markingPoints
+  id: CP14MobCarrinMarkingLimits
+  onlyWhitelisted: true
+  points:
+    Hair:
+      points: 1
+      required: false
+    #FacialHair:
+    #  points: 1
+    #  required: false
+    Snout:
+      points: 1
+      required: true
+      defaultMarkings: [ CP14CarrinBeak ]
+    #Tail:
+    #  points: 1
+    #  required: true
+    #  defaultMarkings: [ CP14CarrinTail ]
+    #HeadTop:
+    #  points: 1
+    #  required: true
+    #  defaultMarkings: [ CP14CarrinEars ]
+    #Chest:
+    #  points: 1
+    #  required: false
+    #Legs:
+    #  points: 2
+    #  required: false
+    #Arms:
+    #  points: 2
+    #  required: false
+
+- type: humanoidBaseSprite
+  id: CP14MobCarrinEyes
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carrin/parts.rsi
+    state: eyes
+
+- type: humanoidBaseSprite
+  id: CP14MobCarrinAnyMarking
+
+- type: humanoidBaseSprite
+  id: CP14MobCarrinMarkingMatchSkin
+  markingsMatchSkin: true
+
+- type: humanoidBaseSprite
+  id: CP14MobCarrinMarkingBeak
+
+- type: humanoidBaseSprite
+  id: CP14MobCarrinHead
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carrin/parts.rsi
+    state: head
+
+- type: humanoidBaseSprite
+  id: CP14MobCarrinHeadMale
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carrin/parts.rsi
+    state: head
+
+- type: humanoidBaseSprite
+  id: CP14MobCarrinHeadFemale
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carrin/parts.rsi
+    state: head
+
+- type: humanoidBaseSprite
+  id: CP14MobCarrinTorso
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carrin/parts.rsi
+    state: torso
+
+- type: humanoidBaseSprite
+  id: CP14MobCarrinTorsoMale
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carrin/parts.rsi
+    state: torso
+
+- type: humanoidBaseSprite
+  id: CP14MobCarrinTorsoFemale
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carrin/parts.rsi
+    state: torso
+
+- type: humanoidBaseSprite
+  id: CP14MobCarrinLLeg
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carrin/parts.rsi
+    state: l_leg
+
+- type: humanoidBaseSprite
+  id: CP14MobCarrinLArm
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carrin/parts.rsi
+    state: l_arm
+
+- type: humanoidBaseSprite
+  id: CP14MobCarrinLHand
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carrin/parts.rsi
+    state: l_hand
+
+- type: humanoidBaseSprite
+  id: CP14MobCarrinLFoot
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carrin/parts.rsi
+    state: l_foot
+
+- type: humanoidBaseSprite
+  id: CP14MobCarrinRLeg
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carrin/parts.rsi
+    state: r_leg
+
+- type: humanoidBaseSprite
+  id: CP14MobCarrinRArm
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carrin/parts.rsi
+    state: r_arm
+
+- type: humanoidBaseSprite
+  id: CP14MobCarrinRHand
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carrin/parts.rsi
+    state: r_hand
+
+- type: humanoidBaseSprite
+  id: CP14MobCarrinRFoot
+  baseSprite:
+    sprite: _CP14/Mobs/Species/Carrin/parts.rsi
+    state: r_foot

Resources/Prototypes/_CP14/Species/skin_colorations.yml

@@ -20,5 +20,5 @@
   id: CP14CarcatHues
   strategy: !type:ClampedHsvColoration
     hue: [0.05, 0.10]
-    saturation: [0.15, 0.35]
+    saturation: [0.15, 0.7]
     value: [0.25, 0.95]

Resources/Prototypes/_CP14/Species/zombie.yml

@@ -17,7 +17,6 @@
   sprites:
     Head: CP14MobZombieHead
     Chest: CP14MobZombieTorso
-    Eyes: CP14MobZombieEyes
     LArm: CP14MobZombieLArm
     RArm: CP14MobZombieRArm
     LHand: CP14MobZombieLHand
@@ -27,12 +26,6 @@
     LFoot: CP14MobZombieLFoot
     RFoot: CP14MobZombieRFoot
 
-- type: humanoidBaseSprite
-  id: CP14MobZombieEyes
-  baseSprite:
-    sprite: _CP14/Mobs/Customization/eyes.rsi
-    state: eyes
-
 - type: humanoidBaseSprite
   id: CP14MobZombieHead
   baseSprite:

Resources/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Silva.xml

@@ -5,14 +5,16 @@
 <GuideEntityEmbed Entity="CP14MobSilva" Caption="Silva"/>
 </Box>
 
-The Silva are a race of humanoid plants living in deep relic forests. Emerging from the mother tree in the centre of their cities, the Silvas do not travel the world very often.
+The Silva are a race of humanoid plants living in deep relic forests. Emerging from the mother tree in the centre of their cities, the Silva's do not travel the world very often.
 
 ## Magical photosynthesis
 
-Silvas regenerate [protodata="CP14MobSilva" comp="CP14MagicEnergyPhotosynthesis" member="DaylightEnergy"/] mana while in sunlight, but without it, mana regeneration is completely absent. 
+Silva's regenerate [protodata="CP14MobSilva" comp="CP14MagicEnergyPhotosynthesis" member="DaylightEnergy"/] mana while in sunlight, but without it, mana regeneration is completely absent.
+
+Silva's can also drink water to regenerate small amounts of mana; life-giving moisture gives the silva a large amount of mana.
 
 ## Connection with nature
 
-Silvas initially have basic and advanced vivification.
+Silva's initially have basic and advanced vivification.
 
-</Document>
+</Document>

Resources/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Silva.xml

@@ -9,9 +9,11 @@
 
 ## Магический фотосинтез
 
-Сильвы регенерируют [protodata="CP14MobSilva" comp="CP14MagicEnergyPhotosynthesis" member="DaylightEnergy"/] маны находясь под солнечным светом, но без него регенерация маны полностью отсутствует. 
+Сильвы регенерируют [protodata="CP14MobSilva" comp="CP14MagicEnergyPhotosynthesis" member="DaylightEnergy"/] маны находясь под солнечным светом, но без него регенерация маны полностью отсутствует.
+
+Сильвы также могут пить воду, чтобы восстановить небольшое количество маны, живительная влага дает сильвам большое количество маны.
 
 ## Связь с природой
 
 Сильвы имеют базовое и продвинутое жизнетворение с начала раунда.
-</Document>
+</Document>

Resources/Textures/_CP14/Effects/god_rays.rsi/meta.json

@@ -0,0 +1,95 @@
+{
+  "version": 1,
+  "size": {
+    "x": 58,
+    "y": 100
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd",
+  "states": [
+    {
+      "name": "ray",
+      "delays": [
+        [
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          0.12,
+          5.12
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/_CP14/Mobs/Customization/carrin_beak.rsi/meta.json

@@ -0,0 +1,75 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-4.0",
+  "copyright": "Created by TheShuEd (Github)",
+  "size": {
+    "x": 48,
+    "y": 48
+  },
+  "states": [
+    {
+      "name": "1",
+      "directions": 4
+    },
+    {
+      "name": "2",
+      "directions": 4
+    },
+    {
+      "name": "3",
+      "directions": 4
+    },
+    {
+      "name": "4",
+      "directions": 4
+    },
+    {
+      "name": "5",
+      "directions": 4
+    },
+    {
+      "name": "6",
+      "directions": 4
+    },
+    {
+      "name": "7",
+      "directions": 4
+    },
+    {
+      "name": "8",
+      "directions": 4
+    },
+    {
+      "name": "9",
+      "directions": 4
+    },
+    {
+      "name": "10",
+      "directions": 4
+    },
+    {
+      "name": "11",
+      "directions": 4
+    },
+    {
+      "name": "12",
+      "directions": 4
+    },
+    {
+      "name": "13",
+      "directions": 4
+    },
+    {
+      "name": "14",
+      "directions": 4
+    },
+    {
+      "name": "15",
+      "directions": 4
+    },
+    {
+      "name": "16",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CP14/Mobs/Customization/carrin_facial_hair.rsi/meta.json

@@ -0,0 +1,15 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-4.0",
+  "copyright": "Created by TheShuEd (Github)",
+  "size": {
+    "x": 48,
+    "y": 48
+  },
+  "states": [
+    {
+      "name": "1",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CP14/Mobs/Customization/carrin_hair.rsi/meta.json

@@ -0,0 +1,35 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-4.0",
+  "copyright": "Created by TheShuEd (Github)",
+  "size": {
+    "x": 48,
+    "y": 48
+  },
+  "states": [
+    {
+      "name": "1",
+      "directions": 4
+    },
+    {
+      "name": "2",
+      "directions": 4
+    },
+    {
+      "name": "3",
+      "directions": 4
+    },
+    {
+      "name": "4",
+      "directions": 4
+    },
+    {
+      "name": "5",
+      "directions": 4
+    },
+    {
+      "name": "6",
+      "directions": 4
+    }
+  ]
+}