From 3c534069a4b9453b4553b3bea549218f1394b794 Mon Sep 17 00:00:00 2001
From: Red <96445749+TheShuEd@users.noreply.github.com>
Date: Sun, 24 Aug 2025 15:58:35 +0300
Subject: [PATCH] Random tweaks (#1701)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* weather overlay offset

* sack head clothing

* remove raid

* less mushrooms, less muhrooms hat

* Update CP14VampireRuleSystem.cs

* Update base_clothing.yml

* fix

* Revert "Update base_clothing.yml"

This reverts commit e51d13fe77b9c6c2d5f6b14a81ccc89b0849241d.

* Update backpacks.yml

* ашч

* double game preset

* Delete parts.yml

* Update sack.yml

* Update sack.yml

* g

* remove raids

* fuck you
---
 .../Overlays/StencilOverlay.Weather.cs        |  16 +-
 .../Systems/AdminVerbSystem.Antags.cs         |  43 ++++-
 .../Rules/CP14VampireRuleSystem.cs            |   2 +-
 .../CP14ShowVampireFactionComponent.cs        |   1 -
 .../Locale/ru-RU/_CP14/vampire/vampire.ftl    |   2 +-
 .../Entities/Clothing/Back/backpacks.yml      |   2 +-
 .../Entities/Clothing/Back/container_base.yml |   2 +
 .../_CP14/Entities/Mobs/NPC/myconide.yml      |   2 +-
 .../Entities/Mobs/Player/TownRaids/undead.yml |  83 ---------
 .../_CP14/Entities/Objects/Misc/parts.yml     |  24 ---
 .../Objects/Specific/Farming/sack.yml         |  89 ++++-----
 .../Prototypes/_CP14/GameRules/events.yml     |  35 ----
 .../{subgamemodes.yml => vampire.yml}         | 170 +++++++++++-------
 .../Demiplane/Modifiers/Danger/mobs.yml       |   8 +-
 .../Construction/Graphs/Vampire/heart.yml     |  89 +++++++++
 .../Construction/Graphs/Vampire/workbench.yml |  93 +---------
 .../_CP14/Recipes/Workbench/sewing_table.yml  |   2 +-
 .../Prototypes/_CP14/Roles/Antags/misc.yml    |   7 -
 .../_CP14/Roles/MindRoles/mind_roles.yml      |   9 -
 Resources/Prototypes/_CP14/game_presets.yml   |  16 +-
 Resources/Prototypes/_CP14/secret_weights.yml |   5 +-
 .../Storage/sack.rsi/equipped-HELMET.png      | Bin 0 -> 1146 bytes
 .../_CP14/Objects/Storage/sack.rsi/icon.png   | Bin 475 -> 506 bytes
 .../_CP14/Objects/Storage/sack.rsi/meta.json  |  14 +-
 .../_CP14/Objects/Storage/sack.rsi/seed.png   | Bin 2020 -> 750 bytes
 25 files changed, 320 insertions(+), 394 deletions(-)
 delete mode 100644 Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml
 delete mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Misc/parts.yml
 rename Resources/Prototypes/_CP14/GameRules/{subgamemodes.yml => vampire.yml} (68%)
 create mode 100644 Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Vampire/heart.yml
 create mode 100644 Resources/Textures/_CP14/Objects/Storage/sack.rsi/equipped-HELMET.png

diff --git a/Content.Client/Overlays/StencilOverlay.Weather.cs b/Content.Client/Overlays/StencilOverlay.Weather.cs
index c5ccb50cf5..87e118d47e 100644
--- a/Content.Client/Overlays/StencilOverlay.Weather.cs
+++ b/Content.Client/Overlays/StencilOverlay.Weather.cs
@@ -18,6 +18,7 @@ public sealed partial class StencilOverlay
         var worldAABB = args.WorldAABB;
         var worldBounds = args.WorldBounds;
         var position = args.Viewport.Eye?.Position.Position ?? Vector2.Zero;
+        var eye = args.Viewport.Eye; //CP14
 
         // Cut out the irrelevant bits via stencil
         // This is why we don't just use parallax; we might want specific tiles to get drawn over
@@ -45,10 +46,17 @@ public sealed partial class StencilOverlay
                         continue;
                     }
 
-                    var gridTile = new Box2(tile.GridIndices * grid.Comp.TileSize,
-                        (tile.GridIndices + Vector2i.One) * grid.Comp.TileSize);
-
-                    worldHandle.DrawRect(gridTile, Color.White);
+                    //CP14 offset - required for isometric walls
+                    if (eye is not null)
+                    {
+                        Angle rotation = eye.Rotation * -1f;
+                        var offset = rotation.ToWorldVec() * -0.5f;
+                        var gridTile = new Box2(
+                            tile.GridIndices * grid.Comp.TileSize + offset,
+                            (tile.GridIndices + Vector2i.One) * grid.Comp.TileSize + offset);
+                        worldHandle.DrawRect(gridTile, Color.White);
+                    }
+                    //CP14 offset end
                 }
             }
 
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
index 27bd3d2e3f..83b04c10f2 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
@@ -31,7 +31,9 @@ public sealed partial class AdminVerbSystem
     private static readonly EntProtoId DefaultThiefRule = "Thief";
     private static readonly ProtoId<StartingGearPrototype> PirateGearId = "PirateGear";
     //CP14
-    private static readonly EntProtoId CP14VampireRule = "CP14GameRuleVampireClanBattle";
+    private static readonly EntProtoId CP14VampireUnnameable = "CP14GameRuleVampireClanUnnameable";
+    private static readonly EntProtoId CP14VampireDevourers = "CP14GameRuleVampireClanDevourers";
+    private static readonly EntProtoId CP14VampireNightChildrens = "CP14GameRuleVampireClanNightChildrens";
     //CP14 end
 
     private static readonly EntProtoId ParadoxCloneRuleId = "ParadoxCloneSpawn";
@@ -52,20 +54,47 @@ public sealed partial class AdminVerbSystem
 
         var targetPlayer = targetActor.PlayerSession;
 
-        Verb vampire = new()
+        Verb vampire3 = new()
         {
-            Text = Loc.GetString("cp14-admin-verb-text-make-vampire"),
+            Text = Loc.GetString("cp14-admin-verb-text-make-vampire") + ": " + Loc.GetString("cp14-vampire-fraction-name-night-childrens"),
             Category = VerbCategory.Antag,
-            Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/_CP14/Actions/Spells/vampire.rsi"),
-                "bite"),
+            Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/_CP14/Interface/Misc/vampire_icons.rsi"), "NightChildrens"),
             Act = () =>
             {
-                _antag.ForceMakeAntag<CP14VampireRuleComponent>(targetPlayer, CP14VampireRule);
+                _antag.ForceMakeAntag<CP14VampireRuleComponent>(targetPlayer, CP14VampireNightChildrens);
             },
             Impact = LogImpact.High,
             Message = Loc.GetString("cp14-admin-verb-make-vampire"),
         };
