Merge branch 'master' into fourth_week_preparation_and_fixes

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

code/modules/paperwork/pen.dm

@@ -25,6 +25,7 @@ Pen and crayon commands
 \[i\] - \[/i\] : Makes the text italic.
 \[u\] - \[/u\] : Makes the text underlined.
 \[large\] - \[/large\] : Increases the size of the text.
+\[redacted\] - \[/redacted\] : Covers the text in an unbreachable black box.
 \[sign\] : Inserts a signature of your name in a foolproof way.
 \[field\] : Inserts an invisible field which lets you start type from there. Useful for forms.
 \[date\] : Inserts today's station date.