]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Marking default coloring (#13039)
authorcsqrb <56765288+CaptainSqrBeard@users.noreply.github.com>
Sun, 5 Mar 2023 02:59:07 +0000 (08:59 +0600)
committerGitHub <noreply@github.com>
Sun, 5 Mar 2023 02:59:07 +0000 (18:59 -0800)
commit8b3d7728d7bffef1990df8ccf0d23f54d5e497bc
treef4f19c2085ac835c370181af568fe9fce735e389
parent0ad9af7ae24ba4ced98712ebb5af805f6f700cf0
Marking default coloring (#13039)

* Marking coloring WIP

* EnsureDefault now supports coloring!

* Now markings have coloring when they get added

* Many things

* yml files

* cleanup

* Some requested changes

* Nullable type and WIP caching

* Time to resolve that thing with deprecated hair fields

* Latest reviews + im still trying to use these hair markings

* FirstOrDefault thing and Tattoo docs

* IDK

* It's now works a bit more properly in preferences GUI

* THEY SYNCING! However preferences GUI still broken and doesn't work properly

* Markings now updating when changing in GUI. However they still don't work properly with bald humanoids

* Forgor...

* Default hair-colored markings will not color to hair if there is no hair

* Fixed default colors for customizable markings

* Fixed bug in prefs GUI that set current hair to null

* Now markings that must match skin color because of limb (e.x. Slimes) - will match skin color

* final tweaks: if hair uses skin color then markings will use skin color as hair color (slimes)

* fix

* fixed dirty. no more funni invis bug

* Mirrors and client profile loading

* default colors soon TM

* review + better coloring

* Hardcode is gone

* diona markings

* oh my god

* fixed CategoryColoring

* cool fallback, clean up and some other tweaks

* code style

* more style

* a
26 files changed:
Content.Client/Humanoid/HumanoidAppearanceSystem.cs
Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml.cs
Content.Client/Humanoid/MarkingPicker.xaml.cs
Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
Content.Server/Humanoid/Systems/HumanoidSystem.Modifier.cs
Content.Server/MagicMirror/MagicMirrorSystem.cs
Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
Content.Shared/Humanoid/HumanoidVisualLayers.cs
Content.Shared/Humanoid/Markings/ColoringTypes/CategoryColoring.cs [new file with mode: 0644]
Content.Shared/Humanoid/Markings/ColoringTypes/EyeColoring.cs [new file with mode: 0644]
Content.Shared/Humanoid/Markings/ColoringTypes/SimpleColoring.cs [new file with mode: 0644]
Content.Shared/Humanoid/Markings/ColoringTypes/SkinColoring.cs [new file with mode: 0644]
Content.Shared/Humanoid/Markings/ColoringTypes/TattooColoring.cs [new file with mode: 0644]
Content.Shared/Humanoid/Markings/Marking.cs
Content.Shared/Humanoid/Markings/MarkingColoring.cs [new file with mode: 0644]
Content.Shared/Humanoid/Markings/MarkingManager.cs
Content.Shared/Humanoid/Markings/MarkingPrototype.cs
Content.Shared/Humanoid/Markings/MarkingsSet.cs
Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
Content.Shared/Humanoid/SharedHumanoidMarkingModifierSystem.cs
Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
Resources/Prototypes/Entities/Mobs/Customization/Markings/diona.yml
Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml