git.smokeofanarchy.ru Git - space-station-14.git/commit

]> git.smokeofanarchy.ru Git - space-station-14.git/commit

projects / space-station-14.git / commit

author	pathetic meowmeow <uhhadd@gmail.com>
	Tue, 20 Jan 2026 07:07:53 +0000 (02:07 -0500)
committer	GitHub <noreply@github.com>
	Tue, 20 Jan 2026 07:07:53 +0000 (07:07 +0000)
commit	8cf744ec55fa19968ae5a7bc279d5b3862e3f878
tree	13a3c6ae33d66af93e892321ae93be5fd7ac0e09	tree \| snapshot
parent	27bb73ded4942515a93f1dbae2eed31caf040904	commit \| diff

Visual nubody (humanoid appearance refactor) (#42476)

* initial visual nubody

* oops overlay

* im so pheeming rn

* conversion...

* tests

* comeback of the underwear

* oops eyes

* blabbl

* zeds

* yaml linted

* search and visible count constraints

* reordering

* preserve previously selected markings colors

* fix test

* some ui niceties

* ordering

* make DB changes backwards-compatible/downgrade-friendly

* fix things again

* fix migration

* vulpkanin markings limit increase

* wrapping

* code cleanup and more code cleanup and more code cleanup and more code cleanup and

* fix slop ports

* better sampling API

* make filter work + use the method i made for its intended purpose

* fix test fails real quick

* magic mirror cleanup, remove TODO

* don't 0-init the organ profile data

* remove deltastates

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

204 files changed:

Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs		diff \| blob \| history
Content.Client/Body/VisualBodySystem.cs	[new file with mode: 0644]	blob
Content.Client/Clothing/ClientClothingSystem.cs		diff \| blob \| history
Content.Client/HealthAnalyzer/UI/HealthAnalyzerControl.xaml.cs		diff \| blob \| history
Content.Client/Humanoid/HideableHumanoidLayersSystem.cs	[new file with mode: 0644]	blob
Content.Client/Humanoid/HumanoidAppearanceSystem.cs	[deleted file]	blob \| history
Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs		diff \| blob \| history
Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml		diff \| blob \| history
Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml.cs		diff \| blob \| history
Content.Client/Humanoid/LayerMarkingItem.xaml	[new file with mode: 0644]	blob
Content.Client/Humanoid/LayerMarkingItem.xaml.cs	[new file with mode: 0644]	blob
Content.Client/Humanoid/LayerMarkingOrderer.xaml	[new file with mode: 0644]	blob
Content.Client/Humanoid/LayerMarkingOrderer.xaml.cs	[new file with mode: 0644]	blob
Content.Client/Humanoid/LayerMarkingPicker.xaml	[new file with mode: 0644]	blob
Content.Client/Humanoid/LayerMarkingPicker.xaml.cs	[new file with mode: 0644]	blob
Content.Client/Humanoid/MarkingPicker.xaml		diff \| blob \| history
Content.Client/Humanoid/MarkingPicker.xaml.cs		diff \| blob \| history
Content.Client/Humanoid/MarkingsViewModel.cs	[new file with mode: 0644]	blob
Content.Client/Humanoid/OrganMarkingPicker.xaml	[new file with mode: 0644]	blob
Content.Client/Humanoid/OrganMarkingPicker.xaml.cs	[new file with mode: 0644]	blob
Content.Client/Humanoid/SingleMarkingPicker.xaml	[deleted file]	blob \| history
Content.Client/Humanoid/SingleMarkingPicker.xaml.cs	[deleted file]	blob \| history
Content.Client/Interaction/DragDropHelper.cs		diff \| blob \| history
Content.Client/Lobby/LobbyUIController.cs		diff \| blob \| history
Content.Client/Lobby/UI/CharacterPickerButton.xaml.cs		diff \| blob \| history
Content.Client/Lobby/UI/HumanoidProfileEditor.xaml		diff \| blob \| history
Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs		diff \| blob \| history
Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs		diff \| blob \| history
Content.Client/MagicMirror/MagicMirrorSystem.cs	[deleted file]	blob \| history
Content.Client/MagicMirror/MagicMirrorWindow.xaml		diff \| blob \| history
Content.Client/MagicMirror/MagicMirrorWindow.xaml.cs		diff \| blob \| history
Content.Client/Stylesheets/Sheetlets/PanelSheetlet.cs		diff \| blob \| history
Content.Client/Stylesheets/StyleClass.cs		diff \| blob \| history
Content.Client/Zombies/ZombieSystem.cs		diff \| blob \| history
Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs		diff \| blob \| history
Content.IntegrationTests/Tests/Markings/MarkingManagerTests.cs	[new file with mode: 0644]	blob
Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs		diff \| blob \| history
Content.Server.Database/Migrations/Postgres/20260118084629_OrganMarkings.Designer.cs	[new file with mode: 0644]	blob
Content.Server.Database/Migrations/Postgres/20260118084629_OrganMarkings.cs	[new file with mode: 0644]	blob
Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs		diff \| blob \| history
Content.Server.Database/Migrations/Sqlite/20260118084622_OrganMarkings.Designer.cs	[new file with mode: 0644]	blob
Content.Server.Database/Migrations/Sqlite/20260118084622_OrganMarkings.cs	[new file with mode: 0644]	blob
Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs		diff \| blob \| history
Content.Server.Database/Model.cs		diff \| blob \| history
Content.Server.Database/ModelSqlite.cs		diff \| blob \| history
Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs		diff \| blob \| history
Content.Server/Antag/AntagSelectionSystem.cs		diff \| blob \| history
Content.Server/Body/VisualBodySystem.cs	[new file with mode: 0644]	blob
Content.Server/Cloning/CloningSystem.cs		diff \| blob \| history
Content.Server/Clothing/Systems/OutfitSystem.cs		diff \| blob \| history
Content.Server/Database/DataNodeJsonExtensions.cs	[new file with mode: 0644]	blob
Content.Server/Database/ServerDbBase.cs		diff \| blob \| history
Content.Server/Database/ServerDbManager.cs		diff \| blob \| history
Content.Server/Database/ServerDbPostgres.cs		diff \| blob \| history
Content.Server/Database/ServerDbSqlite.cs		diff \| blob \| history
Content.Server/Destructible/DestructibleSystem.cs		diff \| blob \| history
Content.Server/GameTicking/GameTicker.Spawning.cs		diff \| blob \| history
Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs		diff \| blob \| history
Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs		diff \| blob \| history
Content.Server/GameTicking/Rules/ThiefRuleSystem.cs		diff \| blob \| history
Content.Server/GameTicking/Rules/ZombieRuleSystem.cs		diff \| blob \| history
Content.Server/Humanoid/Components/RandomHumanoidAppearanceComponent.cs		diff \| blob \| history
Content.Server/Humanoid/HideableHumanoidLayersSystem.cs	[new file with mode: 0644]	blob
Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.Modifier.cs	[deleted file]	blob \| history
Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs	[deleted file]	blob \| history
Content.Server/Humanoid/Systems/RandomHumanoidAppearanceSystem.cs		diff \| blob \| history
Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs		diff \| blob \| history
Content.Server/MagicMirror/MagicMirrorSystem.cs	[deleted file]	blob \| history
Content.Server/Materials/MaterialReclaimerSystem.cs		diff \| blob \| history
Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs		diff \| blob \| history
Content.Server/Objectives/Systems/HijackShuttleConditionSystem.cs		diff \| blob \| history
Content.Server/Objectives/Systems/SpeciesRequirementSystem.cs		diff \| blob \| history
Content.Server/Polymorph/Systems/PolymorphSystem.cs		diff \| blob \| history
Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs		diff \| blob \| history
Content.Server/Salvage/SalvageSystem.Runner.cs		diff \| blob \| history
Content.Server/Speech/EntitySystems/VocalSystem.cs		diff \| blob \| history
Content.Server/Station/Systems/StationSpawningSystem.cs		diff \| blob \| history
Content.Server/StationEvents/Events/MassHallucinationsRule.cs		diff \| blob \| history
Content.Server/Store/Conditions/BuyerSpeciesCondition.cs		diff \| blob \| history
Content.Server/Toolshed/Commands/Misc/CloneCommand.cs		diff \| blob \| history
Content.Server/Wagging/WaggingSystem.cs		diff \| blob \| history
Content.Server/Xenoarchaeology/Artifact/XAE/XAEPolymorphSystem.cs		diff \| blob \| history
Content.Server/Zombies/ZombieSystem.Transform.cs		diff \| blob \| history
Content.Server/Zombies/ZombieSystem.cs		diff \| blob \| history
Content.Shared/Body/BodySystem.Relay.cs		diff \| blob \| history
Content.Shared/Body/InitialBodyComponent.cs	[new file with mode: 0644]	blob
Content.Shared/Body/InitialBodySystem.cs	[new file with mode: 0644]	blob
Content.Shared/Body/SharedVisualBodySystem.Initial.cs	[new file with mode: 0644]	blob
Content.Shared/Body/SharedVisualBodySystem.Modifiers.cs	[new file with mode: 0644]	blob
Content.Shared/Body/SharedVisualBodySystem.cs	[new file with mode: 0644]	blob
Content.Shared/Body/VisualBodyComponent.cs	[new file with mode: 0644]	blob
Content.Shared/Body/VisualOrganComponent.cs	[new file with mode: 0644]	blob
Content.Shared/Body/VisualOrganMarkingsComponent.cs	[new file with mode: 0644]	blob
Content.Shared/Changeling/Components/ChangelingDevourComponent.cs		diff \| blob \| history
Content.Shared/Changeling/Systems/ChangelingClonerSystem.cs		diff \| blob \| history
Content.Shared/Changeling/Systems/ChangelingDevourSystem.cs		diff \| blob \| history
Content.Shared/Changeling/Systems/ChangelingTransformSystem.cs		diff \| blob \| history
Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs		diff \| blob \| history
Content.Shared/Clothing/EntitySystems/HideLayerClothingSystem.cs		diff \| blob \| history
Content.Shared/Clothing/LoadoutSystem.cs		diff \| blob \| history
Content.Shared/Humanoid/HideableHumanoidLayersComponent.cs	[new file with mode: 0644]	blob
Content.Shared/Humanoid/HumanoidAppearanceComponent.cs	[deleted file]	blob \| history
Content.Shared/Humanoid/HumanoidCharacterAppearance.cs		diff \| blob \| history
Content.Shared/Humanoid/HumanoidProfileComponent.cs	[new file with mode: 0644]	blob
Content.Shared/Humanoid/HumanoidProfileExportV1.cs	[new file with mode: 0644]	blob
Content.Shared/Humanoid/HumanoidProfileExportV2.cs	[moved from Content.Shared/Humanoid/HumanoidProfileExport.cs with 80% similarity]	diff \| blob \| history
Content.Shared/Humanoid/HumanoidProfileSystem.cs	[new file with mode: 0644]	blob
Content.Shared/Humanoid/HumanoidVisualLayers.cs		diff \| blob \| history
Content.Shared/Humanoid/Markings/ColoringTypes/CategoryColoring.cs		diff \| blob \| history
Content.Shared/Humanoid/Markings/ColoringTypes/EyeColoring.cs		diff \| blob \| history
Content.Shared/Humanoid/Markings/ColoringTypes/SimpleColoring.cs		diff \| blob \| history
Content.Shared/Humanoid/Markings/ColoringTypes/SkinColoring.cs		diff \| blob \| history
Content.Shared/Humanoid/Markings/ColoringTypes/TattooColoring.cs		diff \| blob \| history
Content.Shared/Humanoid/Markings/Marking.cs		diff \| blob \| history
Content.Shared/Humanoid/Markings/MarkingCategories.cs	[deleted file]	blob \| history
Content.Shared/Humanoid/Markings/MarkingColoring.cs		diff \| blob \| history
Content.Shared/Humanoid/Markings/MarkingManager.cs		diff \| blob \| history
Content.Shared/Humanoid/Markings/MarkingPoints.cs	[deleted file]	blob \| history
Content.Shared/Humanoid/Markings/MarkingPrototype.cs		diff \| blob \| history
Content.Shared/Humanoid/Markings/MarkingsComponent.cs	[deleted file]	blob \| history
Content.Shared/Humanoid/Markings/MarkingsGroupPrototype.cs	[new file with mode: 0644]	blob
Content.Shared/Humanoid/Markings/MarkingsSet.cs	[deleted file]	blob \| history
Content.Shared/Humanoid/Prototypes/HumanoidProfilePrototype.cs		diff \| blob \| history
Content.Shared/Humanoid/Prototypes/HumanoidSpritePrototypes.cs	[deleted file]	blob \| history
Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs		diff \| blob \| history
Content.Shared/Humanoid/SharedHideableHumanoidLayersSystem.cs	[new file with mode: 0644]	blob
Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs	[deleted file]	blob \| history
Content.Shared/Humanoid/SharedHumanoidMarkingModifierSystem.cs		diff \| blob \| history
Content.Shared/IdentityManagement/IdentitySystem.cs		diff \| blob \| history
Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs		diff \| blob \| history
Content.Shared/MagicMirror/MagicMirrorComponent.cs		diff \| blob \| history
Content.Shared/MagicMirror/MagicMirrorSystem.cs	[new file with mode: 0644]	blob
Content.Shared/MagicMirror/SharedMagicMirrorSystem.cs	[deleted file]	blob \| history
Content.Shared/Mind/SharedMindSystem.cs		diff \| blob \| history
Content.Shared/Preferences/HumanoidCharacterProfile.cs		diff \| blob \| history
Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs		diff \| blob \| history
Content.Shared/Wagging/WaggingComponent.cs		diff \| blob \| history
Content.Shared/Whistle/WhistleSystem.cs		diff \| blob \| history
Content.Shared/Zombies/ZombieComponent.cs		diff \| blob \| history
Resources/Locale/en-US/preferences/ui/markings-picker.ftl		diff \| blob \| history
Resources/Prototypes/Body/Species/arachnid.yml		diff \| blob \| history
Resources/Prototypes/Body/Species/diona.yml		diff \| blob \| history
Resources/Prototypes/Body/Species/dwarf.yml		diff \| blob \| history
Resources/Prototypes/Body/Species/gingerbread.yml		diff \| blob \| history
Resources/Prototypes/Body/Species/human.yml		diff \| blob \| history
Resources/Prototypes/Body/Species/moth.yml		diff \| blob \| history
Resources/Prototypes/Body/Species/reptilian.yml		diff \| blob \| history
Resources/Prototypes/Body/Species/skeleton.yml		diff \| blob \| history
Resources/Prototypes/Body/Species/slime.yml		diff \| blob \| history
Resources/Prototypes/Body/Species/vox.yml		diff \| blob \| history
Resources/Prototypes/Body/Species/vulpkanin.yml		diff \| blob \| history
Resources/Prototypes/Body/base_organs.yml		diff \| blob \| history
Resources/Prototypes/Body/species_appearance.yml		diff \| blob \| history
Resources/Prototypes/Body/species_base.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Back/smuggler.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_chest.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_ears.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_hair.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_head.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_limbs.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_snout.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_tail.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/diona.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/ears.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/human_facial_hair.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/undergarments.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_facial_hair.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_scars.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Player/clone.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Player/dragon.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Player/human.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml		diff \| blob \| history
Resources/Prototypes/Entities/Structures/Furniture/toilet.yml		diff \| blob \| history
Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml		diff \| blob \| history
Resources/Prototypes/NPCs/hugbot.yml		diff \| blob \| history
Resources/Prototypes/Species/arachnid.yml		diff \| blob \| history
Resources/Prototypes/Species/diona.yml		diff \| blob \| history
Resources/Prototypes/Species/dwarf.yml		diff \| blob \| history
Resources/Prototypes/Species/gingerbread.yml		diff \| blob \| history
Resources/Prototypes/Species/human.yml		diff \| blob \| history
Resources/Prototypes/Species/moth.yml		diff \| blob \| history
Resources/Prototypes/Species/reptilian.yml		diff \| blob \| history
Resources/Prototypes/Species/skeleton.yml		diff \| blob \| history
Resources/Prototypes/Species/slime.yml		diff \| blob \| history
Resources/Prototypes/Species/vox.yml		diff \| blob \| history
Resources/Prototypes/Species/vulpkanin.yml		diff \| blob \| history
Resources/Textures/Interface/palette.svg	[new file with mode: 0644]	blob
Resources/Textures/Interface/palette.svg.png	[new file with mode: 0644]	blob

Форк Space Station 14 с переводами на русский

RSS Atom