NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-13 04:11:13 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Shared/Humanoid/Prototypes
History
Morb0 4f43e73d14 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
#	Resources/Prototypes/Roles/Jobs/Security/detective.yml
#	Resources/Prototypes/SoundCollections/NukeMusic.yml
2024-03-11 08:37:54 +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 Make all prototype types partial (#21374) 2023-11-01 19:56:23 -07:00
SpeciesPrototype.cs Merge remote-tracking branch 'upstream/master' into upstream-sync 2024-03-11 08:37:54 +03:00