Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix 3 #378

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
b8074ea
Use EnsureComp for StationSpawningSystem (#1424)
sleepyyapril Jan 4, 2025
75bb8d3
[Port] Port Guidebook Tables From Wizden PR #28484 (#1427)
CerberusWolfie Jan 5, 2025
026d552
Automatic Changelog Update (#1427)
SimpleStation14 Jan 5, 2025
d17fe1a
Add Different Launch Types to VSCode (#1430)
CerberusWolfie Jan 5, 2025
1e1e36c
💅🏻 Lamia Markings + ♂️ Male Lamia (#1440)
angelofallars Jan 5, 2025
138048d
Automatic Changelog Update (#1440)
SimpleStation14 Jan 5, 2025
6c70875
Throwing Mini-Update 1 (#1434)
angelofallars Jan 5, 2025
5cb3d42
Automatic Changelog Update (#1434)
SimpleStation14 Jan 5, 2025
68a11db
New Traits: Steadfast And Feeble (#1431)
angelofallars Jan 5, 2025
136be4e
Automatic Changelog Update (#1431)
SimpleStation14 Jan 5, 2025
11678af
Footprints Performance Updates (#1439)
VMSolidus Jan 5, 2025
d2875c9
Automatic Changelog Update (#1439)
SimpleStation14 Jan 5, 2025
71e3c03
Pacification Prevents Throwing Weapons (#1433)
angelofallars Jan 5, 2025
06be5d3
Automatic Changelog Update (#1433)
SimpleStation14 Jan 5, 2025
8935492
Parkour Training Rework (#1432)
angelofallars Jan 5, 2025
72d6347
Automatic Changelog Update (#1432)
SimpleStation14 Jan 5, 2025
deecce3
Unlimited Face Markings (#1435)
angelofallars Jan 5, 2025
e41e12f
Automatic Changelog Update (#1435)
SimpleStation14 Jan 5, 2025
9a2eac3
Fix Lamia Footprints (#1425)
VMSolidus Jan 5, 2025
b2cf69c
Hotfix Material Arbitrage Test (#1392)
VMSolidus Jan 5, 2025
d29149b
Automatic Changelog Update (#1425)
SimpleStation14 Jan 5, 2025
1c75299
Fixed Monkey Skin Color (#1437)
VMSolidus Jan 5, 2025
cd29b5e
Automatic Changelog Update (#1437)
SimpleStation14 Jan 5, 2025
231a077
Fix Various Language Trait Issues (#1441)
VMSolidus Jan 5, 2025
48ac2d2
Port Frontier Clothes (#1388)
VMSolidus Jan 5, 2025
18adcc1
Automatic Changelog Update (#1441)
SimpleStation14 Jan 5, 2025
6547c10
Fix Pirate Radio Rule (#1438)
VMSolidus Jan 5, 2025
7cffc48
Automatic Changelog Update (#1388)
SimpleStation14 Jan 5, 2025
e31692d
Automatic Changelog Update (#1438)
SimpleStation14 Jan 5, 2025
ca0b40a
The Den Mass Cherry-Pick 01/06/25 (#1443)
angelofallars Jan 5, 2025
975c905
Automatic Changelog Update (#1443)
SimpleStation14 Jan 5, 2025
a55e88d
hotfix 3
Farrellka-dev Jan 6, 2025
a87ad02
hotfix 3.1
Farrellka-dev Jan 6, 2025
fbc6281
hotfix 3.2
Farrellka-dev Jan 6, 2025
e01c53d
hotfix 3.3
Farrellka-dev Jan 6, 2025
5b8940e
hotfix 3.4
Farrellka-dev Jan 6, 2025
97efafc
hotfix 3.5
Farrellka-dev Jan 6, 2025
096d947
hotfix 3.5
Farrellka-dev Jan 6, 2025
b1a37d1
Merge remote-tracking branch 'EE/master' into hotfixmap
Farrellka-dev Jan 6, 2025
f382e32
hotfix 3.6
Farrellka-dev Jan 6, 2025
34e3212
hotfix 3.7
Farrellka-dev Jan 6, 2025
4959ef2
Turn of TTS
Farrellka-dev Jan 6, 2025
0d9adff
hotfix 3.8
Farrellka-dev Jan 6, 2025
373beb4
hotfix 3.9
Farrellka-dev Jan 6, 2025
82dbbac
hotfix 3.10
Farrellka-dev Jan 6, 2025
955a1fa
hotfix 3.11
Farrellka-dev Jan 6, 2025
fa1ac91
hotfix 3.12
Farrellka-dev Jan 6, 2025
f4605b8
hotfix 3.13
Farrellka-dev Jan 6, 2025
b04fd9b
hotfix 3.14
Farrellka-dev Jan 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
84 changes: 82 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
// CLIENT CONFIGS
{
"name": "Client",
"type": "coreclr",
Expand All @@ -14,14 +15,56 @@
"stopAtEntry": false
},
{
"name": "Client (Compatibility renderer)",
"name": "Client (Tools)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build (Tools)",
"program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll",
"args": [],
"console": "internalConsole",
"stopAtEntry": false
},
{
"name": "Client (Release)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build (Release)",
"program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll",
"args": [],
"console": "internalConsole",
"stopAtEntry": false
},
// COMPATABILITY RENDERERS
{
"name": "Client (Compatibility Renderer)",
"type": "coreclr",
"request": "launch",
"program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll",
"args": "--cvar display.compat=true",
"console": "internalConsole",
"stopAtEntry": false
},
{
"name": "Client (Tools) - (Compatability Renderer)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build (Tools)",
"program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll",
"args": ["--cvar display.compat=true"],
"console": "internalConsole",
"stopAtEntry": false
},
{
"name": "Client (Release) - (Compatability Renderer)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build (Release)",
"program": "${workspaceFolder}/bin/Debug/Content.Client/Content.Client.dll",
"args": ["--cvar display.compat=true"],
"console": "internalConsole",
"stopAtEntry": false
},
// SERVER CONFIGS
{
"name": "Server",
"type": "coreclr",
Expand All @@ -31,6 +74,27 @@
"console": "integratedTerminal",
"stopAtEntry": false
},
{
"name": "Server (Tools)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build (Tools)",
"program": "${workspaceFolder}/bin/Content.Server/Content.Server.dll",
"args": [],
"console": "internalConsole",
"stopAtEntry": false
},
{
"name": "Server (Release)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build (Release)",
"program": "${workspaceFolder}/bin/Content.Server/Content.Server.dll",
"args": [],
"console": "internalConsole",
"stopAtEntry": false
},
// LINTER
{
"name": "YAML Linter",
"type": "coreclr",
Expand All @@ -50,6 +114,22 @@
"Client"
],
"preLaunchTask": "build"
},
{
"name": "Server/Client (Tools)",
"configurations": [
"Server (Tools)",
"Client (Tools)"
],
"preLaunchTask": "build (Tools)"
},
{
"name": "Server/Client (Release)",
"configurations": [
"Server (Release)",
"Client (Release)"
],
"preLaunchTask": "build (Release)"
}
]
}
}
42 changes: 41 additions & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,46 @@
},
"problemMatcher": "$msCompile"
},
{
"label": "build (Tools)",
"command": "dotnet",
"type": "shell",
"args": [
"build",
"--configuration",
"Tools",
"/property:GenerateFullPaths=true", // Ask dotnet build to generate full paths for file names.
"/consoleloggerparameters:NoSummary" // Do not generate summary otherwise it leads to duplicate errors in Problems panel
],
"group": {
"kind": "build",
"isDefault": false
},
"presentation": {
"reveal": "silent"
},
"problemMatcher": "$msCompile"
},
{
"label": "build (Release)",
"command": "dotnet",
"type": "shell",
"args": [
"build",
"--configuration",
"Release",
"/property:GenerateFullPaths=true", // Ask dotnet build to generate full paths for file names.
"/consoleloggerparameters:NoSummary" // Do not generate summary otherwise it leads to duplicate errors in Problems panel
],
"group": {
"kind": "build",
"isDefault": false
},
"presentation": {
"reveal": "silent"
},
"problemMatcher": "$msCompile"
},
{
"label": "build-yaml-linter",
"command": "dotnet",
Expand All @@ -34,4 +74,4 @@
"problemMatcher": "$msCompile"
}
]
}
}
2 changes: 1 addition & 1 deletion Content.Client/Corvax/TTS/TTSSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ private void OnPlayTTS(PlayTTSEvent ev)
{
var canPlay = false;
#if LPP_TTS_play //это предназначено для того, чтобы в случае отсутствия ссылки на ТТС, игра не пыталась выполнить обработку звука
canPlay = true;
// canPlay = true;
#endif
if (!canPlay)
return;
Expand Down
3 changes: 3 additions & 0 deletions Content.Client/Guidebook/Richtext/Box.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out
HorizontalExpand = true;
control = this;

if (args.TryGetValue("Margin", out var margin))
Margin = new Thickness(float.Parse(margin));

if (args.TryGetValue("Orientation", out var orientation))
Orientation = Enum.Parse<LayoutOrientation>(orientation);
else
Expand Down
49 changes: 49 additions & 0 deletions Content.Client/Guidebook/Richtext/ColorBox.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
using System.Diagnostics.CodeAnalysis;
using JetBrains.Annotations;
using Robust.Client.Graphics;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;

namespace Content.Client.Guidebook.Richtext;

[UsedImplicitly]
public sealed class ColorBox : PanelContainer, IDocumentTag
{
public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out Control? control)
{
HorizontalExpand = true;
VerticalExpand = true;
control = this;

if (args.TryGetValue("Margin", out var margin))
Margin = new Thickness(float.Parse(margin));

if (args.TryGetValue("HorizontalAlignment", out var halign))
HorizontalAlignment = Enum.Parse<HAlignment>(halign);
else
HorizontalAlignment = HAlignment.Stretch;

if (args.TryGetValue("VerticalAlignment", out var valign))
VerticalAlignment = Enum.Parse<VAlignment>(valign);
else
VerticalAlignment = VAlignment.Stretch;

var styleBox = new StyleBoxFlat();
if (args.TryGetValue("Color", out var color))
styleBox.BackgroundColor = Color.FromHex(color);

if (args.TryGetValue("OutlineThickness", out var outlineThickness))
styleBox.BorderThickness = new Thickness(float.Parse(outlineThickness));
else
styleBox.BorderThickness = new Thickness(1);

if (args.TryGetValue("OutlineColor", out var outlineColor))
styleBox.BorderColor = Color.FromHex(outlineColor);
else
styleBox.BorderColor = Color.White;

PanelOverride = styleBox;

return true;
}
}
27 changes: 27 additions & 0 deletions Content.Client/Guidebook/Richtext/Table.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
using System.Diagnostics.CodeAnalysis;
using Content.Client.UserInterface.Controls;
using JetBrains.Annotations;
using Robust.Client.UserInterface;

namespace Content.Client.Guidebook.Richtext;

[UsedImplicitly]
public sealed class Table : TableContainer, IDocumentTag
{
public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out Control? control)
{
HorizontalExpand = true;
control = this;

if (!args.TryGetValue("Columns", out var columns) || !int.TryParse(columns, out var columnsCount))
{
Logger.Error("Guidebook tag \"Table\" does not specify required property \"Columns.\"");
control = null;
return false;
}

Columns = columnsCount;

return true;
}
}
Loading
Loading