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

[Feat] Тонкие спрайты снова в строю (#102)

Browse Source 
* Revert "Hair Overhaul (#19298)"

This reverts commit 9491f322de.

# Conflicts:
#	Resources/Textures/Mobs/Customization/human_hair.rsi/a.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/afro.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/afro2.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/bigafro.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/cornrows2.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/emofringe.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/keanu.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/long.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/long2.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/long3.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
#	Resources/Textures/Mobs/Customization/human_hair.rsi/modern.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/quiff.png

* add: возврат системы тонкоспрайтов

* fix: небольшие фиксы после реверта причесок

* add: старые текстуры для slim бодитайпа

* fix: фикс причесок после апстрима
This commit is contained in:
Remuchi
2024-02-24 17:06:32 +07:00
committed by GitHub
parent ac2d162c53
commit 3515e87f74
850 changed files with 6170 additions and 675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1821
Content.Server.Database/Migrations/Postgres/20240219145443_AddBodyType.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

29
Content.Server.Database/Migrations/Postgres/20240219145443_AddBodyType.cs Normal file
View File

@@ -0,0 +1,29 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Content.Server.Database.Migrations.Postgres
{
/// <inheritdoc />
public partial class AddBodyType : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "body_type",
table: "profile",
type: "text",
nullable: false,
defaultValue: "");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "body_type",
table: "profile");
}
}
}

5
Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
View File

@@ -760,6 +760,11 @@ namespace Content.Server.Database.Migrations.Postgres
.HasColumnType("text")
.HasColumnName("backpack");
b.Property<string>("BodyType")
.IsRequired()
.HasColumnType("text")
.HasColumnName("body_type");
b.Property<string>("BorgName")
.IsRequired()
.HasColumnType("text")

1750
Content.Server.Database/Migrations/Sqlite/20240219145431_AddBodyType.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

29
Content.Server.Database/Migrations/Sqlite/20240219145431_AddBodyType.cs Normal file
View File

@@ -0,0 +1,29 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Content.Server.Database.Migrations.Sqlite
{
/// <inheritdoc />
public partial class AddBodyType : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "body_type",
table: "profile",
type: "TEXT",
nullable: false,
defaultValue: "");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "body_type",
table: "profile");
}
}
}

5
Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
View File

@@ -711,6 +711,11 @@ namespace Content.Server.Database.Migrations.Sqlite
.HasColumnType("TEXT")
.HasColumnName("backpack");
b.Property<string>("BodyType")
.IsRequired()
.HasColumnType("TEXT")
.HasColumnName("body_type");
b.Property<string>("BorgName")
.IsRequired()
.HasColumnType("TEXT")

1
Content.Server.Database/Model.cs
View File

@@ -343,6 +343,7 @@ namespace Content.Server.Database
public string Gender { get; set; } = null!;
//WD-EDIT
public string BodyType { get; set; } = null!;
public string Voice { get; set; } = null!;
//WD-EDIT