CatStation/Content.Shared/Humanoid/Markings
Morb0 4426394d78 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Datasets/Names/regalrat.yml
#	Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png
2023-12-23 02:53:18 +03:00
..
ColoringTypes Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
Marking.cs Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
MarkingCategories.cs Humanoid appearance refactor (#10882) 2022-09-22 17:19:00 -05:00
MarkingColoring.cs Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
MarkingManager.cs Use ECS prototype-reload events (#22613) 2023-12-23 01:13:45 +11:00
MarkingPoints.cs Make all prototype types partial (#21374) 2023-11-01 19:56:23 -07:00
MarkingPrototype.cs Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-11-04 12:16:53 +03:00
MarkingsComponent.cs Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
MarkingsSet.cs Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-09-24 12:56:24 +03:00