alberyk beecb5f802 Merge branch 'master' into fourth_week_preparation_and_fixes ...

# Conflicts:
#	code/game/jobs/faction/zavodskoi.dm

2022-02-10 13:36:46 -03:00

..

_material_def.dm

…

~material_def.dm

…

material_recipes.dm

Railing Stuff (#13035)

2022-02-06 18:21:56 -03:00

material_sheets.dm

Allows painting of padded stools, chairs and beds. (#12855)

2021-12-26 21:12:36 +01:00

material_synth.dm

…

materials.dm

shuttles

2022-01-16 15:07:06 -03:00