Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lost Souls Revive #2220

Merged
merged 29 commits into from
Dec 28, 2024
Merged

Lost Souls Revive #2220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
e234ac3
Lost Souls Revive
Bomjojuk Nov 9, 2024
3c06cdd
Locale
Bomjojuk Nov 9, 2024
2d897e2
add markers
Bomjojuk Nov 10, 2024
033c8e8
Conflict fix try
Bomjojuk Nov 10, 2024
e68a662
Fix merge coflict
Bomjojuk Nov 10, 2024
c550299
Checks fix
Bomjojuk Nov 10, 2024
373a692
fix again
Bomjojuk Nov 10, 2024
6283a74
fix
Bomjojuk Nov 10, 2024
0de8664
brainrot yml
Bomjojuk Nov 10, 2024
2dd9e53
And again
Bomjojuk Nov 10, 2024
8ed4629
and again
Bomjojuk Nov 10, 2024
d340e1c
Add audio_log cargo
Bomjojuk Nov 12, 2024
20a5806
Lil fix
Bomjojuk Nov 12, 2024
d2c74b7
Revert "Lil fix"
Bomjojuk Nov 12, 2024
a4c4553
Lil fix 2
Bomjojuk Nov 12, 2024
98de51d
Revert "Lil fix 2"
Bomjojuk Nov 12, 2024
12da9e5
Merge remote-tracking branch 'upstream' into LostSouls
Bomjojuk Dec 24, 2024
d5dcd11
Le finale
Bomjojuk Dec 24, 2024
502b0ca
Revert "Le finale"
Bomjojuk Dec 24, 2024
a57f45b
Le finalniy finale
Bomjojuk Dec 24, 2024
c75fd42
Move to 220
Bomjojuk Dec 26, 2024
89cdf38
Move gamerule to 220
Bomjojuk Dec 26, 2024
1382e04
Update Resources/Locale/ru-RU/ss220/job/job-name.ftl
Bomjojuk Dec 28, 2024
be0f254
Merge branch 'SerbiaStrong-220:master' into LostSouls
Bomjojuk Dec 28, 2024
4a61788
Merge branch 'SerbiaStrong-220:master' into LostSouls
Bomjojuk Dec 28, 2024
5c66dde
This cannot continue
Bomjojuk Dec 28, 2024
b5478fe
Felix Navidad
Bomjojuk Dec 28, 2024
473a036
fix grids
UrPrice Dec 28, 2024
fa55f5a
marks update
UrPrice Dec 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ss220/job/job-name.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
job-name-magistrate = магистрат
job-name-tourist = турист

job-name-cc-default = ЦК
job-name-cc-agent = агент ЦК
Expand Down
Loading
Loading