palisaade (#1012)

Content.Client/IconSmoothing/IconSmoothComponent.cs

@@ -26,6 +26,12 @@ namespace Content.Client.IconSmoothing
         [ViewVariables(VVAccess.ReadWrite), DataField("key")]
         public string? SmoothKey { get; private set; }
 
+        /// <summary>
+        ///     Additional keys to smooth with.
+        /// </summary>
+        [DataField]
+        public List<string> AdditionalKeys { get; private set; } = new();
+
         /// <summary>
         ///     Prepended to the RSI state.
         /// </summary>

Content.Client/IconSmoothing/IconSmoothSystem.cs

@@ -376,7 +376,8 @@ namespace Content.Client.IconSmoothing
             while (candidates.MoveNext(out var entity))
             {
                 if (smoothQuery.TryGetComponent(entity, out var other) &&
-                    other.SmoothKey == smooth.SmoothKey &&
+                    other.SmoothKey != null &&
+                    (other.SmoothKey == smooth.SmoothKey || smooth.AdditionalKeys.Contains(other.SmoothKey)) &&
                     other.Enabled)
                 {
                     return true;

Resources/Prototypes/_CP14/Entities/Structures/Floor/floorLava.yml

@@ -38,6 +38,8 @@
   - type: IconSmooth
     shader: unshaded
     key: CP14Lava
+    additionalKeys:
+    - CP14wall
     base: water
   - type: Physics
     bodyType: Static

Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml

@@ -19,6 +19,8 @@
     state: full
   - type: IconSmooth
     key: CP14Water
+    additionalKeys:
+    - CP14wall
     base: water
   - type: FloorOccluder
   - type: Transform

Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml

@@ -91,7 +91,6 @@
     - bricksB
   - type: CP14WallpaperHolder
 
-
 - type: entity
   id: CP14WallWooden
   name: wooden wall
@@ -131,7 +130,8 @@
 
 - type: entity
   id: CP14WallWoodenPalisade
-  name: wooden wall
+  name: palisade
+  description: A wall of sharp logs. Not that it's a safe haven.
   parent:
   - CP14BaseWall
   - CP14BaseFlammableSpreading
@@ -142,6 +142,8 @@
     sprite: _CP14/Structures/Walls/wooden_palisad.rsi
   - type: IconSmooth
     key: CP14palisade
+    additionalKeys:
+    - CP14wall
     base: wood
   - type: Damageable
     damageContainer: Inorganic
@@ -160,6 +162,11 @@
   - type: Tag
   - type: Occluder
     enabled: false
+  - type: Airtight
+    airBlocked: false
+  - type: Construction
+    graph: CP14WallWoodenPalisade
+    node: CP14WallWoodenPalisade
 
 - type: entity
   id: CP14WallCardboard

Resources/Prototypes/_CP14/Entities/Structures/chasm.yml

@@ -18,6 +18,8 @@
     state: full
   - type: IconSmooth
     key: chasm
+    additionalKeys:
+    - CP14wall
     base: chasm_
   - type: Transform
     anchored: true

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallWood.yml

@@ -50,4 +50,21 @@
               doAfter: 2
               
     - node: WindowWooden
-      entity: CP14WindowWooden
+      entity: CP14WindowWooden
+
+
+- type: constructionGraph
+  id: CP14WallWoodenPalisade
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: CP14WallWoodenPalisade
+          completed:
+            - !type:SnapToGrid
+          steps:
+            - material: CP14WoodenPlanks
+              amount: 4
+              doAfter: 2
+    - node: CP14WallWoodenPalisade
+      entity: CP14WallWoodenPalisade

Resources/Prototypes/_CP14/Recipes/Construction/walls.yml

@@ -16,6 +16,24 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  crystallPunkAllowed: true
+  name: palisade
+  description: A wall of sharp logs. Not that it's a safe haven.
+  id: CP14WallWoodenPalisade
+  graph: CP14WallWoodenPalisade
+  startNode: start
+  targetNode: CP14WallWoodenPalisade
+  category: construction-category-structures
+  icon:
+    sprite: _CP14/Structures/Walls/wooden_palisad.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   crystallPunkAllowed: true
   name: wooden window