Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'WD-core/master' into upstream-core

Browse Source
This commit is contained in:
BIGZi0348
2025-03-17 23:39:05 +03:00
parent 23c02d2d14 1aa69a5426
commit 2c2a508d7b
77 changed files with 518 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Lobby/LobbyState.cs
View File

@@ -244,7 +244,7 @@ namespace Content.Client.Lobby
_lobby!.ServerInfo.SetInfoBlob(_gameTicker.ServerInfoBlob);
}
_lobby!.LabelName.SetMarkup("[font=\"Bedstead\" size=20] Amour [/font]");
_lobby!.LabelName.SetMarkup("[font=\"Bedstead\" size=20] PARSEC: AMOUR [/font]");
_lobby!.ChangelogLabel.SetMarkup("Список изменений:");
}

2
Content.Client/MainMenu/UI/MainMenuControl.xaml
View File

@@ -7,7 +7,7 @@
<BoxContainer Name="VBox" Orientation="Vertical" StyleIdentifier="MainMenuBox" MinWidth="300" >
<Label Name="Title" Text="AMOUR" Align="Center" />
<Label Name="Title" Text="PARSEC: AMOUR" Align="Center" />
<Control MinSize="0 4" />

2
Content.Client/_White/Rules/RulesWikiSection.xaml
View File

@@ -1,6 +1,6 @@
<BoxContainer xmlns="https://spacestation14.io"
Orientation="Vertical" HorizontalExpand="True">
<Label Text="Правила сервера Amour"
<Label Text="Правила сервера PARSEC: AMOUR"
StyleClasses="LabelHeading"
HorizontalExpand="True"
HorizontalAlignment="Center"/>

4
Content.Server/Nuke/NukeSystem.cs
View File

@@ -303,7 +303,7 @@ public sealed class NukeSystem : EntitySystem
// play alert sound if time is running out
if (nuke.RemainingTime <= nuke.AlertSoundTime && !nuke.PlayedAlertSound)
{
_sound.PlayGlobalOnStation(uid, _audio.GetSound(nuke.AlertSound), new AudioParams{Volume = -5f});
_sound.PlayGlobalOnStation(uid, _audio.GetSound(nuke.AlertSound), new AudioParams { Volume = -5f });
_sound.StopStationEventMusic(uid, StationEventMusicType.Nuke);
nuke.PlayedAlertSound = true;
UpdateAppearance(uid, nuke);
@@ -572,7 +572,7 @@ public sealed class NukeSystem : EntitySystem
_sound.StopStationEventMusic(uid, StationEventMusicType.Nuke);
Del(uid);
Timer.Spawn(TimeSpan.FromSeconds(60), () => _roundEndSystem.EndRound(TimeSpan.FromSeconds(60))); //Giedi EDIT
Timer.Spawn(TimeSpan.FromSeconds(60), () => _roundEndSystem.EndRound(TimeSpan.FromSeconds(60))); // PARSEC EDIT
}
/// <summary>

8
Content.Server/Tabletop/TabletopSystem.cs
View File

@@ -69,7 +69,7 @@ namespace Content.Server.Tabletop
session.Entities.TryGetValue(entity, out var result);
session.Entities.Remove(result);
tabletop.HologramsSpawned--; // Giedi Prime fix
tabletop.HologramsSpawned--; // PARSEC fix
QueueDel(result);
}
@@ -145,7 +145,7 @@ namespace Content.Server.Tabletop
var playVerb = new ActivationVerb()
{
Text = Loc.GetString("tabletop-verb-play-game"),
Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/die.svg.192dpi.png")),
Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/die.svg.192dpi.png")),
Act = () => OpenSessionFor(actor.PlayerSession, uid)
};
@@ -173,7 +173,7 @@ namespace Content.Server.Tabletop
private void OnPlayerDetached(EntityUid uid, TabletopGamerComponent component, PlayerDetachedEvent args)
{
if(component.Tabletop.IsValid())
if (component.Tabletop.IsValid())
CloseSessionFor(args.Player, component.Tabletop);
}
@@ -182,7 +182,7 @@ namespace Content.Server.Tabletop
if (!EntityManager.TryGetComponent(uid, out ActorComponent? actor))
return;
if(component.Tabletop.IsValid())
if (component.Tabletop.IsValid())
CloseSessionFor(actor.PlayerSession, component.Tabletop);
}

4
Content.Shared/Chat/Prototypes/EmotePrototype.cs
View File