-        args.Verbs.Add(vampire);
+        args.Verbs.Add(vampire3);
+
+        Verb vampire2 = new()
+        {
+            Text = Loc.GetString("cp14-admin-verb-text-make-vampire") + ": " + Loc.GetString("cp14-vampire-fraction-name-devourers"),
+            Category = VerbCategory.Antag,
+            Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/_CP14/Interface/Misc/vampire_icons.rsi"), "Devourers"),
+            Act = () =>
+            {
+                _antag.ForceMakeAntag<CP14VampireRuleComponent>(targetPlayer, CP14VampireDevourers);
+            },
+            Impact = LogImpact.High,
+            Message = Loc.GetString("cp14-admin-verb-make-vampire"),
+        };
+        args.Verbs.Add(vampire2);
+
+        Verb vampire1 = new()
+        {
+            Text = Loc.GetString("cp14-admin-verb-text-make-vampire") + ": " + Loc.GetString("cp14-vampire-fraction-name-unnameable"),
+            Category = VerbCategory.Antag,
+            Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/_CP14/Interface/Misc/vampire_icons.rsi"), "Unnameable"),
+            Act = () =>
+            {
+                _antag.ForceMakeAntag<CP14VampireRuleComponent>(targetPlayer, CP14VampireUnnameable);
+            },
+            Impact = LogImpact.High,
+            Message = Loc.GetString("cp14-admin-verb-make-vampire"),
+        };
+        args.Verbs.Add(vampire1);
 
         /* CP14 disable default antags
         var traitorName = Loc.GetString("admin-verb-text-make-traitor");
diff --git a/Content.Server/_CP14/GameTicking/Rules/CP14VampireRuleSystem.cs b/Content.Server/_CP14/GameTicking/Rules/CP14VampireRuleSystem.cs
index 15629bc6e3..bff43c399f 100644
--- a/Content.Server/_CP14/GameTicking/Rules/CP14VampireRuleSystem.cs
+++ b/Content.Server/_CP14/GameTicking/Rules/CP14VampireRuleSystem.cs
@@ -82,6 +82,6 @@ public sealed class CP14VampireRuleSystem : GameRuleSystem<CP14VampireRuleCompon
             args.AddLine(Loc.GetString("cp14-vampire-clans-battle-clan-lose-desc"));
         }
 
-        args.AddLine(Loc.GetString("cp14-vampire-clans-battle-alive-people", ("percent", alivePercentage * 100)));
+        args.AddLine(Loc.GetString("cp14-vampire-clans-battle-alive-people", ("percent", MathF.Round(alivePercentage * 100))));
     }
 }
diff --git a/Content.Shared/_CP14/Vampire/Components/CP14ShowVampireFactionComponent.cs b/Content.Shared/_CP14/Vampire/Components/CP14ShowVampireFactionComponent.cs
index 5d046da2a7..be3aa42e48 100644
--- a/Content.Shared/_CP14/Vampire/Components/CP14ShowVampireFactionComponent.cs
+++ b/Content.Shared/_CP14/Vampire/Components/CP14ShowVampireFactionComponent.cs
@@ -6,7 +6,6 @@ namespace Content.Shared._CP14.Vampire.Components;
 [RegisterComponent]
 [NetworkedComponent]
 [AutoGenerateComponentState]
-[Access(typeof(CP14SharedVampireSystem))]
 public sealed partial class CP14ShowVampireFactionComponent : Component
 {
     [DataField, AutoNetworkedField]
diff --git a/Resources/Locale/ru-RU/_CP14/vampire/vampire.ftl b/Resources/Locale/ru-RU/_CP14/vampire/vampire.ftl
index e2d47517e0..87d0b085a8 100644
--- a/Resources/Locale/ru-RU/_CP14/vampire/vampire.ftl
+++ b/Resources/Locale/ru-RU/_CP14/vampire/vampire.ftl
@@ -18,7 +18,7 @@ cp14-vampire-tree-examine-level = Эссенции: ([color=red]{$essence}/{$lef
 cp14-vampire-essence-holder-examine = В этой жертве есть еще [color=red]{$essence} эссенции крови[/color].
 
 cp14-vampire-tree-other-title = Прогресс других кланов:
-cp14-vampire-tree-other-info = "{$name}": [color=red]{$count}[/color] эссенции, [color=red]{$lvl}[/color] уровень.
+cp14-vampire-tree-other-info = "{$name}": [color=red]({$essence}/{$left})[/color] эссенции, [color=red]{$lvl}[/color] уровень.
 cp14-vampire-gather-essence-no-left = There is no more essence here!
 
 ## Announcements
diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml
index ccfce55030..6d82b9714f 100644
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml
@@ -1,4 +1,4 @@
- # TODO: recolor woth tags --- normal backpack T0 --- color backpack T0
+ # TODO: recolor with tags --- normal backpack T0 --- color backpack T0
 
 # ========================
 # Base
diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Back/container_base.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Back/container_base.yml
index 71eab00b54..f01da79410 100644
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Back/container_base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/container_base.yml
@@ -34,3 +34,5 @@
     interfaces:
       enum.StorageUiKey.Key:
         type: StorageBoundUserInterface
+  - type: StaticPrice
+    price: 10 #TODO get rid of this
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/myconide.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/myconide.yml
index 7063b5d9ea..73ec59692f 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/myconide.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/myconide.yml
@@ -69,7 +69,7 @@
       amount: 2
     - id: CP14ClothingHeadaAgaricHelmet
       amount: 1
-      prob: 0.3
+      prob: 0.05
   - type: Food
   - type: SolutionContainerManager
     solutions:
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml
deleted file mode 100644
index 3d4a26355d..0000000000
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-- type: entity
-  id: CP14SpawnPointTownRaid
-  parent: MarkerBase
-  abstract: true
-  name: town raid ghost role spawn point
-  suffix: Town Raid
-  categories: [ ForkFiltered ]
-  components:
-  - type: GhostRole
-    name: cp14-ghost-role-information-name-raid-undead
-    allowMovement: true
-    description: cp14-ghost-role-information-description-raid-undead
-    rules: cp14-ghost-role-information-rules-raid
-    mindRoles:
-    - CP14MindRoleRaidAntag
-    raffle:
-      settings: default
-  - type: Sprite
-    sprite: Markers/jobs.rsi
-    layers:
-      - state: green
-      - sprite: _CP14/Mobs/Species/Skeleton/parts.rsi
-        state: full
-
-# Easy
-
-- type: entity
-  id: CP14MobUndeadSkeletonWizardTownRaid
-  parent: CP14MobUndeadSkeletonWizardT2
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: RandomSpawner
-    prototypes:
-    - CP14BaseMobGroupSpawner #VFX
-    chance: 1
-    deleteSpawnerAfterSpawn: false
-  - type: EntityTableSpawner
-    deleteSpawnerAfterSpawn: false
-    offset: 1
-    table: !type:GroupSelector
-      rolls: !type:RangeNumberSelector
-        range: 3, 5
-      children:
-      - id: CP14MobUndeadZombie
-        weight: 2
-      - id: CP14MobUndeadZombieGearEasy1
-      - id: CP14MobUndeadZombieGearEasy2
-      - id: CP14MobUndeadZombieGearEasy3
-  - type: Tag
-    tags:
-    - FootstepSound
-    - CP14RaidLeader
-  - type: CP14SkillStorage
-    skillPoints:
-      Memory:
-        max: 4
-    freeLearnedSkills:
-    - SwordMastery
-    - RapierMastery
-    - SkimitarMastery
-    - MetamagicT1
-    - MetamagicT2
-    - HydrosophistryT1
-    - HydrosophistryT2
-    - PyrokineticT1
-    - PyrokineticT2
-    - CP14ActionSpellManaConsume
-    - CP14ActionSpellManaGift
-    - CP14ActionSpellManaConsumeElf
-    - CP14ActionSpellManaGiftElf
-    - CP14ActionSpellMagicSplitting
-  - type: Loadout
-    prototypes:
-    - CP14MobSkeletonWizardTownRaid
-
-- type: entity
-  id: CP14SpawnPointTownRaidUndeadEasy
-  parent: CP14SpawnPointTownRaid
-  suffix: Town Raid (Undead, Easy)
-  components:
-  - type: GhostRoleMobSpawner
-    prototype: CP14MobUndeadSkeletonWizardTownRaid
-
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Misc/parts.yml b/Resources/Prototypes/_CP14/Entities/Objects/Misc/parts.yml
deleted file mode 100644
index 84d72b8546..0000000000
--- a/Resources/Prototypes/_CP14/Entities/Objects/Misc/parts.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-- type: entity
-  id: CP14IngredientBase # An item intended for crafting
-  parent: BaseItem
-  abstract: true
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    size: Tiny
-
-# Buckle
-- type: entity
-  id: CP14IronBuckle
-  parent: CP14IngredientBase
-  name: iron buckle
-  description: A sturdy metal buckle for fastening straps and belts.
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Ingredients/buckle.rsi
-    state: icon
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 2 # 1/5 iron bar (10u)
-  - type: StaticPrice
-    price: 2
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml
index 9340c7b5e8..ad8e03e215 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml
@@ -1,29 +1,34 @@
 - type: entity
   name: produce sack
-  id: CP14SackFarming
-  parent: BaseStorageItem
-  description: A bag for various fruits, vegetables, plants and anything else that grows in the garden.
+  id: CP14SackFarming #Remove "Farming"
+  parent: 
+  - BaseStorageItem
+  - CP14ClothingHeadBase
+  description: Bag for quick transport of items
   categories: [ ForkFiltered ]
   components:
   - type: Sprite
     sprite: _CP14/Objects/Storage/sack.rsi
     state: icon
   - type: Item
-    size: Ginormous
+    size: Huge
+    shape:
+    - 0,0,3,3
   - type: Storage
     maxItemSize: Normal
     grid:
-    - 0,0,6,3
+    - 0,0,3,3
     quickInsert: true
     areaInsert: true
-    whitelist:
-      tags:
-        - CP14FarmFood
-        - CP14FitInMortar
   - type: Dumpable
   - type: PhysicalComposition
     materialComposition:
-      CP14Cloth: 35
+      CP14Cloth: 55
+  - type: FlashImmunity
+  - type: IdentityBlocker
+  - type: EyeProtection
+  - type: IngestionBlocker
+  - type: Blindfold
 
 - type: entity
   id: CP14SackFarmingVegetables
@@ -34,19 +39,19 @@
   - type: StorageFill
     contents:
       - id: CP14Wheat
-        amount: 4
+        amount: 2
       - id: CP14FoodCabbage
         orGroup: LargeVegetables
-        amount: 3
+        amount: 2
       - id: CP14FoodPumpkin
         orGroup: LargeVegetables
-        amount: 3
+        amount: 2
       - id: CP14FoodPotato
-        amount: 3
+        amount: 2
       - id: CP14FoodCucumber
-        amount: 3
+        amount: 2
       - id: CP14FoodTomatoes
-        amount: 3
+        amount: 2
 
 - type: entity
   id: CP14SackFarmingApple
@@ -56,13 +61,10 @@
   - type: StorageFill
     contents:
       - id: CP14FoodApple
-        amount: 6
+        amount: 3
       - id: CP14FoodApple
-        amount: 5
+        amount: 3
         prob: 0.6
-      - id: CP14FoodApple
-        amount: 5
-        prob: 0.4
 
 - type: entity
   id: CP14SackFarmingWheat
@@ -72,34 +74,32 @@
   - type: StorageFill
     contents:
       - id: CP14Wheat
-        amount: 8
+        amount: 4
       - id: CP14Wheat
-        amount: 5
+        amount: 2
         prob: 0.6
-      - id: CP14Wheat
-        amount: 5
-        prob: 0.4
 
 - type: entity
   id: CP14SackFarmingSeed
-  parent: CP14SackFarming
+  parent: BaseStorageItem
   name: seed sack
   description: A sack for various plant seeds.
+  categories: [ ForkFiltered ]
   components:
   - type: Sprite
     sprite: _CP14/Objects/Storage/sack.rsi
     state: seed
   - type: Item
-    size: Small
+    size: Normal
+    shape:
+    - 0,0,3,3
   - type: Storage
-    maxItemSize: Tiny
+    maxItemSize: Small
     grid:
-    - 0,0,6,3
+    - 0,0,3,3
     quickInsert: true
     areaInsert: true
-    whitelist:
-      tags:
-        - CP14FarmSeed
+  - type: Dumpable
   - type: PhysicalComposition
     materialComposition:
       CP14Cloth: 25
@@ -112,33 +112,22 @@
   - type: StorageFill
     contents:
       - id: CP14SeedWheat
-        amount: 4
+        amount: 1
       - id: CP14SeedWheat
-        amount: 2
+        amount: 1
         prob: 0.6
-      - id: CP14SeedWheat
-        amount: 1
-        prob: 0.4
-      - id: CP14SeedPumpkin
-        amount: 3
       - id: CP14SeedPumpkin
         amount: 1
-        prob: 0.4
       - id: CP14SeedCucumber
-        amount: 3
+        amount: 1
       - id: CP14SeedTomato
-        amount: 3
+        amount: 1
       - id: CP14SeedCabbage
-        amount: 2
+        amount: 1
       - id: CP14SeedPepper
-        amount: 2
-      - id: CP14SeedSage
-        amount: 2
+        amount: 1
       - id: CP14SeedSage
         amount: 1
-        prob: 0.4
-      - id: CP14SeedCotton
-        amount: 2
       - id: CP14SeedCotton
         amount: 1
         prob: 0.4
diff --git a/Resources/Prototypes/_CP14/GameRules/events.yml b/Resources/Prototypes/_CP14/GameRules/events.yml
index 81aa404b34..3da66b63a2 100644
--- a/Resources/Prototypes/_CP14/GameRules/events.yml
+++ b/Resources/Prototypes/_CP14/GameRules/events.yml
@@ -22,43 +22,8 @@
   id: CP14BasicCalmEventsTable
   table: !type:AllSelector
     children:
-    - id: CP14TestRaidSpawn
     - id: CP14Storm
 
-#- type: entity
-#  parent: CP14BaseStationEventLongDelay
-#  id: CP14ZombiesSpawn
-#  components:
-#  - type: StationEvent
-#    startAnnouncement: cp14-event-announcement-demiplane-outbreak
-#    startAudio:
-#      path: /Audio/_CP14/Announce/event_boom.ogg
-#    earliestStart: 20
-#    minimumPlayers: 15
-#    weight: 5
-#    duration: 60
-#  - type: VentCrittersRule
-#    entries:
-#    - id: CP14MobGroupSpawnerZombie
-#      prob: 0.08
-
-- type: entity
-  parent: CP14BaseStationEventShortDelay
-  id: CP14TestRaidSpawn
-  components:
-  - type: StationEvent
-    startAnnouncement: cp14-event-announcement-demiplane-outbreak
-    startAudio:
-      path: /Audio/_CP14/Announce/event_boom.ogg
-    earliestStart: 20
-    minimumPlayers: 15
-    weight: 1
-    duration: 60
-  - type: VentCrittersRule
-    specialEntries:
-    - id: CP14SpawnPointTownRaidUndeadEasy
-      prob: 0.001
-
 - type: entity
   parent: CP14BaseStationEventLongDelay
   id: CP14Storm
diff --git a/Resources/Prototypes/_CP14/GameRules/subgamemodes.yml b/Resources/Prototypes/_CP14/GameRules/vampire.yml
similarity index 68%
rename from Resources/Prototypes/_CP14/GameRules/subgamemodes.yml
rename to Resources/Prototypes/_CP14/GameRules/vampire.yml
index e70d7cb711..5089770c67 100644
--- a/Resources/Prototypes/_CP14/GameRules/subgamemodes.yml
+++ b/Resources/Prototypes/_CP14/GameRules/vampire.yml
@@ -1,78 +1,39 @@
 - type: entity
   parent: CP14BaseGameRule
-  id: CP14GameRuleVampireClanBattle
+  id: CP14GameRuleVampireClanBattleTriple
   components:
   - type: CP14VampireRule
+  - type: GameRule
+    minPlayers: 30
+  - type: SubGamemodes
+    rules:
+    - id: CP14GameRuleVampireClanUnnameable
+    - id: CP14GameRuleVampireClanDevourers
+    - id: CP14GameRuleVampireClanNightChildrens
+
+- type: entity
+  parent: CP14BaseGameRule
+  id: CP14GameRuleVampireClanBattleDouble
+  components:
+  - type: CP14VampireRule
+  - type: GameRule
+    minPlayers: 20
+  - type: SubGamemodes
+    rules:
+    - id: CP14GameRuleVampireClanDevourers
+    - id: CP14GameRuleVampireClanNightChildrens
+
+- type: entity
+  parent: CP14BaseGameRule
+  id: CP14GameRuleVampireClanUnnameable
+  components:
   - type: AntagObjectives
     objectives:
     - CP14VampireObjectiveBloodPurity
     - CP14VampireObjectiveDefenseVillage
-  - type: GameRule
-    minPlayers: 20
   - type: AntagSelection
     selectionTime: IntraPlayerSpawn
     definitions:
-    # Night children clan
-    - prefRoles: [ CP14Vampire ]
-      min: 1
-      max: 3
-      playerRatio: 2
-      lateJoinAdditional: true
-      mindRoles:
-      - CP14MindRoleVampire
-      components:
-      - type: CP14Vampire
-        faction: NightChildrens
-      - type: CP14ShowVampireFaction
-        faction: NightChildrens
-      - type: Hunger
-        hungerThresholdAlerts:
-          Peckish: CP14VampirePeckish
-          Starving: CP14VampireStarving
-          Dead: CP14VampireStarving
-        starvingSlowdownModifier: 1.1 #Speed Up when hunger!
-      - type: PassiveDamage
-        allowedStates:
-        - Alive
-        - Critical
-        damage:
-          groups:
-            Brute: -3
-      briefing:
-        text: cp14-roles-antag-vampire-briefing-night-childrens
-        color: "#630f24"
-        sound: "/Audio/_CP14/Ambience/Antag/vampire.ogg"
-    # Devourers clan
-    - prefRoles: [ CP14Vampire ]
-      min: 1
-      max: 3
-      playerRatio: 2
-      lateJoinAdditional: true
-      mindRoles:
-      - CP14MindRoleVampire
-      components:
-      - type: CP14Vampire
-        faction: Devourers
-      - type: CP14ShowVampireFaction
-        faction: Devourers
-      - type: Hunger
-        hungerThresholdAlerts:
-          Peckish: CP14VampirePeckish
-          Starving: CP14VampireStarving
-          Dead: CP14VampireStarving
-        starvingSlowdownModifier: 1.1 #Speed Up when hunger!
-      - type: PassiveDamage
-        allowedStates:
-        - Alive
-        - Critical
-        damage:
-          groups:
-            Brute: -3
-      briefing:
-        text: cp14-roles-antag-vampire-briefing-devourers
-        color: "#630f24"
-        sound: "/Audio/_CP14/Ambience/Antag/vampire.ogg"
-    # Unnameable clan
     - prefRoles: [ CP14Vampire ]
       min: 1
       max: 3
@@ -103,3 +64,84 @@
         color: "#630f24"
         sound: "/Audio/_CP14/Ambience/Antag/vampire.ogg"
 
+- type: entity
+  parent: CP14BaseGameRule
+  id: CP14GameRuleVampireClanDevourers
+  components:
+  - type: AntagObjectives
+    objectives:
+    - CP14VampireObjectiveBloodPurity
+    - CP14VampireObjectiveDefenseVillage
+  - type: AntagSelection
+    selectionTime: IntraPlayerSpawn
+    definitions:
+    - prefRoles: [ CP14Vampire ]
+      min: 1
+      max: 3
+      playerRatio: 2
+      lateJoinAdditional: true
+      mindRoles:
+      - CP14MindRoleVampire
+      components:
+      - type: CP14Vampire
+        faction: Devourers
+      - type: CP14ShowVampireFaction
+        faction: Devourers
+      - type: Hunger
+        hungerThresholdAlerts:
+          Peckish: CP14VampirePeckish
+          Starving: CP14VampireStarving
+          Dead: CP14VampireStarving
+        starvingSlowdownModifier: 1.1 #Speed Up when hunger!
+      - type: PassiveDamage
+        allowedStates:
+        - Alive
+        - Critical
+        damage:
+          groups:
+            Brute: -3
+      briefing:
+        text: cp14-roles-antag-vampire-briefing-devourers
+        color: "#630f24"
+        sound: "/Audio/_CP14/Ambience/Antag/vampire.ogg"
+
+- type: entity
+  parent: CP14BaseGameRule
+  id: CP14GameRuleVampireClanNightChildrens
+  components:
+  - type: AntagObjectives
+    objectives:
+    - CP14VampireObjectiveBloodPurity
+    - CP14VampireObjectiveDefenseVillage
+  - type: AntagSelection
+    selectionTime: IntraPlayerSpawn
+    definitions:
+    - prefRoles: [ CP14Vampire ]
+      min: 1
+      max: 3
+      playerRatio: 2
+      lateJoinAdditional: true
+      mindRoles:
+      - CP14MindRoleVampire
+      components:
+      - type: CP14Vampire
+        faction: NightChildrens
+      - type: CP14ShowVampireFaction
+        faction: NightChildrens
+      - type: Hunger
+        hungerThresholdAlerts:
+          Peckish: CP14VampirePeckish
+          Starving: CP14VampireStarving
+          Dead: CP14VampireStarving
+        starvingSlowdownModifier: 1.1 #Speed Up when hunger!
+      - type: PassiveDamage
+        allowedStates:
+        - Alive
+        - Critical
+        damage:
+          groups:
+            Brute: -3
+      briefing:
+        text: cp14-roles-antag-vampire-briefing-night-childrens
+        color: "#630f24"
+        sound: "/Audio/_CP14/Ambience/Antag/vampire.ogg"
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
index 4bdddfa82d..341d7f1bd6 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
@@ -304,8 +304,8 @@
     - !type:CP14OreDunGen
       entity: CP14MobMonsterMyconideFlyagaric
       count: 5
-      minGroupSize: 7
-      maxGroupSize: 12
+      minGroupSize: 5
+      maxGroupSize: 9
 
 - type: cp14LocationModifier
   id: MyconideLumish
@@ -320,8 +320,8 @@
     - !type:CP14OreDunGen
       entity: CP14MobMonsterMyconideLumish
       count: 5
-      minGroupSize: 7
-      maxGroupSize: 12
+      minGroupSize: 5
+      maxGroupSize: 9
 
 - type: cp14LocationModifier
   id: EnemyCackle
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Vampire/heart.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Vampire/heart.yml
new file mode 100644
index 0000000000..37138704ec
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Vampire/heart.yml
@@ -0,0 +1,89 @@
+- type: constructionGraph
+  id: CP14VampireClanHeartUnnameable
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: CP14VampireClanHeartUnnameableFrame
+          completed:
+            - !type:SnapToGrid
+          steps:
+            - material: CP14Stone
+              amount: 10
+              doAfter: 2
+
+    - node: CP14VampireClanHeartUnnameableFrame
+      entity: CP14VampireClanHeartFrameUnnameable
+      edges:
+        - to: CP14VampireClanHeartUnnameable
+          completed:
+            - !type:SnapToGrid
+          conditions:
+            - !type:CP14AllVampireClanRequired
+              faction: Unnameable
+          steps:
+            - material: CP14BloodEssence
+              amount: 1
+              doAfter: 1
+    - node: CP14VampireClanHeartUnnameable
+      entity: CP14VampireClanHeartUnnameable
+
+- type: constructionGraph
+  id: CP14VampireClanHeartDevourers
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: CP14VampireClanHeartDevourersFrame
+          completed:
+            - !type:SnapToGrid
+          steps:
+            - material: CP14Stone
+              amount: 10
+              doAfter: 2
+
+    - node: CP14VampireClanHeartDevourersFrame
+      entity: CP14VampireClanHeartFrameDevourers
+      edges:
+        - to: CP14VampireClanHeartDevourers
+          completed:
+            - !type:SnapToGrid
+          conditions:
+            - !type:CP14AllVampireClanRequired
+              faction: Devourers
+          steps:
+            - material: CP14BloodEssence
+              amount: 1
+              doAfter: 2
+    - node: CP14VampireClanHeartDevourers
+      entity: CP14VampireClanHeartDevourers
+
+- type: constructionGraph
+  id: CP14VampireClanHeartNightChildren
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: CP14VampireClanHeartNightChildrenFrame
+          completed:
+            - !type:SnapToGrid
+          steps:
+            - material: CP14Stone
+              amount: 10
+              doAfter: 2
+
+    - node: CP14VampireClanHeartNightChildrenFrame
+      entity: CP14VampireClanHeartFrameNightChildrens
+      edges:
+        - to: CP14VampireClanHeartNightChildren
+          completed:
+            - !type:SnapToGrid
+          conditions:
+            - !type:CP14AllVampireClanRequired
+              faction: NightChildrens
+          steps:
+            - material: CP14BloodEssence
+              amount: 1
+              doAfter: 2
+    - node: CP14VampireClanHeartNightChildren
+      entity: CP14VampireClanHeartNightChildren
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Vampire/workbench.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Vampire/workbench.yml
index 48b81e4a2d..a2c200a648 100644
--- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Vampire/workbench.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Vampire/workbench.yml
@@ -12,95 +12,4 @@
               amount: 3
               doAfter: 2
     - node: CP14WorkbenchVampire
-      entity: CP14WorkbenchVampire
-
-
-- type: constructionGraph
-  id: CP14VampireClanHeartUnnameable
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: CP14VampireClanHeartUnnameableFrame
-          completed:
-            - !type:SnapToGrid
-          steps:
-            - material: CP14Stone
-              amount: 10
-              doAfter: 2
-
-    - node: CP14VampireClanHeartUnnameableFrame
-      entity: CP14VampireClanHeartFrameUnnameable
-      edges:
-        - to: CP14VampireClanHeartUnnameable
-          completed:
-            - !type:SnapToGrid
-          conditions:
-            - !type:CP14AllVampireClanRequired
-              faction: Unnameable
-          steps:
-            - material: CP14BloodEssence
-              amount: 1
-              doAfter: 1
-    - node: CP14VampireClanHeartUnnameable
-      entity: CP14VampireClanHeartUnnameable
-
-- type: constructionGraph
-  id: CP14VampireClanHeartDevourers
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: CP14VampireClanHeartDevourersFrame
-          completed:
-            - !type:SnapToGrid
-          steps:
-            - material: CP14Stone
-              amount: 10
-              doAfter: 2
-
-    - node: CP14VampireClanHeartDevourersFrame
-      entity: CP14VampireClanHeartFrameDevourers
-      edges:
-        - to: CP14VampireClanHeartDevourers
-          completed:
-            - !type:SnapToGrid
-          conditions:
-            - !type:CP14AllVampireClanRequired
-              faction: Unnameable
-          steps:
-            - material: CP14BloodEssence
-              amount: 1
-              doAfter: 2
-    - node: CP14VampireClanHeartDevourers
-      entity: CP14VampireClanHeartDevourers
-
-- type: constructionGraph
-  id: CP14VampireClanHeartNightChildren
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: CP14VampireClanHeartNightChildrenFrame
-          completed:
-            - !type:SnapToGrid
-          steps:
-            - material: CP14Stone
-              amount: 10
-              doAfter: 2
-
-    - node: CP14VampireClanHeartNightChildrenFrame
-      entity: CP14VampireClanHeartFrameNightChildrens
-      edges:
-        - to: CP14VampireClanHeartNightChildren
-          completed:
-            - !type:SnapToGrid
-          conditions:
-            - !type:CP14AllVampireClanRequired
-              faction: Unnameable
-          steps:
-            - material: CP14BloodEssence
-              amount: 1
-              doAfter: 2
-    - node: CP14VampireClanHeartNightChildren
-      entity: CP14VampireClanHeartNightChildren
\ No newline at end of file
+      entity: CP14WorkbenchVampire
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml
index 61915c0433..32a02dde25 100644
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml
@@ -310,7 +310,7 @@
     protoId: CP14String
   - !type:StackResource
     stack: CP14Cloth
-    count: 3
+    count: 5
   result: CP14SackFarming
 
 - type: CP14Recipe
diff --git a/Resources/Prototypes/_CP14/Roles/Antags/misc.yml b/Resources/Prototypes/_CP14/Roles/Antags/misc.yml
index 7884c9dc74..a4a3ebdd8f 100644
--- a/Resources/Prototypes/_CP14/Roles/Antags/misc.yml
+++ b/Resources/Prototypes/_CP14/Roles/Antags/misc.yml
@@ -5,13 +5,6 @@
   setPreference: false
   objective: cp14-ghost-role-information-rules-demiplane
 
-- type: antag
-  id: CP14RaidAntag
-  name: cp14-role-type-raid-antag-name
-  antagonist: true
-  setPreference: false
-  objective: cp14-ghost-role-information-rules-raid
-
 - type: antag
   id: CP14Vampire
   name: cp14-roles-antag-vampire-name
diff --git a/Resources/Prototypes/_CP14/Roles/MindRoles/mind_roles.yml b/Resources/Prototypes/_CP14/Roles/MindRoles/mind_roles.yml
index 725465bf05..03200761e1 100644
--- a/Resources/Prototypes/_CP14/Roles/MindRoles/mind_roles.yml
+++ b/Resources/Prototypes/_CP14/Roles/MindRoles/mind_roles.yml
@@ -7,15 +7,6 @@
     roleType: CP14DemiplaneAntagonist
     antagPrototype: CP14DemiplaneAntag
 
-- type: entity
-  parent: BaseMindRoleAntag
-  id: CP14MindRoleRaidAntag
-  name: Raid Antag Role
-  components:
-  - type: MindRole
-    roleType: CP14RaidAntagonist
-    antagPrototype: CP14RaidAntag
-
 - type: entity
   parent: BaseMindRoleAntag
   id: CP14MindRoleVampire
diff --git a/Resources/Prototypes/_CP14/game_presets.yml b/Resources/Prototypes/_CP14/game_presets.yml
index 3ecb89fb54..4b9ef64181 100644
--- a/Resources/Prototypes/_CP14/game_presets.yml
+++ b/Resources/Prototypes/_CP14/game_presets.yml
@@ -32,15 +32,27 @@
     - CP14BasicStationEventScheduler
 
 - type: gamePreset
-  id: CP14VampireClansBattle
+  id: CP14VampireClansBattleDouble
   name: cp14-vampire-clans-battle
   description: cp14-vampire-clans-description
   showInVote: true
   cP14Allowed: true
   minPlayers: 20
+  maxPlayers: 29
   rules:
     - CP14BasicStationEventScheduler
-    - CP14GameRuleVampireClanBattle
+    - CP14GameRuleVampireClanBattleDouble
+
+- type: gamePreset
+  id: CP14VampireClansBattleTriple
+  name: cp14-vampire-clans-battle
+  description: cp14-vampire-clans-description
+  showInVote: true
+  cP14Allowed: true
+  minPlayers: 30
+  rules:
+    - CP14BasicStationEventScheduler
+    - CP14GameRuleVampireClanBattleTriple
 
 #- type: gamePreset
 #  id: CP14Survival
diff --git a/Resources/Prototypes/_CP14/secret_weights.yml b/Resources/Prototypes/_CP14/secret_weights.yml
index 8e8263f605..da43c6a6c5 100644
--- a/Resources/Prototypes/_CP14/secret_weights.yml
+++ b/Resources/Prototypes/_CP14/secret_weights.yml
@@ -1,5 +1,6 @@
 - type: weightedRandom
   id: Secret
   weights:
-    CP14Peaceful: 0.5
-    CP14VampireClansBattle: 0.5
\ No newline at end of file
+    CP14Peaceful: 1
+    CP14GameRuleVampireClanBattleTriple: 1
+    CP14GameRuleVampireClanBattleDouble: 1
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/Storage/sack.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Objects/Storage/sack.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d386cb84e1915665898e420a168e4213d38d9df
GIT binary patch
literal 1146
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>VARZXb`Ee%$xljE2y%B)&@i;L
zw9sT=(3qH<kYH3$QdpEKl#p=ZthOdsQF%~DM^8|K{rLmO4xC|N>pXdswU3d}PN6KW
zE>4S??MGQ}qo7OtHP)G}n*HJhs^TJ38D82u<V=|qHRsHM0~rh{>C>l+FdUV9&Tv!7
z^Jc;~Hi6w5DkmgQ*fFJiUg~@!+~JK1$8XM#Se7p=6aKO;v6DTM_K0CNbK>cS8>%Zs
z6{;oYeCF2bHo9!=CBmbtt1BuK{AqHKXp?rgcTjP+sLkg|pS!s}bqje11vg|VzGG%~
z>~IR`$Yd~$%9!*bzllMFU*Otvhk_qQU2`2f6dj5(10|=NJdxrvqu(I8kA=DUe-Inn
zG<y!i$#HCLtX4cce}V;*vf6lfn11o_{C>v3aNwB#-z%S#ycigmc|2VlLn`LHy>mWG
z%29^>!}^5@M-rr@$^>V1SLC+b>5?n{%vi%UU(J6a`-!#3TkdczyMEN0<>t`|8ePvW
zolUe(lTlx~bpOnrr@tE~q_obx|L5-4Pplmvut$66uEPCy&z{W|HxEB|Yx1Mrc^{=$
z^Uay-9zDPI|1?I9Vx@bl^Dat%yL~t2{ek7@<*(P<_snBpcwEx-v46g!uM<%3>-cX0
z{r!wLUbA&|PFPp%|0!+Pb}L4PtuJowx_aLks37~|=VPXO<Mztyb@(>y{3Y+^|5`qE
zj^DM_IwoI#NIWjt^zVMy|C^O6`wHf~Wtc4W=gGT!;gjoCckaGFi$#8pPs6L0f7KK9
zt~bx;2|sAVte3aW>tq4zf*CEYyS7|=e~Mk){AzgBq<!mtM25MU&3{x>AbaG2_Vni0
zLHu)VtSnq~tMtUYe?`@Q{&FPpc9ONiY=84GAJcUUDyy2ZVh-wPD@(3xlBs!GR1kaW
zS+L4s(X`0Q#dUk*Z`NqtTK9u5;OMH)TPj}o1soS-+uncaY-e_@Ez^d`{}yvCtlM1X
zGj^ABy6$4xP+O;WNp)6l?U$&z3UT(nd&AW8&A!z~@Big9=|$lJw(U1>Y_FRKbiSP9
zf!8WGR<Lg^`Rm8_cx|ZMrw7`*W2^;nf}c-yH)u}DXtIC0x-P%bS8r2UjN#;XhVq5J
zaZI!2-25HcOmDt;=v(!->x)y7+>IsT@<9QUdnNBJ$tst;^+aa_=M9-Z0nM{=zC@kf
zqW|)O+C|v}HNU_5XRhdb#tCf>xp;NQqs2Sx7iDc}HQnjqBRIREd-m!{x_xf_H8(}m
z&Q`^oeelijP5XwONoBbo8j~jEn(jVfEySJkYOB>wE^8y_*;8UGcv-u4$lgv^tub59
zYG+7QS4Pq_E)%2kfu(!JMDx8B{SPU{E|Lnr(4`&C==(bT#`-r3oN>&v(;_W@$S$ZC
zH;9+IvTni|zE5H|L}X>y?0<LxQ%vr|8lGGwOt9#{UWR~em*d5JUcCX9DGZ*jelF{r
G5}E)~1N8X-

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Storage/sack.rsi/icon.png b/Resources/Textures/_CP14/Objects/Storage/sack.rsi/icon.png
index 9d6f5b721326e0ee5bcca165f3f971d2cc59a21c..ca88f47d6a41e4b2af0eca4c18e61a370c7a7685 100644
GIT binary patch
literal 506
zcmV<W0R{evP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px$v`IukRA_<i*0D;%Kpe;MuOd`Yw9?WLXcwt2T7^1@#8H=Ka&q+rGI#1z=qot*
z0Qv+vh$x7<6_*wy!9rUq>J%3*#@gEAU2*XLfl`{g=KjA+?h+6}2qA<JLj2O$C{F4*
zZunFC!TE`?ag7J?95<ZJywMI4T-WZuwHI^CfVmJx19*-b+J$jWPHzYHE#{Vugc#R7
zfud%9Sl6}tfw$T)j0Er;H!N;vqTl7p?!f=Jr2;$qOWI=_y8@5?69CWt3m2!ilq<V^
zgSe#vE9-fV4llLGozOjjy6?MPe5`|Eu7(cn0E%s;srogl53c~^7bbzvAfuucK+V2w
zrK4l2a1|teEH2)zLn}bgX;HKmNoA7&q_W9q#^XizEB5&2?C-bHR5nSY-UOggZ?aJ;
zkYCMx>64k6>-pJR+tS`fwb#JiRTbMx)2KJUgqgOcu&p$Y{u9&IXa8sa1%P&t&>b2u
zxQzl)@jz63e0`|mO)~x*h<~dPqolov`aK8Yx@W!}BnUb!Ba7I`%be%9VbE!@wmBai
w>s7R3s(3K`HahICVybu{gb+dqA;kao4o5Sd=erd-HUIzs07*qoM6N<$f~-;Py8r+H

literal 475
zcmV<10VMv3P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$l}SWFR9J=WmBC5^K^Vt>Nnl}^p|~vQC9I2?V221h*2O(}>e>r<_T*F4D|F}q
z^a<)9kr3uhx+usl3Mz_uvP-kAmd&gZUG@jdvNPYz|35R|Hwzvf9{<dS+X02FF_XpI
zJeHN`UCBT&I%R12skIv4`ZMvQD-*5^6tc!lPx&ZU>eARuJgH>D=SDmjovMaYYc-UP
zOUXbXYs@kiQTw}C%1g%>xfGYzhtfFZ9q5={0LJEoYNbxGlwWGZ$fY<sNpN@jB%OCt
z79h@jk?Ln2sO-jC1_Zhmp=q{gzP$sG*x#Bn@+Stw>UAw*w+Ufk#M$P=*}t*@YcwFE
z9T1L%00_rI_KKaN%f#+q9@a0za4bZx-3Or8?sJ+;kvNXe#YA^@e|)ae=h8Bi=D_Q7
z6J3kYYxn2O1hj2*Ekeia641Wl$L0ipq2-rN4Y(*nz!nE=ac6!AaW}ZW2b^zVVjZMO
zvg{skvbgf0<;NNgl#)>CXH>`<Gix*;eYW?js6bU**?>SLt3j>&JUl!+1Rq9Rp69eN
RL$&|_002ovPDHLkV1i>x*=qm*

diff --git a/Resources/Textures/_CP14/Objects/Storage/sack.rsi/meta.json b/Resources/Textures/_CP14/Objects/Storage/sack.rsi/meta.json
index c807edc953..c940c15e6b 100644
--- a/Resources/Textures/_CP14/Objects/Storage/sack.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/Storage/sack.rsi/meta.json
@@ -1,17 +1,21 @@
 {
   "version": 1,
-  "license": "All right reserved",
-  "copyright": "Created by Artista. Seed sack By Ell_Good", 
+  "license": "CC-BY-SA-4.0",
+  "copyright": "Created by artista.rar_furrista, helmet by TheShuEd",
   "size": {
-    "x": 32,
-    "y": 32
+    "x": 48,
+    "y": 48
   },
   "states": [
     {
-        "name": "icon"
+      "name": "icon"
     },
     {
       "name": "seed"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/_CP14/Objects/Storage/sack.rsi/seed.png b/Resources/Textures/_CP14/Objects/Storage/sack.rsi/seed.png
index ebbb5485b19a0234744a73424d47fc081a0523bf..9efbb9eeb31522c224cf1d4e4b0711024fb02f33 100644
GIT binary patch
literal 750
zcmV<K0ulX*P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0003gX+uL$L1b@Y
zWgt>VLLewHIXO5f001bFV_;x1aCC8UWfEXu$jvJ$3UYT+h=`0*U_Z~m#=y(~28qeV
z1&#p$J|K2peqJgA2KaW3fe}Ps)&-e`DUTO$B^MNx0O>zKY?P8(oXo($XaHnqmzNX(
z#Tn-S*&<2VVD<(OyC@{c8OS~YWb>s%*jGU8BnbNnh+PEq1d#m&q&^+YX5s*w17XX6
z*d?hIAbS~{^9w4AGSf3k6bvmbEfpM7@{>{(f-8$lQge$HJoA$Ciwg3K5=&B3fNCM`
z0|P;bLQsfl05w`@lIU-O02B`p*5^QQ_%e!}L5Lwha%oW+l*!0sOqh=_V~zv^ga1+n
z29`evF_T^fh6Oqd4E$3OVrqsA3<CNL4EyE)0Kmpi{nYXzN&o->fJsC_RA_<in6XO3
zP!xv$TZA@5Qj3y{5TC%o;3n8Hn^UIDK7fOB2Zug^I6Alpox0df2cd$4DAl=}f+SS5
zr6G2@4z;C9Yf(;mDV}e-ISD!cpOcew3BWK6!~AE&v<s9{v(PaSA%2#anURjvU<0~g
z1G-@Yx|w?e3)D9}IoMUrherT_DGkJ7f^zkI>cIRf<P}(UmS9Q)rZliBS71s5CErVJ
zoTsvtI6K}~FHdiH4qJ%B1edo>Y_6>%>b6m7)PGeCEnA7xqZ`~^M7Y0xMJLL_DL4Rt
zN~10Uw@6wI@*XJpp4!+dAPy5)b`GY@zzTCHS8HN#dq>%edD4931^^%q6PVH%t_K`m
z)ySKf^c5=ko*ETC5T9lv&;1-AHPDH&U)JA`(}2uC;1-o-_a>gV>>jAUKmc(Q_n&ft
zPLxH|ZGT4d!x->RnGOK4fxhVci1_g_N+^3k02nKDBqjp4NSKoUO6Z3T=!OmGh7IV3
g4KNJDFpN$<00N<X!>Kl#_W%F@07*qoM6N<$f*xNmF8}}l

literal 2020
zcmbVN3sBQ`7!RO`D2T!)3Lc^C1W((fEw5&FJX)kM3+15#&XY7vOQcO=5}+WCIw#1)
z2TmrNC^EL4$mGsD-^jqJ%=Z*@=%$0Y+fxTRbla)Z{ac`?o0~UtN&8Ro`~SZ0`+bj8
z>QWNDJg0g>5agAlQKy4{*nWAqgI~U+<PHS6L{Tc0F3!N{NjN<*9uAW#6wxyvD6G0>
zeS7jzonJ+JK*I5c`5xE%*w8ec`O=Z9q=j$6S<R}AyOLBj`bl(4**%|i^t9KmE_V%0
zJQ8<%Y^mGvrj@EU$B$mqduMB}BJi9`qrPWrd0P2kR&!x@b;}Q@uS_=9y4q4|KP+r6
zfP6xi9`o-V@UZo0Tl>R1@0ZDfK1y~A$!!fFgI9Z=Z|`bymySBKy?%+$1Y1+emk~ax
zu}z!r2k1PxM^N&qyQMyhZC7|@P?e%%Jh#|o?zBbuww#UL7qbU4PwynNyZWccy|jMJ
zyX(%$4+d3KCi`BxkT&_mfLpFK$Q(88;QYNGx7{s!sGQg{NYeF*9<j5Ole6Qj4U)2X
z{x83ML;o2&#d`oR$uzV^vHM-d?N8X3v+CCuXM2}H9i6Fv4rauh07{N!HQ77_jq|l%
zF3@{*{tz^(pUTV<vb1wCg0V<&yS@^ug#~B`njK?haU!1-U_EJ~Xr*YNwOs^L2Bm00
zgcjAZDl(7KlyGE5NlGSBl20fMqL^3U*;Wh?SV#eftrj!QV^*ce!Ha>l{V^hf9S|X3
zDH=*>mR1L=7><M$5~-L#Q5hVikl<3nAe9+s!7@}9j!3286iXEt8jXcV!o!CMnBxpa
zEL}Zk*ciA|it+@3#So;Zs7O*ImoS_O0o9^FP#GeVi2*{)7t;c671Mmk2!opB365d~
zilJdUBd%u(1f>YLIuwJ2b<)!OuuecR#EP?sRD#-LasUm46UP>CW`}VDfskg>Lec^c
zuu><M&0_?H&tv|D+WGnk13+7?)@kFZzE~_y6TFa62*MZ^<f&*rvzR53bdqNZID$+l
z1a5}dqhT=>N8$p*WipI;BvZN(mtk3?L<WZ~plAbA#Lswa1F6OZQYiviix8s`Vi}q#
zMKKh`<l!?Niy^3%F;K?he?q00JQ72ngo2te-~#?kuz|pg3}?YXz?20ykqAqhM6gpv
zOvRWP4j2aB$sJy3wOA6(3ph=XNou7C#4MpG0~Uow$>mZsQjE%^sF+ZM%f-=hLMAqn
z2EELvH-^iiqeu3u8KS_R*^&K*|G7Vvqd;rn=I7?IH=MmBFb&0nWEBs0L<YHZcx9$w
zM-^Z=VXtnbh_I)XG>C>DQ_roy5N%N&2}u7V-9s>*F$zUEN5+|eTF)#e1UQe_`*0`@
z<nJLm-aXc{BXBSX>`Uhe0yoYfM$%w%abQFxO)qEwUzF@5bzElFs$Vw6ym~a&zq8&i
z*ekR$;bic!)V^HS_e|~C85zbH+e+TO;&s=h0y_~a*uBL&e)O2MoqW{jlW7;q%P;>F
zsL!v#4yRR~YU{qXtZZBFHRbP1(vvq$sY$=|g3VP2wY%h&AL`3BWfU^B3se=L`F8x>
z?|0Alvz59Ho(uGk>Nv0>;S;FSOTA+8fx0CL$+s^&+*f*F*{92|s-~Kv+ivO$s44pM
ziH+UUugwXb5ZJ${?`L)2y$2I3&wq0<5Q=T={vy67Wb5jiE5dGlcPht=syni$Irp%u
zyyg9`&D6ph0bSenYVKFNK=4{QN>_c=cv+cWeO6QQ27rHXOY>mnoLOz&8=y%I?fGRl
zABDyKSkkqpqJG_$-+V3xK|b2rdYMWjtd4sWk-wJjkk6}k->@df_j)(KX}dLcnQxu@
vJD-nTw0@LshhLfL!7gS8<Y#mJV>5&#XD>g*X&M9UACaVl6m?5{?i+sru+_?p