diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs index 60d2872ce9..43a7232ee8 100644 --- a/Content.Shared/Localizations/ContentLocalizationManager.cs +++ b/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(); } diff --git a/Resources/ConfigPresets/_CP14/Dev.toml b/Resources/ConfigPresets/_CP14/Dev.toml index 0cf99aed40..69ede8104d 100644 --- a/Resources/ConfigPresets/_CP14/Dev.toml +++ b/Resources/ConfigPresets/_CP14/Dev.toml @@ -2,7 +2,7 @@ enabled = true [localization] -language = "ru-RU" +language = "en-US" [log] path = "logs" diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/stonebrick.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/stonebrick.yml index 1de2755d8a..03b78a1f7e 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/stonebrick.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/stonebrick.yml @@ -150,4 +150,32 @@ - type: Construction graph: CP14WallMarbleBrick node: CP14WallMarbleBrick - - type: CP14WallpaperHolder \ No newline at end of file + - 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" ] \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml index 46d87a1df3..371cb501b8 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml +++ b/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 \ No newline at end of file + node: CP14WallWoodenPalisade \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/frame.png b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/frame.png new file mode 100644 index 0000000000..56031c818a Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/frame.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/full.png new file mode 100644 index 0000000000..e2b029359c Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/meta.json similarity index 50% rename from Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/meta.json index 74883535a1..fda3b2be88 100644 --- a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/meta.json +++ b/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 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks0.png b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks0.png new file mode 100644 index 0000000000..6177eb9e3c Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks0.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks1.png b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks1.png new file mode 100644 index 0000000000..60f6d1f2c4 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks1.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks2.png b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks2.png new file mode 100644 index 0000000000..6177eb9e3c Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks2.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks3.png b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks3.png new file mode 100644 index 0000000000..9193046ec5 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks4.png b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks4.png new file mode 100644 index 0000000000..dd488a7e29 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks5.png b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks5.png new file mode 100644 index 0000000000..4bf3b729e7 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks6.png b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks6.png new file mode 100644 index 0000000000..a83a8cef73 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks6.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks7.png b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks7.png new file mode 100644 index 0000000000..bd9eadbc10 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/brick_stone_old_wall.rsi/stonebricks7.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/full.png deleted file mode 100644 index ddef0ea93b..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls0.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls0.png deleted file mode 100644 index 81ec31747e..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls0.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls1.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls1.png deleted file mode 100644 index d181f5cf25..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls2.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls2.png deleted file mode 100644 index 7861e1a119..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls3.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls3.png deleted file mode 100644 index f8167eba80..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls4.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls4.png deleted file mode 100644 index 3915a2b19a..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls4.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls5.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls5.png deleted file mode 100644 index 45be3dd398..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls5.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls6.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls6.png deleted file mode 100644 index 1dbb193600..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls6.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls7.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls7.png deleted file mode 100644 index c030a0cfd2..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skulls7.png and /dev/null differ diff --git a/Resources/migration.yml b/Resources/migration.yml index d52a3df60c..a41dae5e43 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -331,6 +331,9 @@ CP14WallCyan: CP14WallStonebrick CP14FrameWooden: CP14WallFrameWooden CP14BaseCrowbar: CP14ModularIronPickaxe +#2025-26-04 +CP14WallSkulls: CP14WallStonebrickOld + # <---> CrystallEdge migration zone end