diff --git a/src/en/assets/images/general-development/codebase-info/conventions/entityprototypesuffixes1.png b/src/en/assets/images/general-development/codebase-info/conventions/entityprototypesuffixes1.png new file mode 100644 index 0000000000..ed04add6d6 Binary files /dev/null and b/src/en/assets/images/general-development/codebase-info/conventions/entityprototypesuffixes1.png differ diff --git a/src/en/assets/images/general-development/codebase-info/conventions/entityprototypesuffixes2.png b/src/en/assets/images/general-development/codebase-info/conventions/entityprototypesuffixes2.png new file mode 100644 index 0000000000..cf8b26af65 Binary files /dev/null and b/src/en/assets/images/general-development/codebase-info/conventions/entityprototypesuffixes2.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/branchexample.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/branchexample.png new file mode 100644 index 0000000000..1639827984 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/branchexample.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/commitexample.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/commitexample.png new file mode 100644 index 0000000000..5fb7b52860 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/commitexample.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/forking.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/forking.png new file mode 100644 index 0000000000..399c64f19d Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/forking.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbbranch.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbbranch.png new file mode 100644 index 0000000000..4ad0a6a995 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbbranch.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbclone.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbclone.png new file mode 100644 index 0000000000..dab4f222ed Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbclone.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbclone1.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbclone1.png new file mode 100644 index 0000000000..e03a7dbb30 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbclone1.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbco.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbco.png new file mode 100644 index 0000000000..86cb2f5f48 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbco.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbm.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbm.png new file mode 100644 index 0000000000..4c51aad812 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbm.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbpm.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbpm.png new file mode 100644 index 0000000000..fa493cc020 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbpm.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbpushing.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbpushing.png new file mode 100644 index 0000000000..a2e928bee2 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbpushing.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbremote.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbremote.png new file mode 100644 index 0000000000..80e2e8a85a Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbremote.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbsacc.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbsacc.png new file mode 100644 index 0000000000..6cdf9dd026 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbsacc.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbsm.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbsm.png new file mode 100644 index 0000000000..39dd7a9964 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbsm.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbstaging.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbstaging.png new file mode 100644 index 0000000000..62eb6d3d01 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/gbstaging.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/makingapullrequest.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/makingapullrequest.png new file mode 100644 index 0000000000..04e47280de Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/makingapullrequest.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/pullrequestexample1.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/pullrequestexample1.png new file mode 100644 index 0000000000..e2c754b0c3 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/pullrequestexample1.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/pullrequestexample2.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/pullrequestexample2.png new file mode 100644 index 0000000000..779da3b5df Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/pullrequestexample2.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgbranch1.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgbranch1.png new file mode 100644 index 0000000000..6c230dccb4 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgbranch1.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgbranch2.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgbranch2.png new file mode 100644 index 0000000000..f22ce34b6e Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgbranch2.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgclone.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgclone.png new file mode 100644 index 0000000000..4b1c228cec Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgclone.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgclone1.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgclone1.png new file mode 100644 index 0000000000..b4b016d5c4 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgclone1.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgco.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgco.png new file mode 100644 index 0000000000..63581da5ee Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgco.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgm1.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgm1.png new file mode 100644 index 0000000000..9da4de3a8c Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgm1.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgm2.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgm2.png new file mode 100644 index 0000000000..b2a4d08345 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgm2.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgpm1.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgpm1.png new file mode 100644 index 0000000000..cdaca6e5a0 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgpm1.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgpm2.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgpm2.png new file mode 100644 index 0000000000..6bf6d5aa77 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgpm2.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgpm3.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgpm3.png new file mode 100644 index 0000000000..d722624637 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgpm3.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgpushing1.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgpushing1.png new file mode 100644 index 0000000000..50bc65b2e3 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgpushing1.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgpushing2.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgpushing2.png new file mode 100644 index 0000000000..5bc79c0c80 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgpushing2.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgremote1.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgremote1.png new file mode 100644 index 0000000000..f6a822b52e Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgremote1.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgremote2.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgremote2.png new file mode 100644 index 0000000000..4c09af4c36 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgremote2.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgsacc.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgsacc.png new file mode 100644 index 0000000000..7747b5208c Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgsacc.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgsm1.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgsm1.png new file mode 100644 index 0000000000..ba49c8dba5 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgsm1.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgsm2.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgsm2.png new file mode 100644 index 0000000000..148e1c749b Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgsm2.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgstaging1.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgstaging1.png new file mode 100644 index 0000000000..6d959b2ab9 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgstaging1.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgstaging2.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgstaging2.png new file mode 100644 index 0000000000..847caacdf6 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/sgstaging2.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgbranch1.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgbranch1.png new file mode 100644 index 0000000000..67ba9b6463 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgbranch1.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgbranch2.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgbranch2.png new file mode 100644 index 0000000000..663bbed224 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgbranch2.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgclone1.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgclone1.png new file mode 100644 index 0000000000..57020213aa Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgclone1.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgclone2.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgclone2.png new file mode 100644 index 0000000000..bc237badfb Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgclone2.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgcm.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgcm.png new file mode 100644 index 0000000000..a5944a01be Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgcm.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgco.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgco.png new file mode 100644 index 0000000000..7006a384b8 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgco.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgm1.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgm1.png new file mode 100644 index 0000000000..5cbd3c42b1 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgm1.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgm2.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgm2.png new file mode 100644 index 0000000000..bc237badfb Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgm2.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgpm1.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgpm1.png new file mode 100644 index 0000000000..d2860c63df Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgpm1.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgpm2.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgpm2.png new file mode 100644 index 0000000000..58ae653147 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgpm2.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgpushing1.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgpushing1.png new file mode 100644 index 0000000000..4a350c0c90 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgpushing1.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgpushing2.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgpushing2.png new file mode 100644 index 0000000000..d602fb34cc Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgpushing2.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgremote1.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgremote1.png new file mode 100644 index 0000000000..2872e48eb2 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgremote1.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgremote2.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgremote2.png new file mode 100644 index 0000000000..b8de316c3f Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgremote2.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgsacc.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgsacc.png new file mode 100644 index 0000000000..106c8ee144 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgsacc.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgsm1.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgsm1.png new file mode 100644 index 0000000000..7f6e0bd3c5 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgsm1.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgsm2.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgsm2.png new file mode 100644 index 0000000000..1df606203e Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgsm2.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgstaging1.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgstaging1.png new file mode 100644 index 0000000000..5123f68acb Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgstaging1.png differ diff --git a/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgstaging2.png b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgstaging2.png new file mode 100644 index 0000000000..be0d84fac0 Binary files /dev/null and b/src/en/assets/images/general-development/setup/git-for-the-ss14-developer/tgstaging2.png differ diff --git a/src/en/assets/images/general-development/tips/beginner-faq/cdcommand.png b/src/en/assets/images/general-development/tips/beginner-faq/cdcommand.png new file mode 100644 index 0000000000..8e6f293c40 Binary files /dev/null and b/src/en/assets/images/general-development/tips/beginner-faq/cdcommand.png differ diff --git a/src/en/assets/images/general-development/tips/beginner-faq/codeeditor.png b/src/en/assets/images/general-development/tips/beginner-faq/codeeditor.png new file mode 100644 index 0000000000..4be3b965be Binary files /dev/null and b/src/en/assets/images/general-development/tips/beginner-faq/codeeditor.png differ diff --git a/src/en/assets/images/general-development/tips/beginner-faq/mergechanges.png b/src/en/assets/images/general-development/tips/beginner-faq/mergechanges.png new file mode 100644 index 0000000000..c309e2d7b5 Binary files /dev/null and b/src/en/assets/images/general-development/tips/beginner-faq/mergechanges.png differ diff --git a/src/en/assets/images/general-development/tips/beginner-faq/methodname.png b/src/en/assets/images/general-development/tips/beginner-faq/methodname.png new file mode 100644 index 0000000000..2a0ae25fb3 Binary files /dev/null and b/src/en/assets/images/general-development/tips/beginner-faq/methodname.png differ diff --git a/src/en/assets/images/general-development/tips/beginner-faq/projectfluent.png b/src/en/assets/images/general-development/tips/beginner-faq/projectfluent.png new file mode 100644 index 0000000000..38efedd07e Binary files /dev/null and b/src/en/assets/images/general-development/tips/beginner-faq/projectfluent.png differ diff --git a/src/en/assets/images/general-development/tips/beginner-faq/pullcode.png b/src/en/assets/images/general-development/tips/beginner-faq/pullcode.png new file mode 100644 index 0000000000..87ead031ce Binary files /dev/null and b/src/en/assets/images/general-development/tips/beginner-faq/pullcode.png differ diff --git a/src/en/assets/images/general-development/tips/beginner-faq/syncfork.png b/src/en/assets/images/general-development/tips/beginner-faq/syncfork.png new file mode 100644 index 0000000000..0f288df74d Binary files /dev/null and b/src/en/assets/images/general-development/tips/beginner-faq/syncfork.png differ diff --git a/src/en/assets/images/general-development/tips/beginner-faq/xamlandymlsearch.png b/src/en/assets/images/general-development/tips/beginner-faq/xamlandymlsearch.png new file mode 100644 index 0000000000..e8543ba52a Binary files /dev/null and b/src/en/assets/images/general-development/tips/beginner-faq/xamlandymlsearch.png differ diff --git a/src/en/assets/images/hamletheldatgunpoint.png b/src/en/assets/images/hamletheldatgunpoint.png new file mode 100644 index 0000000000..cb73939972 Binary files /dev/null and b/src/en/assets/images/hamletheldatgunpoint.png differ diff --git a/src/en/assets/images/maintainer-meetings/2021-10-16/macosprompt.png b/src/en/assets/images/maintainer-meetings/2021-10-16/macosprompt.png new file mode 100644 index 0000000000..b1277e005d Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2021-10-16/macosprompt.png differ diff --git a/src/en/assets/images/maintainer-meetings/2021-10-16/popupexample.png b/src/en/assets/images/maintainer-meetings/2021-10-16/popupexample.png new file mode 100644 index 0000000000..12fc477aa9 Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2021-10-16/popupexample.png differ diff --git a/src/en/assets/images/maintainer-meetings/2021-10-16/ubuntuprompt.png b/src/en/assets/images/maintainer-meetings/2021-10-16/ubuntuprompt.png new file mode 100644 index 0000000000..1d1598ee8f Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2021-10-16/ubuntuprompt.png differ diff --git a/src/en/assets/images/maintainer-meeting/2021-10-16-windows-confirm-prompt.png b/src/en/assets/images/maintainer-meetings/2021-10-16/windows-confirm-prompt.png similarity index 100% rename from src/en/assets/images/maintainer-meeting/2021-10-16-windows-confirm-prompt.png rename to src/en/assets/images/maintainer-meetings/2021-10-16/windows-confirm-prompt.png diff --git a/src/en/assets/images/maintainer-meetings/2021-10-16/yesno.png b/src/en/assets/images/maintainer-meetings/2021-10-16/yesno.png new file mode 100644 index 0000000000..4d3da0c14e Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2021-10-16/yesno.png differ diff --git a/src/en/assets/images/maintainer-meetings/2021-10-30/defaultgithub.png b/src/en/assets/images/maintainer-meetings/2021-10-30/defaultgithub.png new file mode 100644 index 0000000000..84f6de67a0 Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2021-10-30/defaultgithub.png differ diff --git a/src/en/assets/images/maintainer-meetings/2021-10-30/letters.png b/src/en/assets/images/maintainer-meetings/2021-10-30/letters.png new file mode 100644 index 0000000000..56987227ad Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2021-10-30/letters.png differ diff --git a/src/en/assets/images/maintainer-meetings/2021-10-30/thistbh.png b/src/en/assets/images/maintainer-meetings/2021-10-30/thistbh.png new file mode 100644 index 0000000000..3ce6330add Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2021-10-30/thistbh.png differ diff --git a/src/en/assets/images/maintainer-meeting/2021-11-13-examine-1.png b/src/en/assets/images/maintainer-meetings/2021-11-13/2021-11-13-examine-1.png similarity index 100% rename from src/en/assets/images/maintainer-meeting/2021-11-13-examine-1.png rename to src/en/assets/images/maintainer-meetings/2021-11-13/2021-11-13-examine-1.png diff --git a/src/en/assets/images/maintainer-meeting/2021-11-13-examine-2.png b/src/en/assets/images/maintainer-meetings/2021-11-13/2021-11-13-examine-2.png similarity index 100% rename from src/en/assets/images/maintainer-meeting/2021-11-13-examine-2.png rename to src/en/assets/images/maintainer-meetings/2021-11-13/2021-11-13-examine-2.png diff --git a/src/en/assets/images/maintainer-meetings/2021-11-13/logentryupdate.png b/src/en/assets/images/maintainer-meetings/2021-11-13/logentryupdate.png new file mode 100644 index 0000000000..15c9f7369c Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2021-11-13/logentryupdate.png differ diff --git a/src/en/assets/images/maintainer-meetings/2021-11-13/thatsprettybased.png b/src/en/assets/images/maintainer-meetings/2021-11-13/thatsprettybased.png new file mode 100644 index 0000000000..505eda4fd7 Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2021-11-13/thatsprettybased.png differ diff --git a/src/en/assets/images/maintainer-meetings/2021-11-27/componentprotoname.png b/src/en/assets/images/maintainer-meetings/2021-11-27/componentprotoname.png new file mode 100644 index 0000000000..bda10abd6a Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2021-11-27/componentprotoname.png differ diff --git a/src/en/assets/images/maintainer-meetings/2021-11-27/forserialization.png b/src/en/assets/images/maintainer-meetings/2021-11-27/forserialization.png new file mode 100644 index 0000000000..061a5d2032 Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2021-11-27/forserialization.png differ diff --git a/src/en/assets/images/maintainer-meetings/2021-11-27/prgithubbot.png b/src/en/assets/images/maintainer-meetings/2021-11-27/prgithubbot.png new file mode 100644 index 0000000000..7a51cd5472 Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2021-11-27/prgithubbot.png differ diff --git a/src/en/assets/images/maintainer-meetings/2021-12-11/whenthe.gif b/src/en/assets/images/maintainer-meetings/2021-12-11/whenthe.gif new file mode 100644 index 0000000000..2987f7293f Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2021-12-11/whenthe.gif differ diff --git a/src/en/assets/images/maintainer-meetings/2022-01-08/walterwhite.png b/src/en/assets/images/maintainer-meetings/2022-01-08/walterwhite.png new file mode 100644 index 0000000000..7c4b4f045e Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2022-01-08/walterwhite.png differ diff --git a/src/en/assets/images/maintainer-meeting/2022-02-05-ci-fail.png b/src/en/assets/images/maintainer-meetings/2022-02-05/ci-fail.png similarity index 100% rename from src/en/assets/images/maintainer-meeting/2022-02-05-ci-fail.png rename to src/en/assets/images/maintainer-meetings/2022-02-05/ci-fail.png diff --git a/src/en/assets/images/maintainer-meetings/2022-04-30/entitychange.png b/src/en/assets/images/maintainer-meetings/2022-04-30/entitychange.png new file mode 100644 index 0000000000..5a52f87c4e Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2022-04-30/entitychange.png differ diff --git a/src/en/assets/images/maintainer-meetings/2022-05-28/changexamlfilenamingscheme.png b/src/en/assets/images/maintainer-meetings/2022-05-28/changexamlfilenamingscheme.png new file mode 100644 index 0000000000..43840546bb Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2022-05-28/changexamlfilenamingscheme.png differ diff --git a/src/en/assets/images/maintainer-meetings/2022-05-28/robustideextension.png b/src/en/assets/images/maintainer-meetings/2022-05-28/robustideextension.png new file mode 100644 index 0000000000..947519f9a2 Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2022-05-28/robustideextension.png differ diff --git a/src/en/assets/images/maintainer-meetings/2022-07-16/action.png b/src/en/assets/images/maintainer-meetings/2022-07-16/action.png new file mode 100644 index 0000000000..0a44317742 Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2022-07-16/action.png differ diff --git a/src/en/assets/images/maintainer-meetings/2023-06-10/obsoletefreeze.png b/src/en/assets/images/maintainer-meetings/2023-06-10/obsoletefreeze.png new file mode 100644 index 0000000000..72c21e04cd Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2023-06-10/obsoletefreeze.png differ diff --git a/src/en/assets/images/maintainer-meetings/2023-07-29/contraband.png b/src/en/assets/images/maintainer-meetings/2023-07-29/contraband.png new file mode 100644 index 0000000000..2ab05a939f Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2023-07-29/contraband.png differ diff --git a/src/en/assets/images/maintainer-meetings/2023-08-19/dataobject.png b/src/en/assets/images/maintainer-meetings/2023-08-19/dataobject.png new file mode 100644 index 0000000000..61dae6ca40 Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2023-08-19/dataobject.png differ diff --git a/src/en/assets/images/maintainer-meeting/2024-10-26-pjb-is-not-french.png b/src/en/assets/images/maintainer-meetings/2024-10-12/pjb-is-not-french.png similarity index 100% rename from src/en/assets/images/maintainer-meeting/2024-10-26-pjb-is-not-french.png rename to src/en/assets/images/maintainer-meetings/2024-10-12/pjb-is-not-french.png diff --git a/src/en/assets/images/maintainer-meetings/2024-12-07/notopics.png b/src/en/assets/images/maintainer-meetings/2024-12-07/notopics.png new file mode 100644 index 0000000000..7c08b40464 Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2024-12-07/notopics.png differ diff --git a/src/en/assets/images/maintainer-meetings/2025-02-15/newmaintainer.png b/src/en/assets/images/maintainer-meetings/2025-02-15/newmaintainer.png new file mode 100644 index 0000000000..192804b1e3 Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2025-02-15/newmaintainer.png differ diff --git a/src/en/assets/images/maintainer-meetings/2025-04-27/gamerulecomponent.png b/src/en/assets/images/maintainer-meetings/2025-04-27/gamerulecomponent.png new file mode 100644 index 0000000000..3b5aaacdcf Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2025-04-27/gamerulecomponent.png differ diff --git a/src/en/assets/images/maintainer-meetings/2025-07-05/iconsmoothing.png b/src/en/assets/images/maintainer-meetings/2025-07-05/iconsmoothing.png new file mode 100644 index 0000000000..c82d4c146f Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2025-07-05/iconsmoothing.png differ diff --git a/src/en/assets/images/maintainer-meetings/2025-07-19/excessiveerrors.png b/src/en/assets/images/maintainer-meetings/2025-07-19/excessiveerrors.png new file mode 100644 index 0000000000..5c4efe9e50 Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2025-07-19/excessiveerrors.png differ diff --git a/src/en/assets/images/maintainer-meetings/2025-09-27/prompt.png b/src/en/assets/images/maintainer-meetings/2025-09-27/prompt.png new file mode 100644 index 0000000000..05b7383e3e Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2025-09-27/prompt.png differ diff --git a/src/en/assets/images/maintainer-meetings/2025-12-06/dungeonsystemerrors.png b/src/en/assets/images/maintainer-meetings/2025-12-06/dungeonsystemerrors.png new file mode 100644 index 0000000000..4539042a25 Binary files /dev/null and b/src/en/assets/images/maintainer-meetings/2025-12-06/dungeonsystemerrors.png differ diff --git a/src/en/assets/images/space-station-14/departments/atmos/proposals/atmos-air-recirculation/stationatmoshvac.png b/src/en/assets/images/space-station-14/departments/atmos/proposals/atmos-air-recirculation/stationatmoshvac.png new file mode 100644 index 0000000000..c3596dbab6 Binary files /dev/null and b/src/en/assets/images/space-station-14/departments/atmos/proposals/atmos-air-recirculation/stationatmoshvac.png differ diff --git a/src/en/assets/images/space-station-14/departments/atmos/proposals/atmos-rework/setup.png b/src/en/assets/images/space-station-14/departments/atmos/proposals/atmos-rework/setup.png new file mode 100644 index 0000000000..2e8c1fda64 Binary files /dev/null and b/src/en/assets/images/space-station-14/departments/atmos/proposals/atmos-rework/setup.png differ diff --git a/src/en/assets/images/space-station-14/departments/engineering/pow3r/distributionpriorities.png b/src/en/assets/images/space-station-14/departments/engineering/pow3r/distributionpriorities.png new file mode 100644 index 0000000000..69f6ee75c7 Binary files /dev/null and b/src/en/assets/images/space-station-14/departments/engineering/pow3r/distributionpriorities.png differ diff --git a/src/en/assets/images/space-station-14/departments/engineering/pow3r/hierarchicalpowerdistribution1.png b/src/en/assets/images/space-station-14/departments/engineering/pow3r/hierarchicalpowerdistribution1.png new file mode 100644 index 0000000000..772a3f365d Binary files /dev/null and b/src/en/assets/images/space-station-14/departments/engineering/pow3r/hierarchicalpowerdistribution1.png differ diff --git a/src/en/assets/images/space-station-14/departments/engineering/pow3r/hierarchicalpowerdistribution2.png b/src/en/assets/images/space-station-14/departments/engineering/pow3r/hierarchicalpowerdistribution2.png new file mode 100644 index 0000000000..bddff6ba3f Binary files /dev/null and b/src/en/assets/images/space-station-14/departments/engineering/pow3r/hierarchicalpowerdistribution2.png differ diff --git a/src/en/assets/images/space-station-14/departments/engineering/pow3r/hierarchicalpowerdistribution3.png b/src/en/assets/images/space-station-14/departments/engineering/pow3r/hierarchicalpowerdistribution3.png new file mode 100644 index 0000000000..282c1348e5 Binary files /dev/null and b/src/en/assets/images/space-station-14/departments/engineering/pow3r/hierarchicalpowerdistribution3.png differ diff --git a/src/en/assets/images/space-station-14/departments/security/proposals/genpop-prisoners/genpop.png b/src/en/assets/images/space-station-14/departments/security/proposals/genpop-prisoners/genpop.png new file mode 100644 index 0000000000..5a593a8b83 Binary files /dev/null and b/src/en/assets/images/space-station-14/departments/security/proposals/genpop-prisoners/genpop.png differ diff --git a/src/en/assets/images/space-station-14/departments/security/proposals/genpop-prisoners/turnstile.png b/src/en/assets/images/space-station-14/departments/security/proposals/genpop-prisoners/turnstile.png new file mode 100644 index 0000000000..466ea99302 Binary files /dev/null and b/src/en/assets/images/space-station-14/departments/security/proposals/genpop-prisoners/turnstile.png differ diff --git a/src/en/assets/images/ss14-by-example/clownhornexample1.png b/src/en/assets/images/ss14-by-example/clownhornexample1.png new file mode 100644 index 0000000000..e0c87245ac Binary files /dev/null and b/src/en/assets/images/ss14-by-example/clownhornexample1.png differ diff --git a/src/en/assets/images/ss14-by-example/clownhornexample2.png b/src/en/assets/images/ss14-by-example/clownhornexample2.png new file mode 100644 index 0000000000..018c6f956b Binary files /dev/null and b/src/en/assets/images/ss14-by-example/clownhornexample2.png differ diff --git a/src/en/assets/images/ss14-by-example/componentcreation.png b/src/en/assets/images/ss14-by-example/componentcreation.png new file mode 100644 index 0000000000..b27a6f38b2 Binary files /dev/null and b/src/en/assets/images/ss14-by-example/componentcreation.png differ diff --git a/src/en/assets/images/ss14-by-example/skubexample.png b/src/en/assets/images/ss14-by-example/skubexample.png new file mode 100644 index 0000000000..1543029fde Binary files /dev/null and b/src/en/assets/images/ss14-by-example/skubexample.png differ diff --git a/src/en/assets/images/wizden-staff/maintainer/allowedits.png b/src/en/assets/images/wizden-staff/maintainer/allowedits.png new file mode 100644 index 0000000000..e5ff9a50d5 Binary files /dev/null and b/src/en/assets/images/wizden-staff/maintainer/allowedits.png differ diff --git a/src/en/assets/images/wizden-staff/maintainer/allowedits2.png b/src/en/assets/images/wizden-staff/maintainer/allowedits2.png new file mode 100644 index 0000000000..a80d29a4dd Binary files /dev/null and b/src/en/assets/images/wizden-staff/maintainer/allowedits2.png differ diff --git a/src/en/assets/images/wizden-staff/maintainer/commithash.png b/src/en/assets/images/wizden-staff/maintainer/commithash.png new file mode 100644 index 0000000000..3a52f53f39 Binary files /dev/null and b/src/en/assets/images/wizden-staff/maintainer/commithash.png differ diff --git a/src/en/assets/images/wizden-staff/maintainer/squashreminder.png b/src/en/assets/images/wizden-staff/maintainer/squashreminder.png new file mode 100644 index 0000000000..4599fa32ba Binary files /dev/null and b/src/en/assets/images/wizden-staff/maintainer/squashreminder.png differ diff --git a/src/en/assets/images/wizden-staff/runpublish.png b/src/en/assets/images/wizden-staff/runpublish.png new file mode 100644 index 0000000000..0685fd3713 Binary files /dev/null and b/src/en/assets/images/wizden-staff/runpublish.png differ diff --git a/src/en/general-development/codebase-info/conventions.md b/src/en/general-development/codebase-info/conventions.md index 206493b138..848bcd5567 100644 --- a/src/en/general-development/codebase-info/conventions.md +++ b/src/en/general-development/codebase-info/conventions.md @@ -774,10 +774,11 @@ Please ensure you structure entities with components as follows for easier YAML #### Entity Prototype suffixes Use `suffix` in prototypes, this it's a spawn-menu-only suffix that allows you to distinguish what prototypes are, without modifying the actual prototype name. You can use it like this: - + + And results in this: - + ## Localization Every player-facing string ever needs to be localized. diff --git a/src/en/general-development/setup/git-for-the-ss14-developer.md b/src/en/general-development/setup/git-for-the-ss14-developer.md index 7f5df5721b..907f9b8d3c 100644 --- a/src/en/general-development/setup/git-for-the-ss14-developer.md +++ b/src/en/general-development/setup/git-for-the-ss14-developer.md @@ -64,7 +64,7 @@ Your remote repository doesn't automatically update with changes from the origin Navigate to the [Space Station 14 repository](https://github.com/space-wizards/space-station-14) and click here: - + From there, it'll ask you where to fork it and what to name it--just to your regular account, and name it whatever you please! I'd stick with `space-station-14` if you just want to help out with development, though. @@ -81,7 +81,7 @@ Navigate to somewhere on your computer where you want to put the local repositor Right click to see TortoiseGit's context menu stuff: - +
@@ -91,7 +91,7 @@ Right click to see TortoiseGit's context menu stuff: Open up SmartGit and navigate to the desired location, then: - + @@ -101,7 +101,7 @@ Open up SmartGit and navigate to the desired location, then: Right click: - + @@ -113,8 +113,8 @@ Then, we'll enter the command for cloning **our** remote repository--not the `sp- - + +
@@ -123,7 +123,7 @@ Then, we'll enter the command for cloning **our** remote repository--not the `sp- +
@@ -132,7 +132,7 @@ Then, we'll enter the command for cloning **our** remote repository--not the `sp
-
+
Then **c**hange **d**irectory using:
``cd space-station-14``
@@ -175,8 +175,8 @@ One issue: we don't have a reference to the original `space-wizards/space-statio
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
You may notice that the bit in parentheses (master) changed to (funny-feature)! Incredible!
@@ -308,7 +308,7 @@ Checking out a branch:
-
+
-
+
-
+
-
+
TortoiseGit also shows changed files/folders (a red icon in the bottom right) in the Windows Explorer which is really nice and why I have it installed in the first place.
@@ -354,7 +354,7 @@ TortoiseGit also shows changed files/folders (a red icon in the bottom right) in
-
+
This is assuming you installed SmartGit with the option that the main window shows diffs and status. If you didn't, I don't really know where it is.
@@ -364,7 +364,7 @@ This is assuming you installed SmartGit with the option that the main window sho
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
Selecting 'push all branches' does what it says on the tin. Can be useful.
@@ -429,8 +429,8 @@ Selecting 'push all branches' does what it says on the tin. Can be useful.
-
-
+
+
-
+
-
-
+
+
Make sure you select `upstream` and not origin!
@@ -482,13 +482,13 @@ Make sure you select `upstream` and not origin!
-
+
I think smartgit fetches from all remotes when you click this?????
If it doesn't and it just fetches from origin, go to the bottom left and do this:
-
+
-
+
Here nothing happened because I just fetched, but it'll take a while.
@@ -512,8 +512,8 @@ Check out the branch you want to merge to. Then,
-
-
+
+
-
-
+
+
-
+
You can also `git merge upstream/master [branch-to-merge-to]
@@ -550,8 +550,8 @@ First, checkout your `master` branch. We covered this earlier. Then,
-
-
+
+
-
-
-
+
+
+
-
+
TortoiseGit
SmartGit
Git Bash
TortoiseGit
SmartGit
Git Bash
TortoiseGit
SmartGit
Git Bash
TortoiseGit
SmartGit
Git Bash
TortoiseGit
SmartGit
Git Bash
TortoiseGit
SmartGit
Git Bash
TortoiseGit
SmartGit
Git Bash
TortoiseGit
SmartGit
Git Bash
TortoiseGit
SmartGit
Git Bash