NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Shared/Humanoid/Prototypes
History
Exact
Morb0 28edee0fe2 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Administration/Commands/AdminWhoCommand.cs
#	Content.Server/Administration/Commands/PlayTimeCommands.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Resources/Prototypes/Datasets/tips.yml
#	Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
2024-06-01 23:06:19 +03:00
..
HumanoidProfilePrototype.cs Make all prototype types partial (#21374) 2023-11-01 19:56:23 -07:00
HumanoidSpritePrototypes.cs Make all prototype types partial (#21374) 2023-11-01 19:56:23 -07:00
RandomHumanoidSettingsPrototype.cs Randomizes more humanoid appearances (#27997) 2024-06-01 00:51:07 -04:00
SpeciesPrototype.cs Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-17 11:57:44 +03:00