dungeon walls resprite, fix TOSTRING problem from C4viwlle

Content.Shared/Localizations/ContentLocalizationManager.cs

@@ -28,17 +28,6 @@ namespace Content.Shared.Localizations
             var culture = new CultureInfo(_cfg.GetCVar(CCVars.Language));
 
             _loc.LoadCulture(culture);
-            _loc.AddFunction(culture, "PRESSURE", FormatPressure);
-            _loc.AddFunction(culture, "POWERWATTS", FormatPowerWatts);
-            _loc.AddFunction(culture, "POWERJOULES", FormatPowerJoules);
-            _loc.AddFunction(culture, "UNITS", FormatUnits);
-            _loc.AddFunction(culture, "TOSTRING", args => FormatToString(culture, args));
-            _loc.AddFunction(culture, "LOC", FormatLoc);
-            _loc.AddFunction(culture, "NATURALFIXED", FormatNaturalFixed);
-            _loc.AddFunction(culture, "NATURALPERCENT", FormatNaturalPercent);
-            _loc.AddFunction(culture, "PLAYTIME", FormatPlaytime);
-
-            _loc.AddFunction(culture, "MANY", FormatMany); // TODO: Temporary fix for MANY() fluent errors. Remove after resolve errors.
 
             /*
              * The following language functions are specific to the english localization. When working on your own
@@ -51,16 +40,6 @@ namespace Content.Shared.Localizations
                 _loc.LoadCulture(cultureEn);
             _loc.SetFallbackCluture(cultureEn); // I don't think there's any reason to change the fallback culture.
 
-            //CP14 Functions
-            _loc.AddFunction(cultureEn, "MAKEPLURAL", FormatMakePlural);
-            _loc.AddFunction(cultureEn, "MANY", FormatMany);
-            _loc.AddFunction(cultureEn, "NATURALFIXED", FormatNaturalFixed);
-            _loc.AddFunction(cultureEn, "LOC", FormatLoc);
-            _loc.AddFunction(cultureEn, "NATURALPERCENT", FormatNaturalPercent);
-            _loc.AddFunction(cultureEn, "POWERJOULES", FormatPowerJoules);
-            _loc.AddFunction(cultureEn, "TOSTRING", args => FormatToString(cultureEn, args));
-            //CP14 Functions end
-
             _cfg.OnValueChanged(CCVars.Language, OnCultureUpdate, true);
         }
 
@@ -69,6 +48,19 @@ namespace Content.Shared.Localizations
             var culture = new CultureInfo(value);
             if (!_loc.HasCulture(culture))
                 _loc.LoadCulture(culture);
+
+            _loc.AddFunction(culture, "PRESSURE", FormatPressure);
+            _loc.AddFunction(culture, "POWERWATTS", FormatPowerWatts);
+            _loc.AddFunction(culture, "POWERJOULES", FormatPowerJoules);
+            _loc.AddFunction(culture, "UNITS", FormatUnits);
+            _loc.AddFunction(culture, "TOSTRING", args => FormatToString(culture, args));
+            _loc.AddFunction(culture, "LOC", FormatLoc);
+            _loc.AddFunction(culture, "NATURALFIXED", FormatNaturalFixed);
+            _loc.AddFunction(culture, "NATURALPERCENT", FormatNaturalPercent);
+            _loc.AddFunction(culture, "PLAYTIME", FormatPlaytime);
+
+            _loc.AddFunction(culture, "MANY", FormatMany); // TODO: Temporary fix for MANY() fluent errors. Remove after resolve errors.
+
             _loc.DefaultCulture = culture;
             _loc.ReloadLocalizations();
         }

Resources/ConfigPresets/_CP14/Dev.toml

@@ -2,7 +2,7 @@
 enabled = true
 
 [localization]
-language = "ru-RU"
+language = "en-US"
 
 [log]
 path = "logs"

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

@@ -150,4 +150,32 @@
   - type: Construction
     graph: CP14WallMarbleBrick
     node: CP14WallMarbleBrick
-  - type: CP14WallpaperHolder
+  - type: CP14WallpaperHolder
+
+- type: entity
+  id: CP14WallStonebrickOld
+  name: old stonebrick wall
+  parent: CP14BaseWall
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Walls/brick_stone_old_wall.rsi
+  - type: Icon
+    sprite: _CP14/Structures/Walls/brick_stone_old_wall.rsi
+  - type: IconSmooth
+    base: stonebricks
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: CP14RockStructural
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/break_stone.ogg
+          params:
+            volume: -6
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]

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

@@ -95,33 +95,4 @@
     airBlocked: false
   - type: Construction
     graph: CP14WallWoodenPalisade
-    node: CP14WallWoodenPalisade
-
-- type: entity
-  id: CP14WallSkulls
-  name: skulls wall
-  parent: CP14BaseWall
-  components:
-  - type: Sprite
-    sprite: _CP14/Structures/Walls/wall_of_skulls.rsi
-  - type: Icon
-    sprite: _CP14/Structures/Walls/wall_of_skulls.rsi
-  - type: IconSmooth
-    base: skulls
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: CP14RockStructural
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          path: /Audio/Effects/break_stone.ogg
-          params:
-            volume: -6
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  - type: CP14WallpaperHolder
+    node: CP14WallWoodenPalisade

Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/meta.json

@@ -1,46 +1,49 @@
 {
   "version": 1,
+  "license": "CC-BY-SA-4.0",
+  "copyright": "By omsoyk (GitHub/discord)",
   "size": {
-    "x": 48,
+    "x": 32,
     "y": 64
   },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Created by Skilets (Discord) ",
   "states": [
     {
       "name": "full"
     },
     {
-      "name": "skulls0",
+      "name": "frame"
+    },
+    {
+      "name": "stonebricks0",
       "directions": 4
     },
     {
-      "name": "skulls1",
+      "name": "stonebricks1",
       "directions": 4
     },
     {
-      "name": "skulls2",	
+      "name": "stonebricks2",
       "directions": 4
     },
     {
-      "name": "skulls3",
+      "name": "stonebricks3",
       "directions": 4
     },
     {
-      "name": "skulls4",
+      "name": "stonebricks4",
       "directions": 4
     },
     {
-      "name": "skulls5",
+      "name": "stonebricks5",
       "directions": 4
     },
     {
-      "name": "skulls6",
+      "name": "stonebricks6",
       "directions": 4
     },
     {
-      "name": "skulls7",
+      "name": "stonebricks7",
       "directions": 4
     }
   ]
-}
+}

Resources/migration.yml

@@ -331,6 +331,9 @@ CP14WallCyan: CP14WallStonebrick
 CP14FrameWooden: CP14WallFrameWooden
 CP14BaseCrowbar: CP14ModularIronPickaxe
 
+#2025-26-04
+CP14WallSkulls: CP14WallStonebrickOld
+
 # <---> CrystallEdge migration zone end