NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 18:31:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Shared/Humanoid/Markings
History
Exact
Morb0 07a34aaaae Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Prototypes/Loadouts/loadout_groups.yml
#	Resources/Prototypes/Roles/Jobs/Security/detective.yml
#	Resources/Prototypes/Species/human.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
2024-08-23 09:38:36 +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 Long human ears (#30490) 2024-08-21 17:44:43 -06: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