Morb0 c124b716a3 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Traits/TraitSystem.cs # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Research/technologies.yml # Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml # Resources/Prototypes/Maps/aspid.yml # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Maps/barratry.yml # Resources/Prototypes/Maps/box.yml # Resources/Prototypes/Maps/cluster.yml # Resources/Prototypes/Maps/fland.yml # Resources/Prototypes/Maps/kettle.yml # Resources/Prototypes/Maps/marathon.yml # Resources/Prototypes/Maps/meta.yml # Resources/Prototypes/Maps/moose.yml # Resources/Prototypes/Maps/omega.yml # Resources/Prototypes/Maps/origin.yml # Resources/Prototypes/Maps/saltern.yml # Resources/Prototypes/secret_weights.yml # Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/inhand-left.png # Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/inhand-right.png		2023-05-20 13:51:12 +03:00
..
HumanoidProfilePrototype.cs	Add missing DataDefinition constructors (#14603)	2023-03-12 16:37:24 -07:00
HumanoidSpritePrototypes.cs	Humanoid appearance refactor (#10882)	2022-09-22 17:19:00 -05:00
RandomHumanoidSettingsPrototype.cs	Refactor stations to properly use entity prototypes. (stationsv3) (#16570)	2023-05-19 15:45:09 -05:00
SpeciesPrototype.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-01-22 00:07:21 +03:00