onms/do-disciplinary-committee-members
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into 'main'

Browse source 
reverted all the fuckening just leaving the very small sure edits.

See merge request onms/do-disciplinary-committee-members!5
This commit is contained in:
onms 2025-05-13 01:54:26 -05:00
commit 950553189b
4 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
www/data/CommonEvents.json
View file

@ -109521,7 +109521,7 @@
"code": 401,
"indent": 1,
"parameters": [
"\\n<Himeno Iroha>\"Ah... haa♡ I'm not on the Sex Relief Committee, I'm on\nthe Disciplinary Commi― nngh♡♡ You're the one who made up\nthat position and forced it on me, ahh♡♡\""
"\\n<Himeno Iroha>\"Ah... haa♡ I'm not on the Sex Relief Committee, I'm on\nthe Public Morals Commi― nngh♡♡ You're the one who made up\nthat position and forced it on me, ahh♡♡\""
]
},
{
@ -377403,7 +377403,7 @@
"code": 356,
"indent": 1,
"parameters": [
"D_TEXT [Current_Disciplinary_Committee_Confidence_Vote_Results] 16"
"D_TEXT [Current_Public_Morals_Confidence_Vote_Results] 16"
]
},
{
@ -377557,7 +377557,7 @@
"code": 356,
"indent": 2,
"parameters": [
"D_TEXT [Current_Disciplinary_Committee_Confidence_Vote_Results] 16"
"D_TEXT [Current_Public_Morals_Confidence_Vote_Results] 16"
]
},
{
@ -377711,7 +377711,7 @@
"code": 356,
"indent": 3,
"parameters": [
"D_TEXT [Current_Disciplinary_Committee_Confidence_Vote_Results] 16"
"D_TEXT [Current_Public_Morals_Confidence_Vote_Results] 16"
]
},
{
@ -377856,7 +377856,7 @@
"code": 356,
"indent": 4,
"parameters": [
"D_TEXT [Current_Disciplinary_Committee_Confidence_Vote_Results] 16"
"D_TEXT [Current_Public_Morals_Confidence_Vote_Results] 16"
]
},
{
@ -377985,7 +377985,7 @@
"code": 356,
"indent": 5,
"parameters": [
"D_TEXT [Current_Disciplinary_Committee_Confidence_Vote_Results] 16"
"D_TEXT [Current_Public_Morals_Confidence_Vote_Results] 16"
]
},
{
@ -378103,7 +378103,7 @@
"code": 356,
"indent": 5,
"parameters": [
"D_TEXT [Current_Disciplinary_Committee_Confidence_Vote_Results] 16"
"D_TEXT [Current_Public_Morals_Confidence_Vote_Results] 16"
]
},
{
@ -544605,7 +544605,7 @@
"code": 356,
"indent": 1,
"parameters": [
"D_TEXT [Current_Disciplinary_Committee_Confidence_Vote_Results] 16"
"D_TEXT [Current_Public_Morals_Confidence_Vote_Results] 16"
]
},
{
@ -555124,7 +555124,7 @@
"code": 356,
"indent": 1,
"parameters": [
"D_TEXT [Current_Disciplinary_Committee_Confidence_Vote_Results] 16"
"D_TEXT [Current_Public_Morals_Confidence_Vote_Results] 16"
]
},
{
@ -558639,7 +558639,7 @@
"code": 356,
"indent": 1,
"parameters": [
"D_TEXT [Current_Disciplinary_Committee_Confidence_Vote_Results] 16"
"D_TEXT [Current_Public_Morals_Confidence_Vote_Results] 16"
]
},
{
@ -561958,7 +561958,7 @@
"code": 356,
"indent": 1,
"parameters": [
"D_TEXT [Current_Disciplinary_Committee_Confidence_Vote_Results] 16"
"D_TEXT [Current_Public_Morals_Confidence_Vote_Results] 16"
]
},
{

2
www/data/Map086.json
View file

@ -19283,7 +19283,7 @@
"code": 401,
"indent": 0,
"parameters": [
"\\n<Bar Regular C>\"Okay, while I'm getting the game ready, you can take off\nthat vibrator. Wipe off your pussy juice and give it back to\n your master.\""
"\\n<Bar Regular C>\"Okay, while I'm getting the game ready, you can take off\nthat vibrator. Wipe off your pussy juice and give it back to\n the bar owner.\""
]
},
{

2
www/data/Map261.json
View file

@ -21096,7 +21096,7 @@
"code": 401,
"indent": 0,
"parameters": [
"\\n<Student Released From Hypnosis B>\"And you even went out of your way to wear an armband that\nsays 'Sex Relief Committee'♡ What, did you actually want to\nbe on the Sex Relief Committee instead of the disciplinary\none?♡\""
"\\n<Student Released From Hypnosis B>\"And you even went out of your way to wear an armband that\nsays 'Sex Relief Committee'♡ What, did you actually want to\nbe on the Sex Relief Committee instead of the Public Morals\none?♡\""
]
},
{

22
www/js/plugins/MW_CallEvaluation.js
View file

@ -324,7 +324,7 @@
break;
case 4200:
nickname = "Zero Sense for Art"
text1 = "Did you see that Disciplinary Awareness poster?"
text1 = "Did you see that Public Morals Awareness poster?"
text2 = "Maybe the Committee has no sense for art..."
NPC="B_"
Emote=2
@ -352,22 +352,22 @@
break;
case 4600:
nickname = "Great Art Sense"
text1 = "Those Disciplinary Awareness posters in the hall, somehow"
text2 = "they're kind of emo, right?"
text1 = "Those Public Morals Awareness posters in the hall,"
text2 = "somehow they're kind of emo, right?"
NPC="B_"
Emote=5
break;
case 4700:
nickname = "Shadow Worker"
text1 = "Since those Disciplinary Awareness posters went up,"
text2 = "there's less trash around school."
text1 = "Since those Public Morals Awareness posters,"
text2 = " went up there's less trash around school."
NPC="B_"
Emote=5
break;
case 4800:
nickname = "Cute Underwear Committee"
text1 = "The model in the lewd Disciplinary Awareness poster,"
text2 = "rumor has it it’s the Committee..."
text1 = "The model in the lewd Public Morals Awareness"
text2 = "poster, rumor has it it’s the Committee..."
NPC="C_"
Emote=1
break;
@ -380,7 +380,7 @@
break;
case 5000:
nickname = "Masochistic Anti-Example"
text1 = "That lewd Disciplinary Awareness poster,"
text1 = "That lewd Public Morals Awareness poster,"
text2 = "I wanna hang one up at home♡"
NPC="C_"
Emote=3
@ -394,15 +394,15 @@
break;
case 5200:
nickname = "Makes Trouble Even When Absent"
text1 = "Since those Disciplinary posters went up,"
text1 = "Since those Public Morals posters went up,"
text2 = "the school’s really lost all order lately♡"
NPC="C_"
Emote=3
break;
case 5300:
nickname = "Everyone's Fap Material Provider"
text1 = "Because of that Disciplinary Awareness poster (lol),"
text2 = "the boys' bathroom reeks of cum lately♡"
text1 = "Because of that Public Morals Awareness poster"
text2 = "(lol),the boys' bathroom reeks of cum lately♡"
NPC="C_"
Emote=3
break;