VigersRay 31b256cce8 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Entities/Mobs/Species/arachnid.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Mobs/Species/moth.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml # Resources/Prototypes/Traits/disabilities.yml # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json # Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json		2024-07-24 20:36:22 +03:00
..
categories.yml	Move some disabilities traits into a new category (#30102)	2024-07-24 06:50:19 -04:00
disabilities.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-24 20:36:22 +03:00
quirks.yml	Move some disabilities traits into a new category (#30102)	2024-07-24 06:50:19 -04:00
speech.yml	Починил торгоматы ++ (#174)	2024-07-05 13:44:44 +03:00