forked from space-wizards/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 154
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
Death Squad Update #1887
Merged
Merged
Death Squad Update #1887
Changes from all commits
Commits
Show all changes
55 commits
Select commit
Hold shift + click to select a range
96b48dc
hardsuit
EstKemran 0641beb
chainsword
EstKemran 33c93b9
pulserufle
EstKemran bc5f9c8
holyshit
EstKemran c43f7c8
omni-hud
EstKemran 6c848e2
magboots
EstKemran 619665c
sp-91
EstKemran 45b812e
buff-pulserifles
EstKemran faa91ff
gloves-dq
EstKemran 6fa4e42
turrets
EstKemran 0bac968
Merge remote-tracking branch 'upstream/master' into death-squad
EstKemran 4bd5d61
deathsquad-humanoid
EstKemran d2b91a5
id&pda&jobs
EstKemran f60a060
Merge branch 'master' into death-squad
EstKemran 918e466
Merge branch 'master' into death-squad
EstKemran 13f7147
Merge remote-tracking branch 'upstream/master' into death-squad
EstKemran f61af5c
Merge branch 'master' into death-squad
EstKemran 9272a2e
shotgun
EstKemran e9814b2
Merge branch 'death-squad' of https://github.com/EstKemran/space-stat…
EstKemran 19a3741
fix-shotgun
EstKemran c9d74e7
localization
EstKemran 1da86a7
fix
EstKemran a7f2ba3
fix
EstKemran 5c18e25
fix
EstKemran 7fc166f
fix
EstKemran 9410f8a
fix
EstKemran daf88f3
fix
EstKemran 3fe67d1
fix
EstKemran bfce926
fix
EstKemran 1911c35
fix
EstKemran eb9a64c
fix
EstKemran 31342de
fix
EstKemran 2e74cec
fiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii…
EstKemran 954e3e9
Update Resources/Locale/ru-RU/ss220/clothing/Hands/gloves.ftl
EstKemran 5a7d65d
Update Resources/Locale/ru-RU/ss220/clothing/Shoes/boots.ftl
EstKemran 5c265d5
Update Resources/Locale/ru-RU/ss220/job/job-name.ftl
EstKemran 21c348e
Update Resources/Locale/ru-RU/ss220/prototypes/entities/objects/speci…
EstKemran 2771cc0
Update Resources/Prototypes/SS220/Entities/Objects/Misc/identificatio…
EstKemran 9c27d9e
Update Resources/Prototypes/SS220/StatusIcons/centcom.yml
EstKemran fac9c42
Update Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapo…
EstKemran 0e7b671
Update Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapo…
EstKemran 5521883
Update Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Batte…
EstKemran 035b370
Update Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/har…
EstKemran 61333d7
Update Resources/Prototypes/SS220/Entities/Objects/Specific/Medical/h…
EstKemran 545eaeb
Update Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/SMGs/…
EstKemran 848a8ff
Update Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Batte…
EstKemran df31bd0
Update Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/har…
EstKemran 0a5f18e
Update Resources/Prototypes/SS220/Entities/Objects/Devices/pda.yml
EstKemran 77d4a71
reviev-update
EstKemran 42d8d17
Merge branch 'death-squad' of https://github.com/EstKemran/space-stat…
EstKemran 4c6f655
Merge remote-tracking branch 'upstream/master' into death-squad
EstKemran 7cb7720
fix
EstKemran f0e5d6b
fix
EstKemran f8a2697
update
EstKemran 0611651
fix
EstKemran 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 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 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,3 +1,3 @@ | ||
ent-ClothingEyesHudOmniversal = омни визор | ||
.desc = Секретная разработка для очень секретных личностей. | ||
.suffix = Сек-мед-хим | ||
.suffix = Shitspawn, Сек-мед-хим-термал |
This file contains 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 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,6 @@ | ||
ent-ClothingHeadHelmetHardsuitDeathsquadCommander = шлем командира Эскадрона Смерти | ||
.suffix = Эскадрон Смерти, dq | ||
.desc = Шлем от костюм командира Эскадрона Смерти. | ||
ent-ClothingHeadHelmetHardsuitDeathsquadAlpha = шлем специалиста Эскадрона Смерти | ||
.suffix = Эскадрон Смерти, dq | ||
.desc = Шлем от костюм специалиста Эскадрона Смерти. |
6 changes: 6 additions & 0 deletions
6
Resources/Locale/ru-RU/ss220/clothing/OuterClothing/hardsuits.ftl
This file contains 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,6 @@ | ||
ent-ClothingOuterHardsuitDeathsquadCommander = скафандр командира Эскадрона Смерти | ||
.suffix = Эскадрон Смерти, dq | ||
.desc = Высокотехнологичный скафандр, предназначенный для командира отряда. | ||
ent-ClothingOuterHardsuitDeathsquadAlpha = скафандр специалиста Эскадрона Смерти | ||
.suffix = Эскадрон Смерти, dq | ||
.desc = Высокотехнологичный скафандр, предназначенный для специалистов отряда. |
This file contains 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,3 @@ | ||
ent-ClothingShoesBootsMagDQ = магнитные ботинки Эскадрона Смерти | ||
.suffix = Эскадрон Смерти, dq | ||
.desc = Самые современные магнитные ботинки в незабываемых цветах. |
This file contains 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 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
6 changes: 6 additions & 0 deletions
6
Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/backpacks.ftl
This file contains 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,6 @@ | ||
ent-ClothingBackpackDeathSquadOperativeFilled = { ent-ClothingBackpackDeathSquadFilled } | ||
.desc = { ent-ClothingBackpackDeathSquadFilled.desc } | ||
.suffix = Оперативник, Эскадрон Смерти, dq | ||
ent-ClothingBackpackDeathSquadSpecialistFilled = { ent-ClothingBackpackDeathSquadFilled } | ||
.desc = { ent-ClothingBackpackDeathSquadFilled.desc } | ||
.suffix = Специалист, Эскадрон Смерти, dq |
9 changes: 9 additions & 0 deletions
9
Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/player/humanoid.ftl
This file contains 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,9 @@ | ||
ent-MobHumanDeathSquadLeader = командир Эскадрона Смерти | ||
.suffix = Роль ЭС, Эскадрон Смерти, dq | ||
.desc = Командир элитного отряда Эскадрона Смерти. Руководите жизнью тех, кто будет обеспечивать аннигиляцию всех живых существ. | ||
ent-MobHumanDeathSquadHealer = специалист Эскадрона Смерти | ||
.suffix = Роль ЭС, Эскадрон Смерти, dq | ||
.desc = Специалист элитного отряда Эскадрона Смерти. Поддерживайте жизнь тех, кто будет обеспечивать аннигиляцию всех живых существ. | ||
ent-MobHumanDeathSquadOperative = оперативник Эскадрона Смерти | ||
.suffix = Роль ЭС, Эскадрон Смерти, dq | ||
.desc = Оперативник элитного отряда Эскадрона Смерти. Обеспечьте аннигиляцию всех живых существ. |
6 changes: 6 additions & 0 deletions
6
Resources/Locale/ru-RU/ss220/prototypes/entities/objects/devices/pda.ftl
This file contains 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,6 @@ | ||
ent-DeathsquadHealerPDA = { ent-DeathsquadPDA } | ||
.suffix = Специалист эскадрона смерти | ||
.desc = { ent-DeathsquadPDA.desc } | ||
ent-DeathsquadCommanderPDA = { ent-DeathsquadPDA } | ||
.suffix = Командир эскадрона смерти | ||
.desc = { ent-DeathsquadPDA.desc } |
3 changes: 3 additions & 0 deletions
3
Resources/Locale/ru-RU/ss220/prototypes/entities/objects/specific/medical/hypospray.ftl
This file contains 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,3 @@ | ||
ent-EmergencyMedipenDQ = божественный медипен | ||
.suffix = Эскадрон Смерти, dq | ||
.desc = Экстренный медипен, который в кратчайшие сроки ставит на ноги даже при самых тяжелых травмах. Из-за дороговизны производства применяется только элитными отрядами. |
10 changes: 10 additions & 0 deletions
10
Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/battery.ftl
This file contains 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,10 @@ | ||
ent-WeaponPulseRifle2 = пульсовая винтовка | ||
.suffix = Винтовка, Эскадрон Смерти, dq | ||
.desc = Энергетическая винтовка тяжелого типа, способна аннигилировать любые структуры. | ||
ent-WeaponPulseShotgun = пульсовый дробовик | ||
.suffix = Дробовик, Эскадрон Смерти, dq | ||
.desc = Энергетическая дробовик с новейшей технологией лечения. | ||
|
||
firemode-name-kill = режия для убийства | ||
firemode-name-destroy = режим для УНИЧТОЖЕНИЯ | ||
firemode-name-heal = режим для лечения |
3 changes: 3 additions & 0 deletions
3
Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/smg.ftl
This file contains 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,3 @@ | ||
ent-WeaponRifleSP = SP-91-RC | ||
.suffix = Пистолет-пулемёт, Эскадрон Смерти, dq | ||
.desc = Крупный пистолет-пулемет использующий патроны калибра .45 магнум. |
3 changes: 3 additions & 0 deletions
3
Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/gun/turret.ftl
This file contains 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,3 @@ | ||
ent-WeaponTurretDeathSquad = турель | ||
.suffix = Турель, Эскадрон Смерти, dq | ||
.desc = Турель с системой автоматического огня. |
This file contains 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 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 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 +1,3 @@ | ||
reagent-physical-desc-piquant = пряное | ||
|
||
reagent-physical-desc-holymoly = невозможное |
This file contains 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 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 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 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 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 | ||||
---|---|---|---|---|---|---|
|
@@ -90,3 +90,51 @@ | |||||
- id: Soap | ||||||
- id: CrowbarRed | ||||||
- id: AdvMopItem | ||||||
|
||||||
- type: entity | ||||||
parent: ClothingBackpackERTSecurity | ||||||
id: ClothingBackpackDeathSquadOperativeFilled | ||||||
name: death squad backpack | ||||||
description: Holds the kit of CentComm's most feared agents. | ||||||
components: | ||||||
- type: Sprite | ||||||
sprite: Corvax/Back/Backpacks/deathsquad-backpack.rsi | ||||||
- type: Storage | ||||||
grid: | ||||||
- 0,0,8,6 | ||||||
- type: StorageFill | ||||||
contents: | ||||||
- id: WeaponPulseRifle2 | ||||||
- id: WeaponPulsePistol | ||||||
- id: WeaponRevolverMateba | ||||||
- id: SpeedLoaderMagnumAP | ||||||
- id: SpeedLoaderMagnumAP | ||||||
- id: ToolDebug | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
??? |
||||||
- id: WelderExperimental | ||||||
- id: PinpointerNuclear | ||||||
- id: EmergencyMedipenDQ | ||||||
amount: 2 | ||||||
|
||||||
- type: entity | ||||||
parent: ClothingBackpackERTSecurity | ||||||
id: ClothingBackpackDeathSquadSpecialistFilled | ||||||
name: death squad backpack | ||||||
description: Holds the kit of CentComm's most feared agents. | ||||||
components: | ||||||
- type: Sprite | ||||||
sprite: Corvax/Back/Backpacks/deathsquad-backpack.rsi | ||||||
- type: Storage | ||||||
grid: | ||||||
- 0,0,8,6 | ||||||
- type: StorageFill | ||||||
contents: | ||||||
- id: WeaponPulseRifle2 | ||||||
- id: WeaponPulsePistol | ||||||
- id: WeaponRevolverMateba | ||||||
- id: SpeedLoaderMagnumAP | ||||||
- id: SpeedLoaderMagnumAP | ||||||
- id: ToolDebug | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Это как понимать? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||||||
- id: WelderExperimental | ||||||
- id: PinpointerNuclear | ||||||
- id: EmergencyMedipenDQ | ||||||
amount: 6 |
51 changes: 51 additions & 0 deletions
51
Resources/Prototypes/SS220/Catalog/Fills/Lockers/centcom.yml
This file contains 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,51 @@ | ||
- type: entity | ||
id: LockerDeathsquadOperativeFilled | ||
suffix: Filled | ||
parent: LockerDeathsquad | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: FlashlightSeclite | ||
- id: ClothingEyesHudOmniversal | ||
- id: ClothingMaskGasDeathSquad | ||
- id: ClothingHandsGlovesDQ | ||
- id: ClothingShoesBootsMagDQ | ||
- id: ClothingHeadsetAltCentComm | ||
- id: ClothingBackpackDeathSquadOperativeFilled | ||
|
||
- type: entity | ||
id: LockerDeathsquadCommanderFilled | ||
suffix: Filled | ||
parent: LockerDeathsquadCommander | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: FlashlightSeclite | ||
- id: ClothingEyesHudOmniversal | ||
- id: ClothingMaskGasDeathSquad | ||
- id: ClothingHandsGlovesDQ | ||
- id: ClothingShoesBootsMagDQ | ||
- id: ClothingHeadsetAltCentComm | ||
- id: WeaponRifleSP | ||
- id: Chainsword | ||
- id: ClothingOuterHardsuitDeathsquadCommander | ||
- id: ClothingBackpackDeathSquadOperativeFilled | ||
- id: MagazineMagnumSubMachineGunSP-91-RC | ||
amount: 2 | ||
|
||
- type: entity | ||
id: LockerDeathsquadSpecialistFilled | ||
suffix: Filled | ||
parent: LockerDeathsquadSpecialist | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: FlashlightSeclite | ||
- id: ClothingEyesHudOmniversal | ||
- id: ClothingMaskGasDeathSquad | ||
- id: ClothingHandsGlovesDQ | ||
- id: ClothingShoesBootsMagDQ | ||
- id: ClothingHeadsetAltCentComm | ||
- id: WeaponPulseShotgun | ||
- id: ClothingOuterHardsuitDeathsquadAlpha | ||
- id: ClothingBackpackDeathSquadSpecialistFilled |
This file contains 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 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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Перчатки для всех ЭС, не только для специалиста