Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Апстрим #31

Merged
merged 2 commits into from
Apr 14, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
ClothingHeadMailCarrier: 2
ClothingEyesHudMail: 2 # Frontier
MailBag: 2
ClothingHeadsetMailCarrier: 2 # Frontier ClothingHeadsetCargo<ClothingHeadsetMailCarrier
ClothingHeadsetService: 2 # Frontier ClothingHeadsetCargo<ClothingHeadsetService
ClothingUniformJumpsuitValet: 2
ClothingUniformJumpskirtValet: 2
ClothingOuterWinterCoatMail: 2
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
outerClothing: ClothingOuterWinterCoatMail
eyes: ClothingEyesHudMail
id: MailCarrierPDA
ears: ClothingHeadsetMailCarrier # Frontier - ClothingHeadsetCargo<ClothingHeadsetMailCarrier
ears: ClothingHeadsetService # Frontier - ClothingHeadsetCargo<ClothingHeadsetService
belt: MailBag
innerClothingSkirt: ClothingUniformJumpskirtMailCarrier
satchel: ClothingBackpackSatchelFilled
12 changes: 0 additions & 12 deletions Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml
Original file line number Diff line number Diff line change
@@ -8,18 +8,6 @@
key_slots:
- EncryptionKeyCommon

- type: entity
parent: ClothingHeadsetCargo
id: ClothingHeadsetMailCarrier
name: mail carrier headset
description: A headset used by mail carrier employees.
components:
- type: ContainerFill
containers:
key_slots:
- EncryptionKeyService
- EncryptionKeyCargo

- type: entity
parent: ClothingHeadset
id: ClothingHeadsetNFSD

Unchanged files with check annotations Beta

private static void RewriteColumnName(IConventionPropertyBuilder propertyBuilder)
{
var property = propertyBuilder.Metadata;
var entityType = property.DeclaringEntityType;

Check warning on line 304 in Content.Server.Database/SnakeCaseNaming.cs

GitHub Actions / build (ubuntu-latest)

'IConventionProperty.DeclaringEntityType' is obsolete: 'Use DeclaringType and cast to IConventionEntityType or IConventionComplexType'

Check warning on line 304 in Content.Server.Database/SnakeCaseNaming.cs

GitHub Actions / build (ubuntu-latest)

'IConventionProperty.DeclaringEntityType' is obsolete: 'Use DeclaringType and cast to IConventionEntityType or IConventionComplexType'
if (entityType.ClrType == typeof(Microsoft.EntityFrameworkCore.Migrations.HistoryRow))
return;
property.Builder.HasNoAnnotation(RelationalAnnotationNames.ColumnName);
var baseColumnName = StoreObjectIdentifier.Create(property.DeclaringEntityType, StoreObjectType.Table) is { } tableIdentifier

Check warning on line 311 in Content.Server.Database/SnakeCaseNaming.cs

GitHub Actions / build (ubuntu-latest)

'IConventionProperty.DeclaringEntityType' is obsolete: 'Use DeclaringType and cast to IConventionEntityType or IConventionComplexType'

Check warning on line 311 in Content.Server.Database/SnakeCaseNaming.cs

GitHub Actions / build (ubuntu-latest)

'IConventionProperty.DeclaringEntityType' is obsolete: 'Use DeclaringType and cast to IConventionEntityType or IConventionComplexType'
? property.GetDefaultColumnName(tableIdentifier)
: property.GetDefaultColumnName();