Commit graph

139 commits

Author SHA1 Message Date
DogePrime
b3e3544e59 fixes terms on porters and fixed font consistency issue with the first swimsuit porno 2025-05-09 23:02:27 +00:00
DogePrime
6afdd0f4d8 Merge branch 'main' into 'main'
Here update your branch dont forget to send me your merge once u done editing as well

See merge request DogePrime/do-disciplinary-committee-members!2
2025-05-09 22:59:57 +00:00
Maou
6e82aa84ff forgot one ikichi 2025-05-09 23:18:40 +01:00
Maou
16e32038d0 correcting the igi and igishi to Ikishi Suizou it is the same person 2025-05-09 23:15:19 +01:00
Maou
d88c953fa9 Fixing the misnamed npcs from bug report 2025-05-09 22:37:28 +01:00
Wolf
7ab0b290df Merge branch 'main' into 'main'
Main

See merge request Wolf/do-disciplinary-committee-members!1
2025-05-09 16:24:27 +00:00
DogePrime
b5127f9529 Merge branch 'main' into 'main'
This is a test

See merge request DogePrime/do-disciplinary-committee-members!1
2025-05-09 16:14:31 +00:00
DogePrime
be084563a1 Corridor of Dreams fix 2025-05-09 13:51:21 +00:00
DogePrime
b4de7b5e16 Fixing consistency stuff I missed last time 2025-05-09 13:42:53 +00:00
Maou
93bdfc7688 Fixed some newlines and tested them all ingame 2025-05-09 14:27:44 +01:00
Wolf
971b5380e1 Merge branch do-disciplinary-committee-members:main into main 2025-05-09 11:06:25 +00:00
dbe32c6723 l 2025-05-09 01:21:01 -05:00
Maou
c9a700c32d And done 2025-05-09 06:06:50 +01:00
Maou
b8c18c09e7 Mind your Bees and AAAs 2025-05-09 05:07:07 +01:00
Maou
5909fa531c Merge branch 'main' of https://gitgud.io/Wolf/do-disciplinary-committee-members 2025-05-09 02:49:17 +01:00
Maou
9d8199d038 zzzz 2025-05-09 02:49:12 +01:00
Wolf
0b5ac7145c Merge branch do-disciplinary-committee-members:main into main 2025-05-09 01:48:50 +00:00
4e45414f0b Nuke newlines for those variables 2025-05-08 20:47:15 -05:00
Maou
cda4f852c8 Merge branch 'main' of https://gitgud.io/Wolf/do-disciplinary-committee-members 2025-05-09 02:23:55 +01:00
Maou
b923357422 B> 2025-05-09 02:23:50 +01:00
Wolf
6a64301ec6 Merge branch do-disciplinary-committee-members:main into main 2025-05-09 01:23:25 +00:00
a2e430179b Merge branch 'revert-6530d43e' into 'main'
Update 6 files

See merge request dazed-translations/do-disciplinary-committee-members!10
2025-05-09 01:22:05 +00:00
Wolf
64cfcf5f4d Merge branch do-disciplinary-committee-members:main into main 2025-05-09 01:11:49 +00:00
Maou
3b75c4c401 hal+ 2025-05-09 02:09:58 +01:00
4b453cd95d BRELLAAYYAY 2025-05-08 20:07:46 -05:00
DogePrime
7aa17e4fbc Another consistency fix 2025-05-09 00:59:15 +00:00
DogePrime
f0e772875e Consistency fix 2025-05-09 00:51:56 +00:00
DogePrime
8ab2fc880b Public Morals 2025-05-09 00:35:55 +00:00
DogePrime
5eebd589db Merge branch do-disciplinary-committee-members:main into revert-6530d43e 2025-05-09 00:27:28 +00:00
Wolf
4859ac038b Merge branch do-disciplinary-committee-members:main into main 2025-05-09 00:20:38 +00:00
Maou
41841bd1fe : / 2025-05-09 01:14:57 +01:00
DogePrime
02cd961002 Revert "Update 6 files"
This reverts commit 6530d43e8b
2025-05-09 00:10:05 +00:00
DogePrime
6530d43e8b Update 6 files
- /www/data/Actors.json
- /www/data/Map118.json
- /www/data/Map353.json
- /www/data/Map120.json
- /www/data/Map164.json
- /www/data/CommonEvents.json
2025-05-09 00:07:51 +00:00
d22cda253c Merge branch 'main' into 'main'
Going for the B, quite many

See merge request dazed-translations/do-disciplinary-committee-members!7
2025-05-08 23:45:37 +00:00
Maou
b06381b964 Mind your Bees 2025-05-09 00:32:22 +01:00
Maou
e998f25a60 Going for the B, quite many 2025-05-09 00:01:39 +01:00
f94f5ee2fc Merge branch 'main' into 'main'
More fixes

See merge request dazed-translations/do-disciplinary-committee-members!5
2025-05-08 22:46:40 +00:00
1034706592 Merge branch 'main' into 'main'
Fixed a piece of dialogue

See merge request dazed-translations/do-disciplinary-committee-members!6
2025-05-08 22:45:23 +00:00
Maou
3f92dc41ed i hope this is working 2025-05-08 23:25:58 +01:00
DogePrime
8d5e976ff9 Fix a piece of dialogue 2025-05-08 22:02:14 +00:00
Maou
82b72035fe Doing work 2025-05-08 22:55:08 +01:00
Maou
72151bf6df More fixes 2025-05-08 22:29:20 +01:00
7d9d146eef Merge branch 'main' into 'main'
Name fix

See merge request dazed-translations/do-disciplinary-committee-members!4
2025-05-08 21:06:47 +00:00
Maou
da30b83322 Commit 2025-05-08 22:02:30 +01:00
f1ef566f81 Merge branch 'main' into 'main'
Consistency Changes

See merge request dazed-translations/do-disciplinary-committee-members!3
2025-05-08 16:01:24 +00:00
DogePrime
bef3d611ea Merge branch do-disciplinary-committee-members:main into main 2025-05-08 16:00:13 +00:00
DogePrime
f7fe5a453e Delete data - Shortcut.lnk 2025-05-08 15:59:40 +00:00
DogePrime
1fc4264d6f Entertainment District -> Red-Light District
Red Light -> Red-Light
City Area -> Downtown
Yumemi -> Dream
2025-05-08 15:41:24 +00:00
475635caf4 Teaching 2025-05-08 10:35:13 -05:00
DogePrime
ce10db4b00 Changed City Area -> Downtown.
City Area is an inconsistency. The entire script uses downtown. City Area was only used twice. Once in map selection and once in RC
2025-05-08 15:18:14 +00:00