From 95054e072a84c5990add9468d5de434614679be5 Mon Sep 17 00:00:00 2001 From: Cinkafox <70429757+Cinkafox@users.noreply.github.com> Date: Mon, 11 Mar 2024 11:13:33 +0300 Subject: [PATCH] Fixes (#73) * - fix: Genitals sprite shit and meow for tajaran * - add: fart sound if kicked from server * - tweak: vulpies and tajaran now for donaters!!! * - fix: Fart on exit * - add: roleplay think * - fix: database shit and loc * - add: ears for slime * - fix: LOC interaction fix * - add: height setting * - fix: height for felinids * - fix: nigga fix * - fix: no bitches on captain * - fix: interaction panel animation shit --- .../Humanoid/HumanoidAppearanceSystem.cs | 5 +- .../Preferences/UI/HumanoidProfileEditor.xaml | 15 + .../UI/HumanoidProfileEditor.xaml.cs | 100 + .../_Amour/CustomHeight/CustomHeightSystem.cs | 25 + .../HumanoidProfileEditor.Height.cs | 78 + Content.Client/_Amour/Fart/FartSystem.cs | 31 + .../Tests/Preferences/ServerDbSqliteTests.cs | 7 +- .../20240308135051_RolePlayThink.Designer.cs | 1911 ++++++++++++++++ .../Postgres/20240308135051_RolePlayThink.cs | 48 + ...0240308170141_RPMigrationEblya.Designer.cs | 1912 ++++++++++++++++ .../20240308170141_RPMigrationEblya.cs | 37 + .../20240310093942_HeightPrikoli.Designer.cs | 1916 +++++++++++++++++ .../Postgres/20240310093942_HeightPrikoli.cs | 29 + .../PostgresServerDbContextModelSnapshot.cs | 49 + .../20240308135003_RolePlayThink.Designer.cs | 1836 ++++++++++++++++ .../Sqlite/20240308135003_RolePlayThink.cs | 47 + ...0240308170111_RPMigrationEblya.Designer.cs | 1837 ++++++++++++++++ .../Sqlite/20240308170111_RPMigrationEblya.cs | 37 + .../20240310093818_HeightPrikoli.Designer.cs | 1841 ++++++++++++++++ .../Sqlite/20240310093818_HeightPrikoli.cs | 29 + .../SqliteServerDbContextModelSnapshot.cs | 47 + Content.Server.Database/Model.cs | 17 +- Content.Server/Database/ServerDbBase.cs | 22 +- .../_Amour/CustomHeight/CustomHeightSystem.cs | 9 + .../_Amour/RoleplayInfo/RoleplayInfoSystem.cs | 28 + .../_Amour/Sponsor/SponsorSystem.Amour.cs | 25 + .../_White/MeatyOre/MeatyOreStoreSystem.cs | 22 +- .../_White/Sponsors/SponsorsManager.cs | 9 + .../Humanoid/HumanoidCharacterAppearance.cs | 39 +- .../Humanoid/Markings/MarkingPrototype.cs | 2 + Content.Shared/Humanoid/SkinColor.cs | 4 +- .../Preferences/HumanoidCharacterProfile.cs | 52 +- .../CustomHeight/CustomHeightComponent.cs | 14 + .../_Amour/CustomHeight/CustomHeightSystem.cs | 79 + .../InteractionPanel/Actions/Animations.cs | 14 +- .../_Amour/LoggerExtension/LoggerExt.cs | 19 + .../RoleplayInfo/RoleplayInfoComponent.cs | 7 + .../_Amour/RoleplayInfo/RoleplayInfoData.cs | 22 + .../RoleplayInfo/RoleplayInfoPrototype.cs | 9 + .../RoleplayInfo/SharedRoleplaySystem.cs | 19 + .../_Amour/Sponsor/SponsorItemPrototype.cs | 10 + Resources/Audio/_Amour/fart-with-reverb.ogg | Bin 0 -> 42995 bytes .../Locale/ru-RU/_amour/Roleplay/info.ftl | 11 + Resources/Locale/ru-RU/_amour/height.ftl | 3 + .../ru-RU/_amour/interactions/interaction.ftl | 5 +- .../white/species/slimePerson/slimeEars.ftl | 45 + .../Entities/Mobs/Species/arachnid.yml | 6 + .../Prototypes/Entities/Mobs/Species/base.yml | 29 +- .../Entities/Mobs/Species/human.yml | 2 + .../Prototypes/Entities/Mobs/Species/moth.yml | 2 + .../Entities/Mobs/Species/reptilian.yml | 6 + .../Entities/Mobs/Species/skrell.yml | 2 + .../Entities/Mobs/Species/slime.yml | 6 + .../Prototypes/Roles/Jobs/Command/captain.yml | 1 - .../Mobs/Customization/Markings/felinid.yml | 8 +- .../Mobs/Customization/Markings/slime.yml | 163 ++ .../Prototypes/White/Mobs/Species/felinid.yml | 36 +- .../Prototypes/White/Mobs/Species/harpy.yml | 31 +- .../Prototypes/White/Mobs/Species/tajaran.yml | 8 +- .../White/Mobs/Species/vulpkanin.yml | 2 + .../Prototypes/White/Species/tajaran.yml | 2 + .../Prototypes/White/Species/vulpkanin.yml | 2 + Resources/Prototypes/_Amour/roleplay.yml | 4 + Resources/Prototypes/_Amour/sponsorItems.yml | 17 + .../Prototypes/_White/BodyTypes/normal.yml | 2 + 65 files changed, 12561 insertions(+), 91 deletions(-) create mode 100644 Content.Client/_Amour/CustomHeight/CustomHeightSystem.cs create mode 100644 Content.Client/_Amour/CustomHeight/HumanoidProfileEditor.Height.cs create mode 100644 Content.Client/_Amour/Fart/FartSystem.cs create mode 100644 Content.Server.Database/Migrations/Postgres/20240308135051_RolePlayThink.Designer.cs create mode 100644 Content.Server.Database/Migrations/Postgres/20240308135051_RolePlayThink.cs create mode 100644 Content.Server.Database/Migrations/Postgres/20240308170141_RPMigrationEblya.Designer.cs create mode 100644 Content.Server.Database/Migrations/Postgres/20240308170141_RPMigrationEblya.cs create mode 100644 Content.Server.Database/Migrations/Postgres/20240310093942_HeightPrikoli.Designer.cs create mode 100644 Content.Server.Database/Migrations/Postgres/20240310093942_HeightPrikoli.cs create mode 100644 Content.Server.Database/Migrations/Sqlite/20240308135003_RolePlayThink.Designer.cs create mode 100644 Content.Server.Database/Migrations/Sqlite/20240308135003_RolePlayThink.cs create mode 100644 Content.Server.Database/Migrations/Sqlite/20240308170111_RPMigrationEblya.Designer.cs create mode 100644 Content.Server.Database/Migrations/Sqlite/20240308170111_RPMigrationEblya.cs create mode 100644 Content.Server.Database/Migrations/Sqlite/20240310093818_HeightPrikoli.Designer.cs create mode 100644 Content.Server.Database/Migrations/Sqlite/20240310093818_HeightPrikoli.cs create mode 100644 Content.Server/_Amour/CustomHeight/CustomHeightSystem.cs create mode 100644 Content.Server/_Amour/RoleplayInfo/RoleplayInfoSystem.cs create mode 100644 Content.Server/_Amour/Sponsor/SponsorSystem.Amour.cs create mode 100644 Content.Shared/_Amour/CustomHeight/CustomHeightComponent.cs create mode 100644 Content.Shared/_Amour/CustomHeight/CustomHeightSystem.cs create mode 100644 Content.Shared/_Amour/LoggerExtension/LoggerExt.cs create mode 100644 Content.Shared/_Amour/RoleplayInfo/RoleplayInfoComponent.cs create mode 100644 Content.Shared/_Amour/RoleplayInfo/RoleplayInfoData.cs create mode 100644 Content.Shared/_Amour/RoleplayInfo/RoleplayInfoPrototype.cs create mode 100644 Content.Shared/_Amour/RoleplayInfo/SharedRoleplaySystem.cs create mode 100644 Content.Shared/_Amour/Sponsor/SponsorItemPrototype.cs create mode 100644 Resources/Audio/_Amour/fart-with-reverb.ogg create mode 100644 Resources/Locale/ru-RU/_amour/Roleplay/info.ftl create mode 100644 Resources/Locale/ru-RU/_amour/height.ftl create mode 100644 Resources/Locale/ru-RU/white/species/slimePerson/slimeEars.ftl create mode 100644 Resources/Prototypes/White/Mobs/Customization/Markings/slime.yml create mode 100644 Resources/Prototypes/_Amour/roleplay.yml create mode 100644 Resources/Prototypes/_Amour/sponsorItems.yml diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs index 5ab209602e..72bd2d4d2d 100644 --- a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs +++ b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs @@ -330,13 +330,14 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem // Okay so if the marking prototype is modified but we load old marking data this may no longer be valid // and we need to check the index is correct. // So if that happens just default to white? + // Alpha WD EDIT if (colors != null && j < colors.Count) { - sprite.LayerSetColor(layerId, colors[j]); + sprite.LayerSetColor(layerId, colors[j].WithAlpha(markingPrototype.LayerAlpha)); } else { - sprite.LayerSetColor(layerId, Color.White); + sprite.LayerSetColor(layerId, Color.White.WithAlpha(markingPrototype.LayerAlpha)); } } } diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml index 0b902d349d..03a056bc08 100644 --- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml +++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml @@ -131,6 +131,15 @@ + + +