mirror of
https://github.com/DeltaV-Station/Delta-v.git
synced 2026-09-29 23:57:29 +00:00
3720e89c52
* Initial glimmer change * Added glimmer multiplier * Adds scalar of research properly like the old glimmer system * Left over code * Glimmer changes for Analysis Console UI * Accidental Namespace added * Fixed small Math issue with glimmer values * Fixed reference to Nyano * Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com> Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> * Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com> Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> * Update Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com> Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> * Fixed Deltav comment references Went though various files and added comments to signify where delta v changes are to the upstream code * More DeltaV Comment fixes Added a few more comments for DeltaV specific changes, I also removed an unused line of code, and renamed to variables for better clarity * Commenting and moving one file to _DV I cant read apparently and only saw some fixes requested, here are the rest apologies * Update Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs Co-authored-by: Charlie Morley <cmorley191@gmail.com> Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> * Update Content.Shared/Xenoarchaeology/Equipment/Components/AnalysisConsoleComponent.cs Co-authored-by: Charlie Morley <cmorley191@gmail.com> Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> * Update Content.Shared/Content.Shared.csproj Co-authored-by: Charlie Morley <cmorley191@gmail.com> Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> * Update Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs Co-authored-by: Charlie Morley <cmorley191@gmail.com> Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> * Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs Co-authored-by: Charlie Morley <cmorley191@gmail.com> Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> * Update Content.Shared/_DV/Xenoarchaeology/BUI/AnalysisConsoleBoundUserInterfaceState.cs Co-authored-by: Charlie Morley <cmorley191@gmail.com> Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> * Update Resources/Locale/en-US/xenoarchaeology/artifact-analyzer.ftl Co-authored-by: Charlie Morley <cmorley191@gmail.com> Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> * Addressed issues of cleaning up a function to one that already exists, restoring an old comment from upstream, and moving localization data to _DV folder * Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs Co-authored-by: Charlie Morley <cmorley191@gmail.com> Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> * Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs Co-authored-by: Charlie Morley <cmorley191@gmail.com> Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> * Update Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs Co-authored-by: Charlie Morley <cmorley191@gmail.com> Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> * Update Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs Co-authored-by: Charlie Morley <cmorley191@gmail.com> Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> * Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs Co-authored-by: Charlie Morley <cmorley191@gmail.com> Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> * Missed one line to bring over to _DV * Fixed github and IDE complains about null ref --------- Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com> Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com> Co-authored-by: Charlie Morley <cmorley191@gmail.com>