@@ -35,7 +35,7 @@ public sealed partial class EmotePrototype : IPrototype
[DataField("chatTriggers")]
public HashSet<string>? ChatTriggers = new();
/// <summary> Giedi Prime EDIT Start
/// <summary> PARSEC EDIT Start
/// Текст для кнопки в эмоут меню.
/// Бля ну или как это описать, вы поняли короче. ¯\_(ツ)_/¯
/// </summary>
@@ -44,7 +44,7 @@ public sealed partial class EmotePrototype : IPrototype
[DataField("allowMenu")]
public bool AllowToEmotionsMenu { get; } = false;
// Giedi Prime EDIT end
// PARSEC EDIT end
}
/// <summary>

8
Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
View File

@@ -21,8 +21,8 @@ public abstract partial class SharedBorgSystem : EntitySystem
[Dependency] protected readonly SharedContainerSystem Container = default!;
[Dependency] protected readonly ItemSlotsSystem ItemSlots = default!;
[Dependency] protected readonly SharedPopupSystem Popup = default!;
[Dependency] protected readonly IPrototypeManager PrototypeManager = default!; // Amour
[Dependency] protected readonly IRobustRandom RobustRandom = default!; // Amour
[Dependency] protected readonly IPrototypeManager PrototypeManager = default!; // PARSEC EDIT
[Dependency] protected readonly IRobustRandom RobustRandom = default!; // PARSEC EDIT
private HashSet<TTSVoicePrototype> _voices = new();
@@ -45,7 +45,7 @@ public abstract partial class SharedBorgSystem : EntitySystem
GenerateVoiceList(); // WD edit
}
// Giedi added
// PARSEC added
private void EnsureRandomTTS(EntityUid uid, SharedTTSComponent component, ComponentInit args)
{
if (!HasComp<BorgChassisComponent>(uid))
@@ -63,7 +63,7 @@ public abstract partial class SharedBorgSystem : EntitySystem
.Where(x => x.BorgVoice)
.ToHashSet();
}
// Amour
// PARSEC added
private void OnItemSlotInsertAttempt(EntityUid uid, BorgChassisComponent component, ref ItemSlotInsertAttemptEvent args)
{

2
README.md
View File

@@ -1,5 +1,5 @@
<p align="center">
<img alt="Giedi Prime" width="880" height="300" src="https://github.com/user-attachments/assets/bd8a079b-9ef0-46ac-b640-8c36835fbf32" />
<img alt="PARSEC" width="880" height="300" src="https://github.com/user-attachments/assets/bd8a079b-9ef0-46ac-b640-8c36835fbf32" />
</p>
Space Station 14 это ремейк SS13, который работает на собственном движке [Robust Toolbox](https://github.com/space-wizards/RobustToolbox), написанном на C#.

4
Resources/Locale/en-US/changelog/changelog-window.ftl
View File

@@ -12,5 +12,5 @@ changelog-button-new-entries = Changelog (new!)
changelog-tab-title-Changelog = Changelog
changelog-tab-title-Admin = Admin
changelog-tab-title-ChangelogWhite = Giedi Prime
changelog-tab-title-ChangelogAmour = Amour
changelog-tab-title-ChangelogWhite = PARSEC
changelog-tab-title-ChangelogAmour = AMOUR

4
Resources/Locale/ru-RU/changelog/changelog-window.ftl
View File

@@ -12,5 +12,5 @@ changelog-button-new-entries = Обновления (новые!)
changelog-tab-title-Changelog = Changelog
changelog-tab-title-Admin = Admin
changelog-tab-title-ChangelogWhite = Giedi Prime
changelog-tab-title-ChangelogAmour = Amour
changelog-tab-title-ChangelogWhite = PARSEC
changelog-tab-title-ChangelogAmour = AMOUR

4
Resources/Locale/ru-RU/info/rules.ftl
View File

@@ -1,6 +1,6 @@
# Rules
ui-rules-header = Правила сервера Amour
ui-rules-header-rp = Правила сервера Amour
ui-rules-header = Правила сервера PARSEC: AMOUR
ui-rules-header-rp = Правила сервера PARSEC: AMOUR
ui-rules-accept = Я ознакомился и согласен следовать правилам
ui-rules-wait = Кнопка принятия будет разблокирована через { $time } секунд.

2
Resources/Prototypes/Loadouts/Miscellaneous/SelfDefenceDevices.yml
View File

@@ -1,5 +1,5 @@
#///////
# Giedi Prime
# PARSEC
#///////
- type: itemLoadout

46
Resources/Textures/Clothing/Back/Satchels/inspector.rsi/meta.json
View File

@@ -1,26 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14 original by Gargarien",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "PARSEC SS14 original by Gargarien",
"size": {
"x": 32,
"y": 32
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
"states": [
{
"name": "icon"
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

2
Resources/Textures/Clothing/Eyes/Glasses/inspectorglasses.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14 original by Gargarien",
"copyright": "PARSEC SS14 original by Gargarien",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/Hands/Gloves/inspector.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14 original by Gargarien",
"copyright": "PARSEC SS14 original by Gargarien",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Icons and in game sprites by Gargarien for Giedi Prime and Total War. In hand sprites taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 by peptide",
"copyright": "Icons and in game sprites by Gargarien for PARSEC and Total War. In hand sprites taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 by peptide",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Icons and in game sprites by Gargarien for Giedi Prime and Total War. In hand sprites taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 by peptide",
"copyright": "Icons and in game sprites by Gargarien for PARSEC and Total War. In hand sprites taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 by peptide",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Icons and in game sprites by Gargarien for Giedi Prime and Total War. In hand sprites taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 by peptide",
"copyright": "Icons and in game sprites by Gargarien for PARSEC and Total War. In hand sprites taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 by peptide",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Icons and in game sprites by Gargarien for Giedi Prime and Total War. In hand sprites taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 by peptide",
"copyright": "Icons and in game sprites by Gargarien for PARSEC and Total War. In hand sprites taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 by peptide",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Icons and in game sprites by Gargarien for Giedi Prime and Total War. In hand sprites taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 by peptide",
"copyright": "Icons and in game sprites by Gargarien for PARSEC and Total War. In hand sprites taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 by peptide",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Icon and in game sprites by Gargarien for Total War and Giedi Prime. In hand and light-overlay sprites made by EmoGarbage404.",
"copyright": "Icon and in game sprites by Gargarien for Total War and PARSEC. In hand and light-overlay sprites made by EmoGarbage404.",
"size": {
"x": 32,
"y": 32

32
Resources/Textures/Clothing/Head/Hardsuits/hop.rsi/meta.json
View File

@@ -1,18 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by Gargarien, property of Giedi Prime",
"size": {
"x": 32,
"y": 32
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by Gargarien, property of PARSEC",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
}
]
}
{
"name": "equipped-HELMET",
"directions": 4
}
]
}

30
Resources/Textures/Clothing/Head/Hardsuits/inspector.rsi/meta.json
View File

@@ -1,18 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by Gargarien, property of Giedi Prime",
"size": {
"x": 32,
"y": 32
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by Gargarien, property of PARSEC",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
}
]
{
"name": "equipped-HELMET",
"directions": 4
}
]
}

