-
-
Notifications
You must be signed in to change notification settings - Fork 79
Обновление снаряжения ПХ & изменение вооружения #1051
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
Open
MrZero1984
wants to merge
15
commits into
space-sunrise:master
Choose a base branch
from
MrZero1984:Chaos_Update_Mega2000
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
598654f
3
MrZero1984 29a4c32
333
MrZero1984 0a0ec44
рокировка спрайтов
MrZero1984 cf01145
Обнова
MrZero1984 45ed459
Update armor.yml
MrZero1984 0ae16a9
ammo
MrZero1984 060f8fd
Update chaos_uplink_catalog.yml
MrZero1984 1824b44
Update chaos_role.yml
MrZero1984 4c5da2e
фиксы
MrZero1984 959d0be
Update chaos_uplink_catalog.yml
MrZero1984 dc28fb1
Update icon.png
MrZero1984 6de7916
fix
MrZero1984 5e5aa89
Fix1
MrZero1984 960789f
Update
MrZero1984 6d07ee5
fix3
MrZero1984 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
Resources/Locale/en-US/_prototypes/_scp/entities/clothing/belts/belts.ftl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| ent-ClothingBeltChaos = { ent-ClothingBeltStorageBase } | ||
| ent-ClothingBeltChaos = chaos chest rig | ||
| .desc = { ent-ClothingBeltStorageBase.desc } |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/en-US/_prototypes/_scp/entities/clothing/outerclothing/armor.ftl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
Resources/Locale/en-US/_prototypes/_scp/entities/objects/specific/Chaos.ftl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| ent-UplinkChaos = Chaos Insurgency terminal | ||
| .desc = Used by the Chaos Insurgency forces to carry out special operations. | ||
| .suffix = Normal | ||
| ent-LeaderUplinkChaos = { ent-UplinkChaos } | ||
| .desc = { ent-UplinkChaos.desc } | ||
| .suffix = Leader | ||
|
|
||
| ent-ChaosPinpointer = Chaos Insurgency pinpointer | ||
| .desc = A specialized pinpointer purchased on the black market. | ||
| ent-ChaosPinBall = ball | ||
| .desc = A suspiciously green ball, don't you think? | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
Resources/Locale/ru-RU/_prototypes/_scp/entities/clothing/belts/belts.ftl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| ent-ClothingBeltChaos = ремень Повстанца | ||
| ent-ClothingBeltChaos = разгрузка Повстанца | ||
| .desc = Лучше, чем SCP. Почему? Потому что это Хаос. |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/_prototypes/_scp/entities/clothing/outerclothing/armor.ftl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/specific/Chaos.ftl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.