NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-15 13:21:11 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
CatStation/Content.Shared/Humanoid/Prototypes
History
Morbo a93a3fb752 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/bar.png
#	Resources/Textures/Tiles/clown.png
#	Resources/Textures/Tiles/dark.png
#	Resources/Textures/Tiles/hydro.png
#	Resources/Textures/Tiles/kitchen.png
#	Resources/Textures/Tiles/laundry.png
#	Resources/Textures/Tiles/steel.png
#	Resources/Textures/Tiles/steel_dirty.png
#	Resources/Textures/Tiles/white.png
2022-10-23 17:55:21 +03:00
..
HumanoidProfilePrototype.cs Humanoid appearance refactor (#10882) 2022-09-22 17:19:00 -05:00
HumanoidSpritePrototypes.cs Humanoid appearance refactor (#10882) 2022-09-22 17:19:00 -05:00
RandomHumanoidSettingsPrototype.cs Actual randomized humanoids (#11574) 2022-10-21 00:46:05 +11:00
SpeciesPrototype.cs Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-10-23 17:55:21 +03:00