2
Resources/Textures/Clothing/Head/Hats/inspector.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14 original by Gargarien",
"copyright": "PARSEC SS14 original by Gargarien",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/Head/Hats/inspectorcap.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14 original by Gargarien",
"copyright": "PARSEC SS14 original by Gargarien",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/Mask/inspector.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14 original by Gargarien",
"copyright": "PARSEC SS14 original by Gargarien",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "icon and equipped-NECK drawn by Gargarien (Giedi Prime), sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875",
"copyright": "icon and equipped-NECK drawn by Gargarien (PARSEC), sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875",
"size": {
"x": 32,
"y": 32

48
Resources/Textures/Clothing/Neck/Cloaks/inspector.rsi/meta.json
View File

@@ -1,26 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14 original by Gargarien",
"size": {
"x": 32,
"y": 32
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "PARSEC SS14 original by Gargarien",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
{
"name": "equipped-NECK",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

2
Resources/Textures/Clothing/Neck/Misc/inspectorbadge.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14 original by Gargarien",
"copyright": "PARSEC SS14 original by Gargarien",
"size": {
"x": 32,
"y": 32

32
Resources/Textures/Clothing/Neck/mantles/inspectormantle.rsi/meta.json
View File

@@ -1,18 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14 original by Gargarien",
"size": {
"x": 32,
"y": 32
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "PARSEC SS14 original by Gargarien",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
}
]
}
{
"name": "equipped-NECK",
"directions": 4
}
]
}

