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

Ice box prt.2 #350

Merged
merged 7 commits into from
Dec 21, 2024
Merged

Ice box prt.2 #350

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eed0304
IceBoxUpdate
Flybik Dec 16, 2024
94ce313
AddTests
Flybik Dec 16, 2024
6bcb296
gameMap label fix
Flybik Dec 16, 2024
f7a8a42
Merge branch 'master' into IceBox
Flybik Dec 16, 2024
e195c9a
Merge branch 'Lost-Paradise-Project:master' into IceBox
Flybik Dec 21, 2024
6189e51
PoolAdd
Flybik Dec 21, 2024
4400aa4
FixRolesIceBox
Flybik Dec 21, 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: 0 additions & 1 deletion Resources/Migrations/LostParadiseMigrations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,3 @@ LPPCandy3: LPPCandy
LPPCandy4: LPPCandy
HalloweenTree01: LPPHalloweenTree01
HalloweenTree02: LPPHalloweenTree02
ComputerCriminalRecords: ComputerMedicalRecords
1 change: 1 addition & 0 deletions Resources/Prototypes/_LostParadise/Maps/Pools/LostParadiseMapPool.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
- LPPPebble
- LPPNormandy
- LPPKerberos
- LPPIceBox
2 changes: 1 addition & 1 deletion Resources/Prototypes/_LostParadise/Maps/icebox.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
id: LPPIceBox
mapName: 'NTS АйсБокс'
Copy link
Contributor

@coderabbitai coderabbitai bot Dec 21, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Требуется исправление: Русский текст в прототипе

Согласно правилам кодирования, в прототипах запрещены переводы на русский язык. Необходимо использовать английский текст.

Предлагаемое исправление:

- mapName: 'NTS АйсБокс'
+ mapName: 'NTS Ice Box'
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
mapName: 'NTS АйсБокс'
mapName: 'NTS Ice Box'

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Я уже говорил ранее что так и задумано в наших прототипах

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Flybik Понял, уважаю ваше решение. Если вы считаете, что русский текст в прототипе должен оставаться, то оставим всё, как есть.

┌( ˘ ⌣˘)ʃжения
└( ˘̩̩̩⌣˘̩̩̩)┘

mapPath: /Maps/_LostParadise/LPPIceBox.yml
minPlayers: 20
minPlayers: 15
stations:
IceBoxstation:
stationProto: StandardNanotrasenStation
Expand Down
Loading