diff --git a/Content.Shared/Ganimed/SponsorManager.cs b/Content.Shared/Ganimed/SponsorManager.cs index 5c81a05d3e32fe..17ba9889ddfc3b 100644 --- a/Content.Shared/Ganimed/SponsorManager.cs +++ b/Content.Shared/Ganimed/SponsorManager.cs @@ -14,7 +14,9 @@ public sealed class SponsorManager {"Gorox", new DateTime(2024, 06, 30)}, {"watrushechnik", new DateTime(2024, 07, 05)}, {"Bezdnaa", new DateTime(2024, 06, 29)}, - {"Hyper_B", new DateTime(2024, 07, 09)}, + {"Hyper_B", new DateTime(2024, 07, 09)}, + {"trueFaith87", new DateTime(2024, 08, 29)}, + {"kot39211", new DateTime(2024, 08, 29)}, }; public bool IsSponsor(ICommonSession? session) diff --git a/Resources/Locale/ru-RU/ganimed/entities/clothing/tsf_clothing.ftl b/Resources/Locale/ru-RU/ganimed/entities/clothing/tsf_clothing.ftl index 8151d018b45fff..560a26f68f1c18 100644 --- a/Resources/Locale/ru-RU/ganimed/entities/clothing/tsf_clothing.ftl +++ b/Resources/Locale/ru-RU/ganimed/entities/clothing/tsf_clothing.ftl @@ -17,4 +17,6 @@ ent-ClothingHeadHelmetHardsuitTSFHeavy = шлем тяжелого скафан ent-ClothingHeadHelmetHardsuitTSFWhite = шлем снежного скафандра ТСФ .desc = Бронированный шлем, используемый военными скафандрами ТСФ. ent-ClothingOuterHardsuitTSFWhite = снежный скафандр ТСФ - .desc = Скафандр, используемый флотом ТСФ в условиях экстренно низких температур. \ No newline at end of file + .desc = Скафандр, используемый флотом ТСФ в условиях экстренно низких температур. +ent-TSFPDA = КПК ТСФ + .desc = Может, нам пойти и убить ксеносов? \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ganimed/entities/clothing/ussp_clothing.ftl b/Resources/Locale/ru-RU/ganimed/entities/clothing/ussp_clothing.ftl index 2ff133d203e3f4..efa9e6157a93fc 100644 --- a/Resources/Locale/ru-RU/ganimed/entities/clothing/ussp_clothing.ftl +++ b/Resources/Locale/ru-RU/ganimed/entities/clothing/ussp_clothing.ftl @@ -16,11 +16,5 @@ ent-RandomHumanoidSpawnerUSSPArmy = Солдат СССП .suffix = Солдат, СССП ent-RandomHumanoidSpawnerUSSPofficer = Солдат СССП .suffix = Офицер, СССП -ent-USSPPDA1 = КПК СССП - .desc = Очередной пример реверс-инжиниринга СССП. - .suffix = Солдат -ent-USSPPDA2 = КПК СССП - .desc = Очередной пример реверс-инжиниринга СССП. - .suffix = Офицер ent-BannerUSSP = знамя СССП .desc = Знамя со серпом и молотом. Социализм, равенство, братство. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ganimed/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ganimed/entities/objects/devices/pda.ftl new file mode 100644 index 00000000000000..dd4253a5091e7e --- /dev/null +++ b/Resources/Locale/ru-RU/ganimed/entities/objects/devices/pda.ftl @@ -0,0 +1,12 @@ +ent-TSFPDA = КПК ТСФ + .desc = Может, нам пойти и убить ксеносов? +ent-USSPPDA1 = КПК СССП + .desc = Очередной пример реверс-инжиниринга СССП. + .suffix = Солдат +ent-USSPPDA2 = КПК СССП + .desc = Очередной пример реверс-инжиниринга СССП. + .suffix = Офицер +ent-BridgeOfficerPDA = КПК офицера мостика + .desc = Поднять щиты! +ent-VirologistPDA = КПК вирусолога + .desc = Лучше это не облизывать... \ No newline at end of file diff --git a/Resources/Prototypes/Ganimed/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Ganimed/Entities/Clothing/Head/hardsuit-helmets.yml index 378c1a94eb6948..08604888094a2e 100644 --- a/Resources/Prototypes/Ganimed/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Ganimed/Entities/Clothing/Head/hardsuit-helmets.yml @@ -714,7 +714,7 @@ - type: Clothing sprite: Ganimed/Clothing/Head/Hardsuits/ussp.rsi - type: PointLight - color: "#FFFFCC" + color: "#E2B100" - type: PressureProtection highPressureMultiplier: 0.525 lowPressureMultiplier: 1000 diff --git a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/equipped-HELMET.png b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/equipped-HELMET.png index 8027741b4252f3..3e3ac49e392ac8 100644 Binary files a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/equipped-HELMET.png and b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/icon-flash.png b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/icon-flash.png index 4098b52c1ba243..5674a24dc336f0 100644 Binary files a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/icon-flash.png and b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/icon-flash.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/icon.png b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/icon.png index 4af2b0b4f77e63..83db842d156ea1 100644 Binary files a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/icon.png and b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/icon.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/inhand-left.png b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/inhand-left.png index 2b46c9170ca77d..7c43912769b462 100644 Binary files a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/inhand-left.png and b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/inhand-left.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/inhand-right.png b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/inhand-right.png index 9ca71529be5dbb..5a34d34f291111 100644 Binary files a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/inhand-right.png and b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/inhand-right.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/off-equipped-HELMET.png b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/off-equipped-HELMET.png index 8027741b4252f3..3e3ac49e392ac8 100644 Binary files a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/off-equipped-HELMET.png and b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/off-inhand-left.png b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/off-inhand-left.png index 45688a41eba21c..7c43912769b462 100644 Binary files a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/off-inhand-left.png and b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/off-inhand-right.png b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/off-inhand-right.png index 8f0f6d2fb41e86..5a34d34f291111 100644 Binary files a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/off-inhand-right.png and b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/on-equipped-HELMET.png b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/on-equipped-HELMET.png index 25ea11830cc2d8..1064ceed7cb9b0 100644 Binary files a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/on-equipped-HELMET.png and b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/on-inhand-left.png b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/on-inhand-left.png index 6511851e340d5d..63c25e7d86e85b 100644 Binary files a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/on-inhand-left.png and b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/on-inhand-right.png b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/on-inhand-right.png index 6c9e12f24b7cfb..c793702ff2611e 100644 Binary files a/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/on-inhand-right.png and b/Resources/Textures/Ganimed/Clothing/Head/Hardsuits/ussp.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/ussp.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/ussp.rsi/equipped-OUTERCLOTHING.png index bebfbe4cc47dd1..f436e65d5d0185 100644 Binary files a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/ussp.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/ussp.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/ussp.rsi/icon.png b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/ussp.rsi/icon.png index 0275c800c4b54e..288402144001a0 100644 Binary files a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/ussp.rsi/icon.png and b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/ussp.rsi/icon.png differ diff --git a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/ussp.rsi/inhand-left.png b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/ussp.rsi/inhand-left.png index ce039b1dca98df..127b1a1445eb0d 100644 Binary files a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/ussp.rsi/inhand-left.png and b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/ussp.rsi/inhand-left.png differ diff --git a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/ussp.rsi/inhand-right.png b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/ussp.rsi/inhand-right.png index dd2f5a1ada6409..d729d2cbce291d 100644 Binary files a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/ussp.rsi/inhand-right.png and b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/ussp.rsi/inhand-right.png differ diff --git a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/usspCommander.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/usspCommander.rsi/equipped-OUTERCLOTHING.png index eb73237dcbe6c0..6c5cedb645400b 100644 Binary files a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/usspCommander.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/usspCommander.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/usspCommander.rsi/icon.png b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/usspCommander.rsi/icon.png index 95daa9eadaa607..c3afd8ccb15c79 100644 Binary files a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/usspCommander.rsi/icon.png and b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/usspCommander.rsi/icon.png differ diff --git a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/usspCommander.rsi/inhand-left.png b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/usspCommander.rsi/inhand-left.png index 1ee31bff9a0dad..010bd7f894ce02 100644 Binary files a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/usspCommander.rsi/inhand-left.png and b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/usspCommander.rsi/inhand-left.png differ diff --git a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/usspCommander.rsi/inhand-right.png b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/usspCommander.rsi/inhand-right.png index 83032e2f330796..14c16da921b617 100644 Binary files a/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/usspCommander.rsi/inhand-right.png and b/Resources/Textures/Ganimed/Clothing/OuterClothing/Hardsuits/usspCommander.rsi/inhand-right.png differ