2
Resources/Textures/Clothing/OuterClothing/Coats/inspector_jacket.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14 original",
"copyright": "PARSEC SS14 original",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/OuterClothing/Coats/inspector_overcoat.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14 original",
"copyright": "PARSEC SS14 original",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/OuterClothing/Coats/inspector_trenchcoat.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14 original",
"copyright": "PARSEC SS14 original",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Icon and in game sprites by Gargarien for Giedi Prime and Total War. In hand sprites taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6",
"copyright": "Icon and in game sprites by Gargarien for PARSEC and Total War. In hand sprites taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Icon and in game sprites by Gargarien for Giedi Prime and Total War. In hand sprites taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6",
"copyright": "Icon and in game sprites by Gargarien for PARSEC and Total War. In hand sprites taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Icon and in game sprites by Gargarien for Giedi Prime and Total War. In hand sprites taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6",
"copyright": "Icon and in game sprites by Gargarien for PARSEC and Total War. In hand sprites taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Icon and in game sprites by Gargarien for Giedi Prime and Total War. In hand sprites taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6",
"copyright": "Icon and in game sprites by Gargarien for PARSEC and Total War. In hand sprites taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Icon and in game sprites by Gargarien for Giedi Prime and Total War. In hand sprites taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6",
"copyright": "Icon and in game sprites by Gargarien for PARSEC and Total War. In hand sprites taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprites by Gargarien for Total War and Giedi Prime.",
"copyright": "Sprites by Gargarien for Total War and PARSEC.",
"size": {
"x": 32,
"y": 32

56
Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/meta.json
View File

@@ -1,30 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by Gargarien, property of Giedi Prime",
"size": {
"x": 32,
"y": 32
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by Gargarien, property of PARSEC",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

56
Resources/Textures/Clothing/OuterClothing/Hardsuits/inspector.rsi/meta.json
View File

@@ -1,30 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by Gargarien, property of Giedi Prime",
"size": {
"x": 32,
"y": 32
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by Gargarien, property of PARSEC",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

2
Resources/Textures/Clothing/OuterClothing/WinterCoats/inspector.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14 original by Gargarien",
"copyright": "PARSEC SS14 original by Gargarien",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/Shoes/Boots/inspector.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14 original by Gargarien",
"copyright": "PARSEC SS14 original by Gargarien",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/Uniforms/Jumpskirt/inspector.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14 original by Gargarien",
"copyright": "PARSEC SS14 original by Gargarien",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/Uniforms/Jumpskirt/inspectorformal.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14 original by Gargarien",
"copyright": "PARSEC SS14 original by Gargarien",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/Uniforms/Jumpsuit/inspector.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14 Original by Gargarien",
"copyright": "PARSEC SS14 Original by Gargarien",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/Clothing/Uniforms/Jumpsuit/inspectorformal.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14 Original by Gargarien",
"copyright": "PARSEC SS14 Original by Gargarien",
"size": {
"x": 32,
"y": 32

20
Resources/Textures/Clothing/Uniforms/Overlay.rsi/meta.json
View File

@@ -1,14 +1,14 @@
{
"version" : 1,
"license" : "CC-BY-SA-3.0",
"copyright" : "Copyright (c) Giedi Prime Space Station 14",
"size" : {
"x" : 32,
"y" : 32
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Copyright (c) PARSEC Space Station 14",
"size": {
"x": 32,
"y": 32
},
"states" : [
{
"name" : "camera"
}
"states": [
{
"name": "camera"
}
]
}

202
Resources/Textures/Objects/Specific/Security/body-camera.rsi/meta.json
View File

@@ -1,108 +1,108 @@
{
"version" : 1,
"license" : "CC-BY-SA-3.0",
"copyright" : "Copyright (c) Giedi Prime Space Station 14",
"size" : {
"x" : 32,
"y" : 32
},
"states" : [
{
"name" : "unpowered"
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Copyright (c) PARSEC Space Station 14",
"size": {
"x": 32,
"y": 32
},
{
"name" : "active"
},
{
"name" : "active-animated",
"delays" : [
[
1,
2
"states": [
{
"name": "unpowered"
},
{
"name": "active"
},
{
"name": "active-animated",
"delays": [
[
1,
2
]
]
]
},
{
"name" : "off-inhand-right",
"directions" : 4
},
{
"name" : "off-inhand-left",
"directions" : 4
},
{
"name" : "on-inhand-right",
"directions" : 4,
"delays" : [
[
1,
2
],
[
1,
2
],
[
1,
2
],
[
1,
2
},
{
"name": "off-inhand-right",
"directions": 4
},
{
"name": "off-inhand-left",
"directions": 4
},
{
"name": "on-inhand-right",
"directions": 4,
"delays": [
[
1,
2
],
[
1,
2
],
[
1,
2
],
[
1,
2
]
]
]
},
{
"name" : "on-inhand-left",
"directions" : 4,
"delays" : [
[
1,
2
],
[
1,
2
],
[
1,
2
],
[
1,
2
},
{
"name": "on-inhand-left",
"directions": 4,
"delays": [
[
1,
2
],
[
1,
2
],
[
1,
2
],
[
1,
2
]
]
]
},
{
"name": "equipped-NECK",
"directions": 4,
"delays" : [
[
1,
2
],
[
1,
2
],
[
1,
2
],
[
1,
2
},
{
"name": "equipped-NECK",
"directions": 4,
"delays": [
[
1,
2
],
[
1,
2
],
[
1,
2
],
[
1,
2
]
]
]
},
{
"name" : "off-equipped-NECK",
"directions" : 4
},
{
"name": "equipped-INNERCLOTHING",
"directions" : 4
}
]
},
{
"name": "off-equipped-NECK",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
}
]
}

2
Resources/Textures/Structures/Storage/closet.rsi/meta.json
View File

@@ -4,7 +4,7 @@
"x": 32,
"y": 32
},
"copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github). Inspector Giedi Prime SS14 original by Gargarien",
"copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github). Inspector PARSEC SS14 original by Gargarien",
"license": "CC-BY-SA-3.0",
"states": [
{

2
Resources/Textures/White/Actions/changeling.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "By SS14 Giedi Prime, hive_head by .keki4",
"copyright": "By SS14 PARSEC, hive_head by .keki4",
"size": {
"x": 32,
"y": 32

36
Resources/Textures/White/Actions/meta.json
View File

@@ -1,20 +1,20 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "By SS14 Giedi Prime",
"size": {
"x": 32,
"y": 32
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "By SS14 PARSEC",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "EmoteFlip"
},
"states": [
{
"name": "EmoteFlip"
},
{
"name": "EmoteJump"
},
{
"name": "EmoteTurn"
}
]
}
{
"name": "EmoteJump"
},
{
"name": "EmoteTurn"
}
]
}

2
Resources/Textures/White/Clothing/Belt/paramedwebbing.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Modification by discord user with ID 720879793645551697 for Giedi Prime. Modified sprite based on Jackal298 modification. Original: https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"copyright": "Modification by discord user with ID 720879793645551697 for PARSEC. Modified sprite based on Jackal298 modification. Original: https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32

48
Resources/Textures/White/Clothing/Head/wizhat-alt.rsi/meta.json
View File

@@ -1,26 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime",
"size": {
"x": 32,
"y": 32
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "PARSEC",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

48
Resources/Textures/White/Clothing/Head/wizhat.rsi/meta.json
View File

@@ -1,26 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime",
"size": {
"x": 32,
"y": 32
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "PARSEC",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

2
Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Original by Emisse, modified by EmoGarbage404, repainted by Danza (Discord User ID: 466953759570788372) special for Giedi Prime",
"copyright": "Original by Emisse, modified by EmoGarbage404, repainted by Danza (Discord User ID: 466953759570788372) special for PARSEC",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Original by Emisse, modified by EmoGarbage404, repainted by Danza (Discord User ID: 466953759570788372) special for Giedi Prime",
"copyright": "Original by Emisse, modified by EmoGarbage404, repainted by Danza (Discord User ID: 466953759570788372) special for PARSEC",
"size": {
"x": 32,
"y": 32

56
Resources/Textures/White/Clothing/OuterClothing/robe.rsi/meta.json
View File

@@ -1,30 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime",
"size": {
"x": 32,
"y": 32
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "PARSEC",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-body-slim",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

2
Resources/Textures/White/Clothing/Underwear/Bottom/heads/inspector/boxers.rsi/meta.json
View File

@@ -1,6 +1,6 @@
{
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime original by Gargarien",
"copyright": "PARSEC original by Gargarien",
"version": 1,
"size": {
"x": 32,

2
Resources/Textures/White/Clothing/Underwear/Bottom/heads/inspector/panties.rsi/meta.json
View File

@@ -1,6 +1,6 @@
{
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime original by Gargarien",
"copyright": "PARSEC original by Gargarien",
"version": 1,
"size": {
"x": 32,

2
Resources/Textures/White/Clothing/Underwear/Top/heads/inspector/bra.rsi/meta.json
View File

@@ -1,6 +1,6 @@
{
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14 original by Gargarien",
"copyright": "PARSEC SS14 original by Gargarien",
"version": 1,
"size": {
"x": 32,

40
Resources/Textures/White/Fluff/Geraldiy/blade.rsi/meta.json
View File

@@ -1,22 +1,22 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime",
"size": {
"x": 32,
"y": 32
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "PARSEC",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

2
Resources/Textures/White/Fluff/Geraldiy/stamp.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14",
"copyright": "PARSEC SS14",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/White/Fluff/egoruch17/mantle.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14",
"copyright": "PARSEC SS14",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/White/Fluff/egoruch17/mask.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14",
"copyright": "PARSEC SS14",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/White/Ghosts/devf_2-ghost.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime Team",
"copyright": "PARSEC Team",
"size": {
"x": 64,
"y": 64

78
Resources/Textures/White/Ghosts/kreses-ghost.rsi/meta.json
View File

@@ -1,41 +1,41 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime",
"size": {
"x": 64,
"y": 64
},
"states": [
{
"name": "animated",
"directions": 4,
"delays": [
[
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2
]
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "PARSEC",
"size": {
"x": 64,
"y": 64
},
"states": [
{
"name": "animated",
"directions": 4,
"delays": [
[
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2
]
}
]
}
]
}
]
}

4
Resources/Textures/White/Mobs/Customization/demon_tail.rsi/meta.json
View File

@@ -1,13 +1,13 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Gerxest#0019, resprite by HitPanda#1471 SS14 Giedi Prime",
"copyright": "Gerxest#0019, resprite by HitPanda#1471 SS14 PARSEC",
"size": {
"x": 32,
"y": 32
},
"states": [
{
{
"name": "tail",
"directions": 4,
"delays": [

2
Resources/Textures/White/Mobs/Customization/egoruch17_claws.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Giedi Prime SS14",
"copyright": "PARSEC SS14",
"size": {
"x": 32,
"y": 32

4
Resources/Textures/White/Mobs/Customization/warete_hair.rsi/meta.json
View File

@@ -1,13 +1,13 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Gerxest#0019, resprite by HitPanda#1471 SS14 Giedi Prime",
"copyright": "Gerxest#0019, resprite by HitPanda#1471 SS14 PARSEC",
"size": {
"x": 32,
"y": 32
},
"states": [
{
{
"name": "hair",
"directions": 4
}

36
Resources/Textures/White/Mobs/Customization/wolf_parts.rsi/meta.json
View File

@@ -1,20 +1,44 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Mitchell#2905 SS14 Giedi Prime",
"copyright": "Mitchell#2905 SS14 PARSEC",
"size": {
"x": 32,
"y": 32
},
"states": [
{
{
"name": "wolf_tail",
"directions": 4,
"delays": [
[0.2, 0.2, 0.2, 0.2, 0.2],
[0.2, 0.2, 0.2, 0.2, 0.2],
[0.2, 0.2, 0.2, 0.2, 0.2],
[0.2, 0.2, 0.2, 0.2, 0.2]
[
0.2,
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2,
0.2
]
]
},
{

2
Resources/Textures/White/Objects/Tools/impcrowbar.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
"copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for Giedi Prime",
"copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for PARSEC",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
"copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for Giedi Prime",
"copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for PARSEC",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/White/Objects/Tools/impwelder.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for Giedi Prime",
"copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for PARSEC",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/White/Objects/Tools/impwirecutter.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
"copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for Giedi Prime",
"copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for PARSEC",
"size": {
"x": 32,
"y": 32

2
Resources/Textures/White/Objects/Tools/impwrench.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
"copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for Giedi Prime",
"copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for PARSEC",
"size": {
"x": 32,
"y": 32

2
Resources/manifest.yml
View File

@@ -1,4 +1,4 @@
defaultWindowTitle: "Giedi Prime: Amour"
defaultWindowTitle: "PARSEC: AMOUR"
windowIconSet: /Textures/Logo/icon
splashLogo: /Textures/Logo/logo-ru.png