Commit graph

11 commits

Author SHA1 Message Date
Morb0
5277dceed2 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
2023-08-24 22:01:46 +03:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
Morbo
3ed1fcd6da Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json
2023-04-26 14:23:40 +03:00
Leon Friedrich
db8a48ba33
Fix SpawnAndDirtyAllEntities test (#15771) 2023-04-25 19:27:57 +10:00
Morbo
82a466f4ff Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
#	Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Resources/Audio/Announcements/license.txt
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-03-07 18:54:29 +03:00
csqrb
8b3d7728d7
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
2023-03-04 18:59:07 -08:00
Morb
b66709887d
Add colored chat names (#844) 2023-02-19 16:01:57 -08:00
Morbo
8bff10af81 Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-01-27 21:05:54 +03:00
Leon Friedrich
e8838af395
Fix humanoid appearance error (#13721) 2023-01-26 18:04:58 -04:00
Morbo
d9c226480b Move TTS code to Humanoid dir 2023-01-25 23:36:39 +03:00
Leon Friedrich
48bcd30ef9
Makes humanoid appearance component networked. (#13009)
Fixes https://github.com/space-wizards/space-station-14/issues/12248
2023-01-24 11:38:19 +11:00