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.

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

Translate modular compuhter #82

Closed
wants to merge 57 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
13d524e
[NON-MODULAR] Allow cyrillic support for one proc (#56)
larentoun Apr 13, 2024
5a3ef1b
populates dynamic with more antags, disables pirates (#69)
larentoun Apr 14, 2024
0badd5a
Reduce rp speed (#71)
larentoun Apr 14, 2024
344b117
cyrillic is not bad text (#74)
larentoun Apr 15, 2024
7dc8ec4
Fix: translate branch update from master (#77)
Furrior Apr 15, 2024
b1d441b
Ya protbal tab (#78)
Furrior Apr 15, 2024
40d0fd8
Feat: para issue templates (#79)
Furrior Apr 15, 2024
f31e2c3
Fix: git creds in action (#81)
Furrior Apr 15, 2024
569cb5c
Merge remote-tracking branch 'upstream/master' into Translate-MPC
Kar4es Apr 15, 2024
b455807
по идее должно получится
Kar4es Apr 15, 2024
45ab167
[ci skip] Fix: another missed arg in translate action (#83)
Furrior Apr 15, 2024
2ff10a2
Merge remote-tracking branch 'origin/master' into HEAD
actions-user Apr 15, 2024
192c13b
NewTranslate (#57)
AloeNeverDie Apr 15, 2024
a36584d
Translation of anomaly events (#93)
HardexZ Apr 17, 2024
90eafa6
Bitrunner translation (#90)
larentoun Apr 17, 2024
bd266f6
SpyFix (#99)
AloeNeverDie Apr 17, 2024
1b4094b
AI module translate (#95)
HardexZ Apr 17, 2024
206692a
Bandastation db (#94)
larentoun Apr 17, 2024
f120af9
Merge remote-tracking branch 'origin/master' into HEAD
actions-user Apr 17, 2024
73a3379
Перевод всяких штук у тритора (#68)
Ingakem Apr 17, 2024
0779958
Game Prefs Translation (#87)
larentoun Apr 17, 2024
baca9a2
Combat information translation (#91)
larentoun Apr 17, 2024
22be466
fix whitelist (#102)
larentoun Apr 17, 2024
582e237
Merge remote-tracking branch 'origin/master' into HEAD
actions-user Apr 17, 2024
ac6ae14
Nanomaps renderer? (#115)
larentoun Apr 18, 2024
14055f5
Merge remote-tracking branch 'origin/master' into HEAD
actions-user Apr 18, 2024
b750ddf
Keep only nanomap renderer workflow (#116)
larentoun Apr 18, 2024
887e02c
Merge remote-tracking branch 'origin/master' into HEAD
actions-user Apr 18, 2024
7d3030f
use correct path for nanomap renderer (#117)
larentoun Apr 18, 2024
52c2782
Merge remote-tracking branch 'origin/master' into HEAD
actions-user Apr 18, 2024
a1a07f1
Translate want ci too (#120)
Furrior Apr 18, 2024
cac0d05
Merge remote-tracking branch 'origin/master' into HEAD
actions-user Apr 18, 2024
7bad57e
Upgrade TTS Seed Explorer (#119)
AyIong Apr 18, 2024
76c06cd
Merge remote-tracking branch 'origin/master' into HEAD
actions-user Apr 18, 2024
4a56f81
softcrit-translate (#121)
larentoun Apr 18, 2024
6352e68
Removes "+" from messages (#114)
larentoun Apr 18, 2024
76375be
tts radio sound mixer (#113)
larentoun Apr 18, 2024
e9cbec7
Revert screentips-context (#103)
larentoun Apr 18, 2024
a94bed3
Fix tts radio (#104)
larentoun Apr 18, 2024
b496da1
Merge remote-tracking branch 'origin/master' into HEAD
actions-user Apr 18, 2024
6fc067c
Feat: Aesthetics. Part 2 (#76)
AyIong Apr 18, 2024
fcdd000
Fix tts seed dna (#125)
larentoun Apr 18, 2024
5ed15be
Merge remote-tracking branch 'origin/master' into HEAD
actions-user Apr 18, 2024
28f18d4
Merge remote-tracking branch 'origin/master' into HEAD
actions-user Apr 18, 2024
7311be0
fix TTSExplorer select button (#127)
AyIong Apr 18, 2024
b7fd33d
Merge remote-tracking branch 'origin/master' into HEAD
actions-user Apr 18, 2024
2ae2cec
tgsay cyrillic (#126)
larentoun Apr 19, 2024
44efc70
Merge remote-tracking branch 'origin/master' into HEAD
actions-user Apr 19, 2024
a93eefb
pet commands translate (#124)
larentoun Apr 19, 2024
e59aa90
Emote panel translation + emote verbs (#131)
larentoun Apr 19, 2024
7349320
Merge remote-tracking branch 'origin/master' into HEAD
actions-user Apr 19, 2024
62bc042
RnD experiments translation (FARGUS) (#85)
BR54FF Apr 19, 2024
4af1b10
Перевод шпиона (#118)
Ingakem Apr 19, 2024
3536d4c
Better dragon/carp translation (#75)
larentoun Apr 19, 2024
ee6212c
по идее должно получится
Kar4es Apr 15, 2024
af16da3
пиздец
Kar4es Apr 19, 2024
d165456
Merge branch 'Translate-MPC' of https://github.com/Kar4es/Bandastatio…
Kar4es Apr 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
29 changes: 0 additions & 29 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#DOCS
#https://docs.github.com/en/github-ae@latest/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
#
blank_issues_enabled: true
contact_links:
- name: Feature Request
url: https://discord.com/channels/1097181193939730453/1181261198096875670
about: Запросы новых фич следует оставлять на форуме ss13-трекер в дискорде.
- name: Exploit Reports
url: https://github.com/ss220club/Paradise-SS220/security
about: Критические баги, которые могут быть использованы со злыми намерениями, следует оставлять по ссылке.
7 changes: 0 additions & 7 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

89 changes: 89 additions & 0 deletions .github/ISSUE_TEMPLATE/issue_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
#For more details
# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-issue-forms
# https://docs.gitea.com/1.19/usage/issue-pull-request-templates
#Be sure to check the docs
#
#Format
#- type: | markdown | textarea | input | checkboxes |
# id: | just an id, no actual relevance |
# attributes:
# label: | Box title |
# description: | Box small text - Description |
#
name: "Issue Report"
#title: "[Bug]: " | if you want to have a have it automatically say [Bug] when they start the form
description: "Доложите о проблемах или багах, что бы мы могли их исправить."
#labels: "Баг"

body:
- type: markdown
attributes:
value: Спасибо за оставленный отчёт! Не забудьте дать ему соответствующее проблеме название для упрощения работы другим.

- type: input
id: version
attributes:
label: BYOND Version
description: "На какой версии BYOND встретился баг. (Если уверены, что не связано, можно пропустить)"

- type: textarea
id: description
attributes:
label: Описание проблемы
description: В чем состоит суть проблемы? (Обязательное поле)
placeholder: Я сел на стул, от чего взорвался, а мой мозг оказался в душе на ЦК!
validations:
required: true

- type: textarea
id: what-expected
attributes:
label: Что должно было произойти?
description: Почему вы считаете это проблемой?
placeholder: Я ожидал, что я просто сяду на стул и буду сидеть.

- type: textarea
id: what-happened
attributes:
label: Что случилось вместо этого?
description: Как произошедшее отличается от ваших ожиданий?
placeholder: Я умер и оказался на ЦК.

- type: textarea
id: why-bad
attributes:
label: Почему это плохо/Какие последствия?
description: Почему вы считаете эту проблему значительной?
placeholder: Игроки должны иметь возможность сидеть на стульях, не взрываясь.

- type: textarea
id: how-to-reproduce
attributes:
label: Шаги для повторения проблемы.
description: Самая важная часть. Опишите ВСЁ, что вы делали, что бы встретиться с проблемой. (Обязательное поле)
placeholder: Нашел стул, сел, взорвался.
validations:
required: true

- type: textarea
id: when-problem-start
attributes:
label: Когда проблема началась?
description: Если отчет связан с тем, что раньше работало иначе, опишите последний раз, когда механика работала корректно. (Обязательное поле)
placeholder: Я мог садиться на стулья без проблем неделю назад, так что примерно тогда.
validations:
required: true

- type: textarea
id: extra-information
attributes:
label: Дополнительная информация
description: Всё, что вы считаете важным/относящимся к проблеме.
placeholder: Я думаю, что проблема начала появляться после этого PR https://github.com/ss220club/Paradise-SS220/pull/583

- type: textarea
id: logs
attributes:
label: Связанные логи
description: Пожалуйста, предоставьте связанные логи или рантаймы, если имеете к ним доступ. (Лучше цензурить IP-адреса)
render: DM
3 changes: 3 additions & 0 deletions .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,19 @@ on:
push:
branches:
- master
- translate
- 'project/**'
- 'gh-readonly-queue/master/**'
- 'gh-readonly-queue/project/**'
pull_request:
branches:
- master
- translate
- 'project/**'
merge_group:
branches:
- master
- translate
jobs:
run_linters:
if: ( !contains(github.event.head_commit.message, '[ci skip]') )
Expand Down
46 changes: 46 additions & 0 deletions .github/workflows/render_nanomaps.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# GitHub action to autorender nanomaps outside the game
# This kills off the awful verb we have that takes a full 50 seconds and hangs the whole server
# The file names and locations are VERY important here
# DO NOT EDIT THIS UNLESS YOU KNOW WHAT YOU ARE DOING
# -aa
name: 'Render Nanomaps'
on:
schedule:
- cron: "0 0 * * *"
workflow_dispatch:

jobs:
generate_maps:
name: 'Generate NanoMaps'
runs-on: ubuntu-22.04
steps:
- id: create_token
uses: actions/create-github-app-token@v1
with:
app-id: ${{ secrets.APP_ID }}
private-key: ${{ secrets.PRIVATE_KEY }}

- run: echo "GH_TOKEN=${{ steps.create_token.outputs.token }}" >> "$GITHUB_ENV"

- name: 'Update Branch'
uses: actions/checkout@v4
with:
token: ${{ steps.create_token.outputs.token }}

- name: Branch
run: |
git branch -f nanomap-render
git checkout nanomap-render
git reset --hard origin/master

- name: 'Generate Maps'
run: './tools/nanomap_renderer/nanomap-renderer-invoker.sh'

- name: 'Commit Maps and open PR'
run: |
git config --local user.email "action@github.com"
git config --local user.name "NanoMap Generation"
git pull origin master
git commit -m "NanoMap Auto-Update (`date`)" -a || true
git push -f -u origin nanomap-render
gh pr create -t "Automatic NanoMap Update" -b "This pull request updates the server NanoMaps. Please review the diff images before merging." -l "NanoMaps" -H "nanomap-render" -B "master"
12 changes: 11 additions & 1 deletion .github/workflows/translate_branch_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,15 @@ jobs:
with:
fetch-depth: 0

- name: 'Git config'
run: |
git config --local user.email "action@github.com"
git config --local user.name "SS220Manager"

- name: Merge with their incoming
run: git merge origin/master --strategy-option theirs
run: |
git checkout origin/translate
git merge origin/master --strategy-option theirs
git push origin HEAD:translate


40 changes: 40 additions & 0 deletions SQL/bandastation/bandastation_update.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
--
-- Table structure for table `schema_revision_220`
--
DROP TABLE IF EXISTS `schema_revision_220`;
CREATE TABLE `schema_revision_220` (
`major` TINYINT(3) unsigned NOT NULL,
`minor` TINYINT(3) unsigned NOT NULL,
`date` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`major`, `minor`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;

--
-- Table structure for table `ckey_whitelist`
--
DROP TABLE IF EXISTS `ckey_whitelist`;
CREATE TABLE `ckey_whitelist` (
`id` INT(11) NOT NULL AUTO_INCREMENT,
`date` DATETIME DEFAULT now() NOT NULL,
`ckey` VARCHAR(32) NOT NULL,
`adminwho` VARCHAR(32) NOT NULL,
`port` INT(5) UNSIGNED NOT NULL,
`date_start` DATETIME DEFAULT now() NOT NULL,
`date_end` DATETIME NULL,
`is_valid` BOOLEAN DEFAULT true NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

--
-- Table structure for table `admin_wl`
--
DROP TABLE IF EXISTS `admin_wl`;
CREATE TABLE `admin_wl` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`ckey` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL,
`admin_rank` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Administrator',
`level` int(2) NOT NULL DEFAULT '0',
`flags` int(16) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
KEY `ckey` (`ckey`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
54 changes: 54 additions & 0 deletions SQL/bandastation/database_changelog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
Any time you make a change to the schema files, remember to increment the database schema version. Generally increment the minor number, major should be reserved for significant changes to the schema. Both values go up to 255.

Make sure to also update `DB_MAJOR_VERSION_220` and `DB_MINOR_VERSION_220`, which can be found in `code/modular_bandastation/_defines220/code/defines/subsystems.dm`.

The latest database version is 1.1; The query to update the schema revision table is:

```sql
INSERT INTO `schema_revision_220` (`major`, `minor`) VALUES (1, 1);
```
or

```sql
INSERT INTO `SS13_schema_revision_220` (`major`, `minor`) VALUES (1, 1);
```

-----------------------------------------------------
Version 1.1, 17 April 2024, by larentoun
Created the tables: schema_revision220, ckey_whitelist, admin_wl

```sql
CREATE TABLE `schema_revision220` (
`major` TINYINT(3) unsigned NOT NULL,
`minor` TINYINT(3) unsigned NOT NULL,
`date` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`major`, `minor`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
```

```sql
CREATE TABLE `ckey_whitelist` (
`id` INT(11) NOT NULL AUTO_INCREMENT,
`date` DATETIME DEFAULT now() NOT NULL,
`ckey` VARCHAR(32) NOT NULL,
`adminwho` VARCHAR(32) NOT NULL,
`port` INT(5) UNSIGNED NOT NULL,
`date_start` DATETIME DEFAULT now() NOT NULL,
`date_end` DATETIME NULL,
`is_valid` BOOLEAN DEFAULT true NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
```

```sql
CREATE TABLE `admin_wl` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`ckey` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL,
`admin_rank` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Administrator',
`level` int(2) NOT NULL DEFAULT '0',
`flags` int(16) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
KEY `ckey` (`ckey`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
```
-----------------------------------------------------
6 changes: 3 additions & 3 deletions code/__DEFINES/anomaly.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
///Time in seconds before anomaly is announced
#define ANOMALY_ANNOUNCE_MEDIUM_TIME (2 EVENT_SECONDS)
///Let them know how far away the anomaly is
#define ANOMALY_ANNOUNCE_MEDIUM_TEXT "long range scanners. Expected location:"
#define ANOMALY_ANNOUNCE_MEDIUM_TEXT "сканерах дальнего действия. Предполагаемая локация:"

/**
* Chaotic but not harmful anomalies. Give the station a chance to find it on their own.
Expand All @@ -26,7 +26,7 @@
///Time in seconds before anomaly is announced
#define ANOMALY_ANNOUNCE_HARMFUL_TIME (30 EVENT_SECONDS)
///Let them know how far away the anomaly is
#define ANOMALY_ANNOUNCE_HARMFUL_TEXT "localized scanners. Detected location:"
#define ANOMALY_ANNOUNCE_HARMFUL_TEXT "локальных сканерах. Зафиксированная локация:"

/**
* Anomalies that can fuck you up. Give them a bit of warning.
Expand All @@ -37,4 +37,4 @@
///Time in seconds before anomaly is announced
#define ANOMALY_ANNOUNCE_DANGEROUS_TIME (30 EVENT_SECONDS)
///Let them know how far away the anomaly is
#define ANOMALY_ANNOUNCE_DANGEROUS_TEXT "localized scanners. Detected location:"
#define ANOMALY_ANNOUNCE_DANGEROUS_TEXT "локальных сканерах. Зафиксированная локация:"
12 changes: 6 additions & 6 deletions code/__DEFINES/ghost.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@

//Ghost showing preferences:
/// The main player's ghost will display as a simple white ghost
#define GHOST_ACCS_NONE "Default sprites"
#define GHOST_ACCS_NONE "Стандартные спрайты"
/// The main player's ghost will display as a transparent mob
#define GHOST_ACCS_DIR "Only directional sprites"
#define GHOST_ACCS_DIR "Только направленные спрайты"
/// The main player's ghost will display as a transparent mob with clothing
#define GHOST_ACCS_FULL "Full accessories"
#define GHOST_ACCS_FULL "Полностью с аксессуарами"

/// The default ghost display selection for the main player
#define GHOST_ACCS_DEFAULT_OPTION GHOST_ACCS_FULL

/// The other players ghosts will display as a simple white ghost
#define GHOST_OTHERS_SIMPLE "White ghosts"
#define GHOST_OTHERS_SIMPLE "Белые призраки"
/// The other players ghosts will display as transparent mobs
#define GHOST_OTHERS_DEFAULT_SPRITE "Default sprites"
#define GHOST_OTHERS_DEFAULT_SPRITE "Стандартные спрайты"
/// The other players ghosts will display as transparent mobs with clothing
#define GHOST_OTHERS_THEIR_SETTING "Their sprites"
#define GHOST_OTHERS_THEIR_SETTING "Их спрайты"

/// The default ghost display selection when viewing other players
#define GHOST_OTHERS_DEFAULT_OPTION GHOST_OTHERS_THEIR_SETTING
Expand Down
16 changes: 8 additions & 8 deletions code/__DEFINES/inventory.dm
Original file line number Diff line number Diff line change
Expand Up @@ -227,18 +227,18 @@ GLOBAL_LIST_INIT(chaplain_suit_allowed, list(
))

/// String for items placed into the left pocket.
#define LOCATION_LPOCKET "in your left pocket"
#define LOCATION_LPOCKET "в левом кармане"
/// String for items placed into the right pocket
#define LOCATION_RPOCKET "in your right pocket"
#define LOCATION_RPOCKET "в правом кармане"
/// String for items placed into the backpack.
#define LOCATION_BACKPACK "in your backpack"
#define LOCATION_BACKPACK "в сумке"
/// String for items placed into the hands.
#define LOCATION_HANDS "in your hands"
#define LOCATION_HANDS "в руках"
/// String for items placed in the glove slot.
#define LOCATION_GLOVES "on your hands"
#define LOCATION_GLOVES "на руках"
/// String for items placed in the eye/glasses slot.
#define LOCATION_EYES "covering your eyes"
#define LOCATION_EYES "на глазах"
/// String for items placed on the head/hat slot.
#define LOCATION_HEAD "on your head"
#define LOCATION_HEAD "на голове"
/// String for items placed in the neck slot.
#define LOCATION_NECK "around your neck"
#define LOCATION_NECK "на шее"
Loading