Merge branch 'main' into 'main'

Main

See merge request DogePrime/do-disciplinary-committee-members!11

www/data/Armors.json

@@ -273,7 +273,7 @@
     {
         "id": 11,
         "atypeId": 1,
-        "description": "A perverted uniform the AdultMart manager ordered just for Iroha.\\FS[32]\n\\FS[20]The exact opposite of a Public Morals Officer uniform, it satisfies Iroha's masochistic side.\\FS[32]\\FS[20]\\\\n\\}\\C[16]«Equip Conditions» \\C[7][\\I[2657]Can't equip at academy]\\C[0]\\C[0][\\I[2658]Exposure EXP 1500+][\\C[31]Need Public Morals Officer's Secret Side\\C[0]]\\C[0]",
+        "description": "A perverted uniform the AdultMart manager ordered just for Iroha.\\FS[32]\n\\FS[20]The exact opposite of a Public Morals Officer uniform, it satisfies Iroha's masochistic side.\\FS[32]\\FS[20]\\\\n\\}\\C[16]«Equip Con.» \\C[7][\\I[2657]Can't equip at academy]\\C[0]\\C[0][\\I[2658]Exposure EXP 1500+][\\C[31]Need Public Morals Officer's Secret Side\\C[0]]\\C[0]",
         "etypeId": 2,
         "traits": [
             {
@@ -435,7 +435,7 @@
     {
         "id": 17,
         "atypeId": 1,
-        "description": "A lewd maid outfit Kaneobara forced her to wear through blackmail.\\FS[32]\n\\FS[20]The panties even have a built-in vibrator holder.\\FS[32]\\FS[20]\\\\n\\}\\C[16]«Equip Conditions» \\C[7][\\I[2657]Can't equip at academy]\\C[0]\\C[0][\\I[2658]Exposure EXP 1500+][\\C[31]Need Public Morals Officer's Secret Side\\C[0]]\\C[0]",
+        "description": "A lewd maid outfit Kaneobara forced her to wear through blackmail.\\FS[32]\n\\FS[20]The panties even have a built-in vibrator holder.\\FS[32]\\FS[20]\\\\n\\}\\C[16]«Equip Con.» \\C[7][\\I[2657]Can't equip at academy]\\C[0]\\C[0][\\I[2658]Exposure EXP 1500+][\\C[31]Need Public Morals Officer's Secret Side\\C[0]]\\C[0]",
         "etypeId": 2,
         "traits": [
             {