From 2ba911802820564428259e0fed5d7543942bd39c Mon Sep 17 00:00:00 2001 From: TAZIKLIK <73418250+Evgencheg@users.noreply.github.com> Date: Sat, 7 Sep 2024 16:43:23 +0300 Subject: [PATCH] =?UTF-8?q?=D1=91=D1=91=D1=91=D1=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Research/UI/ResearchConsoleMenu.xaml | 2 +- .../Speech/EntitySystems/FrontalLispSystem.cs | 36 +++- .../EntitySystems/LizardAccentSystem.cs | 69 ++++++- .../Speech/EntitySystems/MothAccentSystem.cs | 39 +++- .../Speech/EntitySystems/OwOAccentSystem.cs | 5 + .../Speech/EntitySystems/SlurredSystem.cs | 6 + .../Speech/EntitySystems/StutteringSystem.cs | 2 +- .../ru-RU/_LostParadise/command_locs.ftl | 2 +- Resources/Locale/ru-RU/cluwne/cluwne.ftl | 2 +- .../Locale/ru-RU/deltav/guidebook/guides.ftl | 2 +- Resources/Locale/ru-RU/glue/glue.ftl | 2 +- Resources/Locale/ru-RU/lube/lube.ftl | 2 +- Resources/Prototypes/Voice/disease_emotes.yml | 9 + .../Entities/Objects/Materials/parts.yml | 72 ------- .../Entities/Objects/Misc/tiles.yml | 192 ------------------ .../Graphs/tiles/LED-disco-floor.yml | 115 ----------- .../Construction/Graphs/tiles/circuit.yml | 98 --------- .../Stacks/floor_tile_stacks.yml | 75 ------- ...0\276\321\201\320\272\320\276\320\271.txt" | 3 - ...1\203\320\264\320\260\321\207\320\260.txt" | 2 - 20 files changed, 159 insertions(+), 576 deletions(-) delete mode 100644 Resources/Prototypes/_LostParadise/Entities/Objects/Materials/parts.yml delete mode 100644 Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/tiles/LED-disco-floor.yml delete mode 100644 Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/tiles/circuit.yml delete mode 100644 Resources/Prototypes/_LostParadise/Stacks/floor_tile_stacks.yml delete mode 100644 "Resources/Textures/_LostParadise/Clothing/Socks/New/darkredline.rsi/\320\247\321\203\320\273\320\272\320\270 \321\201 \320\272\321\200\320\260\321\201\320\275\320\276\320\271 \320\277\320\276\320\273\320\276\321\201\320\272\320\276\320\271.txt" delete mode 100644 "Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/critical-luck.rsi/\320\272\321\200\320\270\321\202\320\270\321\207\320\265\321\201\320\272\320\260\321\217 \321\203\320\264\320\260\321\207\320\260.txt" diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml b/Content.Client/Research/UI/ResearchConsoleMenu.xaml index 8de9827c0c..4caa6826c1 100644 --- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml +++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml @@ -4,7 +4,7 @@ xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls" Title="{Loc 'research-console-menu-title'}" MinSize="625 400" - SetSize="700 550"> + SetSize="760 550"> diff --git a/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs b/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs index 96e3620ecf..954ad5b921 100644 --- a/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs +++ b/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs @@ -1,10 +1,20 @@ using System.Text.RegularExpressions; using Content.Server.Speech.Components; +using Robust.Shared.Random; // Corvax-Localization namespace Content.Server.Speech.EntitySystems; public sealed class FrontalLispSystem : EntitySystem { + // @formatter:off + private static readonly Regex RegexUpperTh = new(@"[T]+[Ss]+|[S]+[Cc]+(?=[IiEeYy]+)|[C]+(?=[IiEeYy]+)|[P][Ss]+|([S]+[Tt]+|[T]+)(?=[Ii]+[Oo]+[Uu]*[Nn]*)|[C]+[Hh]+(?=[Ii]*[Ee]*)|[Z]+|[S]+|[X]+(?=[Ee]+)"); + private static readonly Regex RegexLowerTh = new(@"[t]+[s]+|[s]+[c]+(?=[iey]+)|[c]+(?=[iey]+)|[p][s]+|([s]+[t]+|[t]+)(?=[i]+[o]+[u]*[n]*)|[c]+[h]+(?=[i]*[e]*)|[z]+|[s]+|[x]+(?=[e]+)"); + private static readonly Regex RegexUpperEcks = new(@"[E]+[Xx]+[Cc]*|[X]+"); + private static readonly Regex RegexLowerEcks = new(@"[e]+[x]+[c]*|[x]+"); + // @formatter:on + + [Dependency] private readonly IRobustRandom _random = default!; // Corvax-Localization + public override void Initialize() { base.Initialize(); @@ -16,11 +26,29 @@ private void OnAccent(EntityUid uid, FrontalLispComponent component, AccentGetEv var message = args.Message; // handles ts, sc(i|e|y), c(i|e|y), ps, st(io(u|n)), ch(i|e), z, s - message = Regex.Replace(message, @"[T]+[Ss]+|[S]+[Cc]+(?=[IiEeYy]+)|[C]+(?=[IiEeYy]+)|[P][Ss]+|([S]+[Tt]+|[T]+)(?=[Ii]+[Oo]+[Uu]*[Nn]*)|[C]+[Hh]+(?=[Ii]*[Ee]*)|[Z]+|[S]+|[X]+(?=[Ee]+)", "TH"); - message = Regex.Replace(message, @"[t]+[s]+|[s]+[c]+(?=[iey]+)|[c]+(?=[iey]+)|[p][s]+|([s]+[t]+|[t]+)(?=[i]+[o]+[u]*[n]*)|[c]+[h]+(?=[i]*[e]*)|[z]+|[s]+|[x]+(?=[e]+)", "th"); + message = RegexUpperTh.Replace(message, "TH"); + message = RegexLowerTh.Replace(message, "th"); // handles ex(c), x - message = Regex.Replace(message, @"[E]+[Xx]+[Cc]*|[X]+", "EKTH"); - message = Regex.Replace(message, @"[e]+[x]+[c]*|[x]+", "ekth"); + message = RegexUpperEcks.Replace(message, "EKTH"); + message = RegexLowerEcks.Replace(message, "ekth"); + + // Corvax-Localization Start + // с - ш + message = Regex.Replace(message, @"с", _random.Prob(0.90f) ? "ш" : "с"); + message = Regex.Replace(message, @"С", _random.Prob(0.90f) ? "Ш" : "С"); + // ч - ш + message = Regex.Replace(message, @"ч", _random.Prob(0.90f) ? "ш" : "ч"); + message = Regex.Replace(message, @"Ч", _random.Prob(0.90f) ? "Ш" : "Ч"); + // ц - ч + message = Regex.Replace(message, @"ц", _random.Prob(0.90f) ? "ч" : "ц"); + message = Regex.Replace(message, @"Ц", _random.Prob(0.90f) ? "Ч" : "Ц"); + // т - ч + message = Regex.Replace(message, @"\B[т](?![АЕЁИОУЫЭЮЯаеёиоуыэюя])", _random.Prob(0.90f) ? "ч" : "т"); + message = Regex.Replace(message, @"\B[Т](?![АЕЁИОУЫЭЮЯаеёиоуыэюя])", _random.Prob(0.90f) ? "Ч" : "Т"); + // з - ж + message = Regex.Replace(message, @"з", _random.Prob(0.90f) ? "ж" : "з"); + message = Regex.Replace(message, @"З", _random.Prob(0.90f) ? "Ж" : "З"); + // Corvax-Localization End args.Message = message; } diff --git a/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs b/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs index a7e21016a2..153f3455e9 100644 --- a/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs @@ -1,10 +1,19 @@ using System.Text.RegularExpressions; using Content.Server.Speech.Components; +using Robust.Shared.Random; namespace Content.Server.Speech.EntitySystems; public sealed class LizardAccentSystem : EntitySystem { + private static readonly Regex RegexLowerS = new("s+"); + private static readonly Regex RegexUpperS = new("S+"); + private static readonly Regex RegexInternalX = new(@"(\w)x"); + private static readonly Regex RegexLowerEndX = new(@"\bx([\-|r|R]|\b)"); + private static readonly Regex RegexUpperEndX = new(@"\bX([\-|r|R]|\b)"); + + [Dependency] private readonly IRobustRandom _random = default!; // Corvax-Localization + public override void Initialize() { base.Initialize(); @@ -16,16 +25,66 @@ private void OnAccent(EntityUid uid, LizardAccentComponent component, AccentGetE var message = args.Message; // hissss - message = Regex.Replace(message, "s+", "sss"); + message = RegexLowerS.Replace(message, "sss"); // hiSSS - message = Regex.Replace(message, "S+", "SSS"); + message = RegexUpperS.Replace(message, "SSS"); // ekssit - message = Regex.Replace(message, @"(\w)x", "$1kss"); + message = RegexInternalX.Replace(message, "$1kss"); // ecks - message = Regex.Replace(message, @"\bx([\-|r|R]|\b)", "ecks$1"); + message = RegexLowerEndX.Replace(message, "ecks$1"); // eckS - message = Regex.Replace(message, @"\bX([\-|r|R]|\b)", "ECKS$1"); + message = RegexUpperEndX.Replace(message, "ECKS$1"); + // Corvax-Localization-Start + // c => ссс + message = Regex.Replace( + message, + "с+", + _random.Pick(new List() { "сс", "ссс" }) + ); + // С => CCC + message = Regex.Replace( + message, + "С+", + _random.Pick(new List() { "СС", "ССС" }) + ); + // з => ссс + message = Regex.Replace( + message, + "з+", + _random.Pick(new List() { "сс", "ссс" }) + ); + // З => CCC + message = Regex.Replace( + message, + "З+", + _random.Pick(new List() { "СС", "ССС" }) + ); + // ш => шшш + message = Regex.Replace( + message, + "ш+", + _random.Pick(new List() { "шш", "шшш" }) + ); + // Ш => ШШШ + message = Regex.Replace( + message, + "Ш+", + _random.Pick(new List() { "ШШ", "ШШШ" }) + ); + // ч => щщщ + message = Regex.Replace( + message, + "ч+", + _random.Pick(new List() { "щщ", "щщщ" }) + ); + // Ч => ЩЩЩ + message = Regex.Replace( + message, + "Ч+", + _random.Pick(new List() { "ЩЩ", "ЩЩЩ" }) + ); + // Corvax-Localization-End args.Message = message; } } diff --git a/Content.Server/Speech/EntitySystems/MothAccentSystem.cs b/Content.Server/Speech/EntitySystems/MothAccentSystem.cs index 3de4651b4a..7a1449ae9d 100644 --- a/Content.Server/Speech/EntitySystems/MothAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/MothAccentSystem.cs @@ -1,10 +1,16 @@ using System.Text.RegularExpressions; using Content.Server.Speech.Components; +using Robust.Shared.Random; namespace Content.Server.Speech.EntitySystems; public sealed class MothAccentSystem : EntitySystem { + [Dependency] private readonly IRobustRandom _random = default!; // Corvax-Localization + + private static readonly Regex RegexLowerBuzz = new Regex("z{1,3}"); + private static readonly Regex RegexUpperBuzz = new Regex("Z{1,3}"); + public override void Initialize() { base.Initialize(); @@ -16,10 +22,37 @@ private void OnAccent(EntityUid uid, MothAccentComponent component, AccentGetEve var message = args.Message; // buzzz - message = Regex.Replace(message, "z{1,3}", "zzz"); + message = RegexLowerBuzz.Replace(message, "zzz"); // buZZZ - message = Regex.Replace(message, "Z{1,3}", "ZZZ"); - + message = RegexUpperBuzz.Replace(message, "ZZZ"); + + // Corvax-Localization-Start + // ж => жжж + message = Regex.Replace( + message, + "ж+", + _random.Pick(new List() { "жж", "жжж" }) + ); + // Ж => ЖЖЖ + message = Regex.Replace( + message, + "Ж+", + _random.Pick(new List() { "ЖЖ", "ЖЖЖ" }) + ); + // з => ссс + message = Regex.Replace( + message, + "з+", + _random.Pick(new List() { "зз", "ззз" }) + ); + // З => CCC + message = Regex.Replace( + message, + "З+", + _random.Pick(new List() { "ЗЗ", "ЗЗЗ" }) + ); + // Corvax-Localization-End + args.Message = message; } } diff --git a/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs b/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs index cac3debe81..619e1eacbc 100644 --- a/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs @@ -14,6 +14,7 @@ public sealed class OwOAccentSystem : EntitySystem private static readonly IReadOnlyDictionary SpecialWords = new Dictionary() { { "you", "wu" }, + { "ты", "ти" }, // Corvax-Localization }; public override void Initialize() @@ -29,6 +30,10 @@ public string Accentuate(string message) } return message.Replace("!", _random.Pick(Faces)) + // Corvax-Localization-Start + .Replace("р", "в").Replace("Р", "В") + .Replace("л", "в").Replace("Л", "В") + // Corvax-Localization-End .Replace("r", "w").Replace("R", "W") .Replace("l", "w").Replace("L", "W"); } diff --git a/Content.Server/Speech/EntitySystems/SlurredSystem.cs b/Content.Server/Speech/EntitySystems/SlurredSystem.cs index e396cd0b18..7e6fd896aa 100644 --- a/Content.Server/Speech/EntitySystems/SlurredSystem.cs +++ b/Content.Server/Speech/EntitySystems/SlurredSystem.cs @@ -71,6 +71,12 @@ private string Accentuate(string message, float scale) 'a' => "ah", 'u' => "oo", 'c' => "k", + // Corvax-Localization Start + 'о' => "а", + 'к' => "кх", + 'щ' => "шч", + 'ц' => "тс", + // Corvax-Localization End _ => $"{character}", }; diff --git a/Content.Server/Speech/EntitySystems/StutteringSystem.cs b/Content.Server/Speech/EntitySystems/StutteringSystem.cs index d6e3c0b749..ef7ae505bf 100644 --- a/Content.Server/Speech/EntitySystems/StutteringSystem.cs +++ b/Content.Server/Speech/EntitySystems/StutteringSystem.cs @@ -13,7 +13,7 @@ public sealed class StutteringSystem : SharedStutteringSystem [Dependency] private readonly IRobustRandom _random = default!; // Regex of characters to stutter. - private static readonly Regex Stutter = new(@"[b-df-hj-np-tv-wxyz]", + private static readonly Regex Stutter = new(@"[b-df-hj-np-tv-wxyz-б-вд-к-лмн-прст]", // Corvax-Localization RegexOptions.Compiled | RegexOptions.IgnoreCase); public override void Initialize() diff --git a/Resources/Locale/ru-RU/_LostParadise/command_locs.ftl b/Resources/Locale/ru-RU/_LostParadise/command_locs.ftl index 240c97ee5b..8cf51a0ede 100644 --- a/Resources/Locale/ru-RU/_LostParadise/command_locs.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/command_locs.ftl @@ -36,7 +36,7 @@ command-description-types-fullname = . command-description-AddCommand = . command-description-AddVecCommand = . command-description-SubtractCommand = . -command-description-SubVecCommand= . +command-description-SubVecCommand = . command-description-MultiplyCommand = . command-description-MulVecCommand = . command-description-DivideCommand = . diff --git a/Resources/Locale/ru-RU/cluwne/cluwne.ftl b/Resources/Locale/ru-RU/cluwne/cluwne.ftl index 8b882700f6..726ab44e3e 100644 --- a/Resources/Locale/ru-RU/cluwne/cluwne.ftl +++ b/Resources/Locale/ru-RU/cluwne/cluwne.ftl @@ -1,2 +1,2 @@ cluwne-transform = { CAPITALIZE($target) } превратился в клувеня! -cluwne-name-prefix = клувень {$target} +cluwne-name-prefix = клувень { $target } diff --git a/Resources/Locale/ru-RU/deltav/guidebook/guides.ftl b/Resources/Locale/ru-RU/deltav/guidebook/guides.ftl index 8224ef5275..501ca6148b 100644 --- a/Resources/Locale/ru-RU/deltav/guidebook/guides.ftl +++ b/Resources/Locale/ru-RU/deltav/guidebook/guides.ftl @@ -1 +1 @@ -guide-entry-justice = Отдел Юстиции \ No newline at end of file +guide-entry-justice = Отдел Юстиции diff --git a/Resources/Locale/ru-RU/glue/glue.ftl b/Resources/Locale/ru-RU/glue/glue.ftl index d9057c391e..4c7ea77c11 100644 --- a/Resources/Locale/ru-RU/glue/glue.ftl +++ b/Resources/Locale/ru-RU/glue/glue.ftl @@ -1,5 +1,5 @@ glue-success = Вы покрыли { $target } клеем! -glued-name-prefix = липкий {$target} +glued-name-prefix = липкий { $target } glue-failure = Не удалось покрыть { $target } клеем. glue-verb-text = Нанести клей glue-verb-message = Покрыть предмет клеем diff --git a/Resources/Locale/ru-RU/lube/lube.ftl b/Resources/Locale/ru-RU/lube/lube.ftl index 11d3be8793..551772cb72 100644 --- a/Resources/Locale/ru-RU/lube/lube.ftl +++ b/Resources/Locale/ru-RU/lube/lube.ftl @@ -1,5 +1,5 @@ lube-success = Вы покрыли { $target } смазкой! -lubed-name-prefix = смазанный {$target} +lubed-name-prefix = смазанный { $target } lube-failure = Не удалось покрыть { $target } смазкой! lube-slip = { $target } выскальзывает из ваших рук! lube-verb-text = Нанести смазку diff --git a/Resources/Prototypes/Voice/disease_emotes.yml b/Resources/Prototypes/Voice/disease_emotes.yml index 7845fd3e6d..65c209ccb8 100644 --- a/Resources/Prototypes/Voice/disease_emotes.yml +++ b/Resources/Prototypes/Voice/disease_emotes.yml @@ -9,6 +9,11 @@ chatMessages: [ coughs ] chatTriggers: - coughs + # Corvax-Localization-Start + - кашель + - кашляет + - кашлянул + # Corvax-Localization-End - type: emote id: CatMeow @@ -36,6 +41,10 @@ chatMessages: [ yawns ] chatTriggers: - yawns + # Corvax-Localization-Start + - зевок + - зевает + # Corvax-Localization-End - type: emote id: Snore diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Materials/parts.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Materials/parts.yml deleted file mode 100644 index e1f149e7b7..0000000000 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Materials/parts.yml +++ /dev/null @@ -1,72 +0,0 @@ - -- type: entity - parent: LPPFloorGreenCircuitBase - id: LPPFloorGreenItemCircuitBaseLingering0 - suffix: Lingering, 0 - components: - - type: Stack - lingering: true - count: 0 - - -- type: entity - parent: LPPFloorBlueCircuitBase - id: LPPFloorBlueItemCircuitBaseLingering0 - suffix: Lingering, 0 - components: - - type: Stack - lingering: true - count: 0 - -#---------танц-пол - -- type: entity - parent: LPPLEDDiscoFloorOjects - id: LPPLEDDiscoFloorOjectsLingering0 - suffix: Lingering, 0 - components: - - type: Stack - lingering: true - count: 0 - -- type: entity - parent: LPPLEDDiscoFloorRotatesOjects - id: LPPLEDDiscoFloorRotatesOjectsLingering0 - suffix: Lingering, 0 - components: - - type: Stack - lingering: true - count: 0 - -- type: entity - parent: LPPLEDDiscoFloorRotatesHalfwayOjects - id: LPPLEDDiscoFloorRotatesHalfwayOjectsLingering0 - suffix: Lingering, 0 - components: - - type: Stack - lingering: true - count: 0 - - - -# - - - -- type: entity - parent: LPPLEDDiscoFloorMatrix4Ojects - id: LPPLEDDiscoFloorMatrix4OjectsLingering0 - suffix: Lingering, 0 - components: - - type: Stack - lingering: true - count: 0 - -- type: entity - parent: LPPLEDDiscoFloorMatrix1Ojects - id: LPPLEDDiscoFloorMatrix1OjectsLingering0 - suffix: Lingering, 0 - components: - - type: Stack - lingering: true - count: 0 diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/tiles.yml index a625ad0569..01212d1694 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/tiles.yml @@ -44,198 +44,6 @@ types: Blunt: 5 - -#---------Circuits плитки-------- -- type: entity - name: green circuit floor - parent: LPPFloorTileItemBase - id: LPPFloorGreenCircuitBase - components: - - type: Sprite - state: gcircuit - - type: Item - heldPrefix: gcircuit - - type: Tag - tags: - - FloorGreenCircuitBase - - FloorGreenCircuit - - type: Stack - stackType: LPPFloorGreenCircuitBase - - type: Construction #крафт - graph: LPPFloorGreenCircuitOjects - node: icon - - -- type: entity - name: blue circuit floor - parent: LPPFloorTileItemBase - id: LPPFloorBlueCircuitBase - components: - - type: Sprite - state: bcircuit - - type: Item - heldPrefix: bcircuit - - type: Tag - tags: - - FloorGreenCircuitBase - - FloorBlueCircuit - - type: Stack - stackType: LPPFloorBlueCircuitBase - - type: Construction #крафт - graph: LPPFloorBlueCircuitOjects - node: icon - - -#---------Диско-пол плитки-------- - -- type: entity - parent: BaseItem - id: LPPLEDDiscoFloorBase - description: These could work as a pretty decent throwing weapon. - abstract: true - components: - - type: Sprite - sprite: _LostParadise/Objects/Tiles/tiles.rsi - - type: Item - sprite: _LostParadise/Objects/Tiles/tiles.rsi - size: Normal - - type: DamageOtherOnHit - damage: - types: - Blunt: 5 - - type: Stack - count: 1 - - type: Tag - tags: - - DroneUsable - - type: Damageable - damageContainer: Inorganic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 30 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/metal_break1.ogg - params: - volume: -8 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: DamageOnLand - damage: - types: - Blunt: 5 - -#----------------код - -- type: entity - name: green circuit floor - parent: LPPLEDDiscoFloorBase - id: LPPLEDDiscoFloorOjects - components: - - type: Sprite - state: LED-disco-floor-Item-1 - - type: Item - heldPrefix: LED-disco-floor-Item-1 - - type: Tag - tags: - - LPPLEDDiscoFloorOjects - - LPPLEDDiscoFloor - - type: Stack - stackType: LPPLEDDiscoFloorOjects - - type: Construction #крафт - graph: LPPLEDDiscoFloorOjects - node: icon - -- type: entity - name: blue circuit floor - parent: LPPLEDDiscoFloorBase - id: LPPLEDDiscoFloorRotatesOjects - components: - - type: Sprite - state: LED-disco-floor-Item-2 - - type: Item - heldPrefix: LED-disco-floor-Item-2 - - type: Tag - tags: - - LPPLEDDiscoFloorRotatesOjects - - LPPLEDDiscoFloorRotates - - type: Stack - stackType: LPPLEDDiscoFloorRotatesOjects - - type: Construction #крафт - graph: LPPLEDDiscoFloorRotatesOjects - node: icon - -- type: entity - name: LED disco floor rotates halfway - parent: LPPLEDDiscoFloorBase - id: LPPLEDDiscoFloorRotatesHalfwayOjects - components: - - type: Sprite - state: LED-disco-floor-Item-3 - - type: Item - heldPrefix: LED-disco-floor-Item-3 - - type: Tag - tags: - - LPPLEDDiscoFloorRotatesHalfwayOjects - - LLPPLEDDiscoFloorRotatesHalfway - - type: Stack - stackType: LPPLEDDiscoFloorRotatesHalfwayOjects - - type: Construction #крафт - graph: LPPLEDDiscoFloorRotatesHalfwayOjects - node: icon - -#----------------------------# -#----------матрица-----------# -#----------------------------# - -- type: entity - name: LED disco floor rotates halfway - parent: LPPLEDDiscoFloorBase - id: LPPLEDDiscoFloorMatrix4Ojects - components: - - type: Sprite - state: rgb_circuit-4-mix - - type: Item - heldPrefix: rgb_circuit-4-mix - - type: Tag - tags: - - LPPLEDDiscoFloorMatrix4Ojects - - LPPLEDDiscoFloorMatrix4 - - type: Stack - stackType: LPPLEDDiscoFloorMatrix4Ojects - - type: Construction #крафт - graph: LPPLEDDiscoFloorMatrix4Ojects - node: icon - - -- type: entity - name: LED disco floor matri - parent: LPPLEDDiscoFloorBase - id: LPPLEDDiscoFloorMatrix1Ojects - components: - - type: Sprite - state: rgb_circuit-5-mix - - type: Item - heldPrefix: rgb_circuit-5-mix - - type: Tag - tags: - - LPPLEDDiscoFloorMatrix1Ojects - - LPPLEDDiscoFloorMatrix1 - - type: Stack - stackType: LPPLEDDiscoFloorMatrix1Ojects - - type: Construction #крафт - graph: LPPLEDDiscoFloorMatrix1Ojects - node: icon - #------------------------------------------------------# #---------dark----dark----dark----dark----dark---------# #------------------------------------------------------# diff --git a/Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/tiles/LED-disco-floor.yml b/Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/tiles/LED-disco-floor.yml deleted file mode 100644 index 14eb4088f3..0000000000 --- a/Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/tiles/LED-disco-floor.yml +++ /dev/null @@ -1,115 +0,0 @@ -- type: constructionGraph - id: LPPLEDDiscoFloorOjects - start: start - graph: - - node: start - edges: - - to: icon - steps: - - material: Glass - amount: 1 - doAfter: 1 - - material: Uranium - amount: 1 - doAfter: 1 - - material: Steel - amount: 2 - doAfter: 1 - - material: Cable - amount: 2 - doAfter: 1 - - node: icon - entity: LPPLEDDiscoFloorOjects - -- type: constructionGraph - id: LPPLEDDiscoFloorRotatesOjects - start: start - graph: - - node: start - edges: - - to: icon - steps: - - material: Glass - amount: 1 - doAfter: 1 - - material: Uranium - amount: 1 - doAfter: 1 - - material: Steel - amount: 2 - doAfter: 1 - - material: Cable - amount: 2 - doAfter: 1 - - node: icon - entity: LPPLEDDiscoFloorRotatesOjects - -- type: constructionGraph - id: LPPLEDDiscoFloorRotatesHalfwayOjects - start: start - graph: - - node: start - edges: - - to: icon - steps: - - material: Glass - amount: 1 - doAfter: 1 - - material: Uranium - amount: 1 - doAfter: 1 - - material: Steel - amount: 2 - doAfter: 1 - - material: Cable - amount: 2 - doAfter: 1 - - node: icon - entity: LPPLEDDiscoFloorRotatesHalfwayOjects - -#----------матрица----------- -- type: constructionGraph - id: LPPLEDDiscoFloorMatrix4Ojects - start: start - graph: - - node: start - edges: - - to: icon - steps: - - material: Glass - amount: 1 - doAfter: 1 - - material: Uranium - amount: 1 - doAfter: 1 - - material: Steel - amount: 2 - doAfter: 1 - - material: Cable - amount: 2 - doAfter: 1 - - node: icon - entity: LPPLEDDiscoFloorMatrix4Ojects - -- type: constructionGraph - id: LPPLEDDiscoFloorMatrix1Ojects - start: start - graph: - - node: start - edges: - - to: icon - steps: - - material: Glass - amount: 1 - doAfter: 1 - - material: Uranium - amount: 1 - doAfter: 1 - - material: Steel - amount: 2 - doAfter: 1 - - material: Cable - amount: 2 - doAfter: 1 - - node: icon - entity: LPPLEDDiscoFloorMatrix1Ojects diff --git a/Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/tiles/circuit.yml b/Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/tiles/circuit.yml deleted file mode 100644 index 9a46c05318..0000000000 --- a/Resources/Prototypes/_LostParadise/Recipes/Construction/Graphs/tiles/circuit.yml +++ /dev/null @@ -1,98 +0,0 @@ -- type: constructionGraph - id: LPPFloorGreenCircuitOjects - start: start - graph: - - node: start - edges: - - to: icon - steps: - - material: Glass - amount: 1 - doAfter: 1 - - material: Uranium - amount: 2 - doAfter: 1 - - material: Steel - amount: 2 - doAfter: 1 - - material: Cable - amount: 2 - doAfter: 1 - - node: icon - entity: LPPFloorGreenCircuitBase - -- type: constructionGraph - id: LPPFloorBlueCircuitOjects - start: start - graph: - - node: start - edges: - - to: icon - steps: - - material: Glass - amount: 1 - doAfter: 1 - - material: Uranium - amount: 2 - doAfter: 1 - - material: Steel - amount: 2 - doAfter: 1 - - material: Cable - amount: 2 - doAfter: 1 - - node: icon - entity: LPPFloorBlueCircuitBase - -###- type: constructionGraph ### -### id: LPPFloorGreenCircuitOjects ### -### start: start ### -### graph: ### -### - node: start ### -### edges: ### -### - to: LPPFloorGreenCircuitOjectsBase ### -### completed: ### -### - !type:SnapToGrid ### -### southRotation: true ### -### steps: ### -### - material: Glass ### -### amount: 1 ### -### doAfter: 1 ### -### - material: Uranium ### -### amount: 2 ### -### doAfter: 1 ### -### - material: Steel ### -### amount: 2 ### -### doAfter: 1 ### -### - material: Cable ### -### amount: 2 ### -### doAfter: 1 ### - -######################################################################## -##### - to: LPPFloorBlueCircuitOjects ##### -##### completed: ##### -##### - !type:SnapToGrid ##### -##### southRotation: true ##### -##### steps: ##### -##### - material: Glass ##### -##### amount: 1 ##### -##### doAfter: 1 ##### -##### - material: Uranium ##### -##### amount: 2 ##### -##### doAfter: 1 ##### -##### - material: Steel ##### -##### amount: 2 ##### -##### doAfter: 1 ##### -##### - material: Cable ##### -##### amount: 2 ##### -##### doAfter: 1 ##### -##### - tag: EggSpider ##### -##### name: egg spider ##### -##### icon: ##### -##### sprite: Objects/Misc/eggspider.rsi ##### -##### state: icon ##### -##### amount: 1 ##### -##### doAfter: 1 ##### -######################################################################## - - diff --git a/Resources/Prototypes/_LostParadise/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/_LostParadise/Stacks/floor_tile_stacks.yml deleted file mode 100644 index df38c623c7..0000000000 --- a/Resources/Prototypes/_LostParadise/Stacks/floor_tile_stacks.yml +++ /dev/null @@ -1,75 +0,0 @@ -- type: stack - id: LPPFloorGreenCircuitBase - name: floor green circuit - spawn: LPPFloorGreenCircuitBase - icon: - sprite: Objects/Tiles/tile.rsi - state: gcircuit - maxCount: 30 - itemSize: 5 - -- type: stack - id: LPPFloorBlueCircuitBase - name: floor blue circuit - spawn: LPPFloorBlueCircuitBase - icon: - sprite: Objects/Tiles/tile.rsi - state: bcircuit - maxCount: 30 - itemSize: 5 - -#------танц-пол - -- type: stack - id: LPPLEDDiscoFloorOjects - name: LED disco floor # Светодиодный пол для дискотеки. - spawn: LPPLEDDiscoFloorOjects - icon: - sprite: _LostParadise/Objects/Tiles/tiles.rsi - state: LED-disco-floor-Item-1 - maxCount: 30 - itemSize: 5 - -- type: stack - id: LPPLEDDiscoFloorRotatesOjects - name: LED disco floor (rotates) # Светодиодный пол для дискотеки (вращается) - spawn: LPPLEDDiscoFloorRotatesOjects - icon: - sprite: _LostParadise/Objects/Tiles/tiles.rsi - state: LED-disco-floor-Item-2 - maxCount: 30 - itemSize: 5 - -- type: stack - id: LPPLEDDiscoFloorRotatesHalfwayOjects - name: LED disco floor (rotates halfway) # Светодиодный пол для дискотеки (вращается на половину) - spawn: LPPLEDDiscoFloorRotatesHalfwayOjects - icon: - sprite: _LostParadise/Objects/Tiles/tiles.rsi - state: LED-disco-floor-Item-3 - maxCount: 30 - itemSize: 5 - -#------матрица - - -- type: stack - id: LPPLEDDiscoFloorMatrix4Ojects - name: LED disco floor (matrix-4) # матрица 4 кбика - spawn: LPPLEDDiscoFloorMatrix4Ojects - icon: - sprite: _LostParadise/Objects/Tiles/tiles.rsi - state: LED-disco-floor-Item-3 - maxCount: 30 - itemSize: 5 - - -- type: stack - id: LPPLEDDiscoFloorMatrix1Ojects - name: LED disco floor(matrix-1) # матрица 1 кбик - spawn: LPPLEDDiscoFloorMatrix1Ojects - icon: - sprite: _LostParadise/Objects/Tiles/tiles.rsi - state: LED-disco-floor-Item-3 - maxCount: 30 - itemSize: 5 diff --git "a/Resources/Textures/_LostParadise/Clothing/Socks/New/darkredline.rsi/\320\247\321\203\320\273\320\272\320\270 \321\201 \320\272\321\200\320\260\321\201\320\275\320\276\320\271 \320\277\320\276\320\273\320\276\321\201\320\272\320\276\320\271.txt" "b/Resources/Textures/_LostParadise/Clothing/Socks/New/darkredline.rsi/\320\247\321\203\320\273\320\272\320\270 \321\201 \320\272\321\200\320\260\321\201\320\275\320\276\320\271 \320\277\320\276\320\273\320\276\321\201\320\272\320\276\320\271.txt" deleted file mode 100644 index b592b77506..0000000000 --- "a/Resources/Textures/_LostParadise/Clothing/Socks/New/darkredline.rsi/\320\247\321\203\320\273\320\272\320\270 \321\201 \320\272\321\200\320\260\321\201\320\275\320\276\320\271 \320\277\320\276\320\273\320\276\321\201\320\272\320\276\320\271.txt" +++ /dev/null @@ -1,3 +0,0 @@ -Название: Чулки с красной полоской -Описание: Вариация чулков с полоской. С этими чулками, вашим офицерам СБ не придется бегать за нарушителями, ведь они падут пред их ногами. -примечание: Можно достать либо в автомате с обычной одеждой, либо в автомате с одеждой для СБ. \ No newline at end of file diff --git "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/critical-luck.rsi/\320\272\321\200\320\270\321\202\320\270\321\207\320\265\321\201\320\272\320\260\321\217 \321\203\320\264\320\260\321\207\320\260.txt" "b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/critical-luck.rsi/\320\272\321\200\320\270\321\202\320\270\321\207\320\265\321\201\320\272\320\260\321\217 \321\203\320\264\320\260\321\207\320\260.txt" deleted file mode 100644 index b18a698ce7..0000000000 --- "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/critical-luck.rsi/\320\272\321\200\320\270\321\202\320\270\321\207\320\265\321\201\320\272\320\260\321\217 \321\203\320\264\320\260\321\207\320\260.txt" +++ /dev/null @@ -1,2 +0,0 @@ -В свое время, очень популярные у солдат сигареты. -Прожарка боевым пламенем придает табаку улучшенный вкус и понижает кислотность, облегчает воздействие сигарет на горло...