Commit graph

227 commits

Author SHA1 Message Date
3a7e403496 Merge branch 'main' into 'main'
big boy

See merge request dazed-translations/do-disciplinary-committee-members!17
2025-07-20 14:40:27 +00:00
ab0b0dd551 Yasume to Anma 2025-05-18 01:51:30 -05:00
48247c342b Committee Member to Officer (Images) 2025-05-18 01:29:22 -05:00
209753b16e Merge branch 'main' into 'main'
A variety of consistency fixes.

See merge request onms/do-disciplinary-committee-members!8
2025-05-17 06:20:05 -05:00
DogePrime
d7cedefef2 A variety of consistency fixes.
Retranslation of a variety of lines.
Overflow fixes
2025-05-17 06:19:20 -05:00
DogePrime
e50d8fdd7e A variety of consistency fixes.
Retranslation of a variety of lines.
Overflow fixes
2025-05-16 22:04:35 +00:00
DogePrime
b43e9ccf39 Update file CommonEvents.json 2025-05-14 15:01:29 -05:00
DogePrime
a5c3185f30 Update file CommonEvents.json 2025-05-14 14:24:06 +00:00
4ed9d8b38d Merge branch 'main' into 'main'
Variety of fixes on the last update

See merge request onms/do-disciplinary-committee-members!7
2025-05-14 05:05:21 -05:00
DogePrime
7e9764deab some more fixes to the fixes 2025-05-13 19:19:39 +00:00
DogePrime
5e7edf3c3d A variety of fixes on the last update 2025-05-13 18:16:51 +00:00
DogePrime
1d7aa77327 Merge branch 'main' into 'main'
Main

See merge request DogePrime/do-disciplinary-committee-members!11
2025-05-13 16:58:31 +00:00
15917225db image adjustments for consistency, shortened one of the new skill descriptions 2025-05-13 02:52:03 -05:00
78a8751a80 Merge branch 'main' into 'main'
Main

See merge request onms/do-disciplinary-committee-members!6
2025-05-13 02:11:22 -05:00
950553189b Merge branch 'main' into 'main'
reverted all the fuckening just leaving the very small sure edits.

See merge request onms/do-disciplinary-committee-members!5
2025-05-13 01:54:26 -05:00
DogePrime
042eb4baa6 a lot of tweaking, a lot of them. 2025-05-13 06:43:11 +00:00
DogePrime
a9a63367d3 Merge branch 'main' into 'main'
fixed the fuckenig and left some very small edit fixes

See merge request DogePrime/do-disciplinary-committee-members!10
2025-05-13 06:30:23 +00:00
DogePrime
dbfc96840e Merge branch 'main' into 'main'
Main

See merge request DogePrime/do-disciplinary-committee-members!8
2025-05-13 06:26:24 +00:00
Maou
0a840ab735 Merge branch 'main' of https://gitgud.io/Wolf/do-disciplinary-committee-members 2025-05-13 00:36:16 +01:00
Maou
c14c0bdbee the Unfuckening 2025-05-13 00:35:54 +01:00
Wolf
87a8c981d2 Merge branch 'main' into 'main'
disciplinary guidance to student guidance (image)

See merge request Wolf/do-disciplinary-committee-members!13
2025-05-12 23:09:18 +00:00
b6b4b314f4 disciplinary guidance to student guidance (image) 2025-05-12 17:48:54 -05:00
Maou
244a4c1db0 Revert "fixed strangler disciplinary and reversed the skill mistake"
This reverts commit 32c730a743.
2025-05-12 23:38:20 +01:00
Maou
2bb6af82f6 Revert "and th"
This reverts commit 22322a0edd.
2025-05-12 23:26:06 +01:00
Wolf
c947f37513 Merge branch 'main' into 'main'
reverted skills edits (were edited by accident)

See merge request Wolf/do-disciplinary-committee-members!12
2025-05-12 21:55:54 +00:00
Maou
32c730a743 fixed strangler disciplinary and reversed the skill mistake 2025-05-12 22:52:41 +01:00
3027c769d5 reverted skills edits (were edited by accident) 2025-05-12 16:45:19 -05:00
Maou
656e23c74d Merge branch 'main' of https://gitgud.io/Wolf/do-disciplinary-committee-members 2025-05-12 22:42:02 +01:00
Maou
c399996073 emergency push 2025-05-12 22:41:56 +01:00
Wolf
8b12bed403 Merge branch 'main' into 'main'
Main

See merge request Wolf/do-disciplinary-committee-members!11
2025-05-12 21:10:24 +00:00
2dfd2c62c4 Title Logo image translations (iltrof) 2025-05-12 15:35:53 -05:00
Maou
7c4ffdb304 polished images 2025-05-12 20:52:00 +01:00
DogePrime
4479f5986b Merge branch 'main' into 'main'
forgot to polish these earlier (HUD images)

See merge request DogePrime/do-disciplinary-committee-members!6
2025-05-12 18:18:27 +00:00
7f631c6014 forgot to polish these earlier (HUD images) 2025-05-12 12:22:23 -05:00
Maou
d8235d94d8 Merge branch 'main' of https://gitgud.io/Wolf/do-disciplinary-committee-members 2025-05-12 17:46:53 +01:00
Maou
22322a0edd and th 2025-05-12 17:42:52 +01:00
DogePrime
0d526b1cc0 Merge branch 'main' into 'main'
what do succubi dream of?

See merge request DogePrime/do-disciplinary-committee-members!4
2025-05-12 16:24:34 +00:00
Wolf
a19134a82d Merge branch 'main' into 'main'
Main

See merge request Wolf/do-disciplinary-committee-members!10
2025-05-12 15:52:03 +00:00
8a746f37b8 disciplinary to public morals committee (image edits) 2025-05-12 10:46:03 -05:00
06d9b054fa Merge branch 'main' into 'main'
what do succubi dream of?

See merge request onms/do-disciplinary-committee-members!3
2025-05-12 08:50:01 -05:00
Maou
295faa91cf reeeee 2025-05-12 13:34:52 +01:00
Maou
b82adf34e7 get ur fixes 2025-05-12 13:18:34 +01:00
Maou
a90f39d8b7 fiii 2025-05-12 12:09:51 +01:00
Maou
c3fbf4d73c fixing 2025-05-12 09:11:45 +01:00
Maou
48cce3ae5a bug report fixes 2025-05-12 08:32:40 +01:00
Maou
ca495e953d red light 2025-05-12 01:56:48 +01:00
Wolf
1faa9a755f Merge branch 'main' into 'main'
Overflow, name consistency and some text formatting fixes

See merge request Wolf/do-disciplinary-committee-members!9
2025-05-12 00:01:37 +00:00
DogePrime
98f00b7158 Some name consistency fixes 2025-05-11 22:29:22 +00:00
DogePrime
edfd5d7cb4 Overflow fixes, Shrine shrin text formatting, some phrasing 2025-05-11 20:00:44 +00:00
Wolf
ce85f692ab Merge branch 'main' into 'main'
Change to Public Morals

See merge request Wolf/do-disciplinary-committee-members!8
2025-05-11 16:01:42 +00:00