-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это комментарии - они не будут видны в PR. --> ## Описание PR <!-- Ниже опишите ваш Pull Request. Что он изменяет? На что еще это может повлиять? Постарайтесь описать все внесённые вами изменения! --> нёрф щитов, борг сб **Проверки** <!-- Выполнение всех следующих действий, если это приемлемо для вида изменений сильно ускорит разбор вашего PR --> - [X] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [X] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [X] Я запускал локальный сервер со своими изменениями и всё протестировал. - [X] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. **Изменения** <!-- Здесь вы можете написать список изменений, который будет автоматически добавлен в игру, когда ваш PR будет принят. В журнал изменений следует помещать только то, что действительно важно игрокам. В списке изменений тип значка не является часть предложения, поэтому явно указывайте - Добавлен, Удалён, Изменён. плохо: - add: Новый инструмент для инженеров хорошо: - add: Добавлен новый инструмент для инженеров Вы можете указать своё имя после символа 🆑 именно оно будет отображаться в журнале изменений (иначе будет использоваться ваше имя на GitHub) Например: 🆑 Ian --> 🆑 - add: НТ ввели новый стандарт боргов - борг-офицер! - remove: НТ перестали производить противопульные щиты! - tweak: Лучшие умы галактики придумали как уменьшить время отклика камер! - add: Отдел охранных исследований НТ произвёл первую партию бодикамер! --------- Co-authored-by: 1Stepka1 <[email protected]>
- Loading branch information
Showing
80 changed files
with
859 additions
and
53 deletions.
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 |
---|---|---|
@@ -0,0 +1,9 @@ | ||
namespace Content.Shared.ADT.NeedTagToUse | ||
{ | ||
[RegisterComponent] | ||
public sealed partial class NeedTagToUseComponent : Component | ||
{ | ||
[DataField] | ||
public string Tag = "ADTBorgUse"; | ||
} | ||
} |
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,36 @@ | ||
using Content.Shared.Interaction.Components; | ||
using Content.Shared.Interaction.Events; | ||
using Content.Shared.Item; | ||
using Content.Shared.Tag; | ||
|
||
namespace Content.Shared.ADT.NeedTagToUse | ||
{ | ||
public sealed class NeedTagToUseSystem : EntitySystem | ||
{ | ||
[Dependency] private readonly TagSystem _tagSystem = default!; | ||
|
||
public override void Initialize() | ||
{ | ||
base.Initialize(); | ||
SubscribeLocalEvent<NeedTagToUseComponent, InteractionAttemptEvent>(OnInteractionAttempt); | ||
SubscribeLocalEvent<NeedTagToUseComponent, PickupAttemptEvent>(OnAttempt); | ||
} | ||
|
||
private void OnInteractionAttempt(EntityUid uid, NeedTagToUseComponent component, InteractionAttemptEvent args) | ||
{ | ||
if (args.Target != null && !HasComp<UnremoveableComponent>(args.Target)) | ||
args.Cancelled = true; | ||
|
||
if (HasComp<ItemComponent>(args.Target) && !HasComp<UnremoveableComponent>(args.Target)) | ||
{ | ||
if (!_tagSystem.HasAnyTag(args.Target.Value, component.Tag)) | ||
args.Cancelled = true; | ||
} | ||
} | ||
private void OnAttempt(EntityUid uid, NeedTagToUseComponent component, PickupAttemptEvent args) | ||
{ | ||
if (!_tagSystem.HasAnyTag(args.Item, component.Tag)) | ||
args.Cancel(); | ||
} | ||
} | ||
} |
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 |
---|---|---|
@@ -0,0 +1,8 @@ | ||
|
||
- files: | ||
- borgwalk1.ogg | ||
- borgwalk2.ogg | ||
- borgwalk3.ogg | ||
license: "CC-BY-SA-4.0" | ||
copyright: "Recorded and modified by https://github.com/MilenVolf" | ||
source: "https://git.arumoon.ru/Workbench-Team/space-station-14/-/merge_requests/123" |
Binary file not shown.
Binary file not shown.
Binary file not shown.
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/ADT/Objects/Specific/Robotics/borg_modules.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-ADTBorgModuleDetention = модуль задержания | ||
.desc = сожержит вспышку, кабельные стяжки и телескопическую дубинку. | ||
ent-ADTBorgModuleHarm = модуль вреда | ||
.desc = сожержит самозарядную лазерную винтовку и дубину для нанесения тяжких телесных повреждений. | ||
ent-ADTBorgModuleDisabler = модуль дизаблера | ||
.desc = сожержит дизаблер и кабельные стяжки. |
6 changes: 6 additions & 0 deletions
6
Resources/Locale/ru-RU/ADT/Objects/Specific/Robotics/borg_parts.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-ADTLeftArmBorgSecurity = левая рука киборга-офицера | ||
ent-ADTRightArmBorgSecurity = правая рука киборга-офицера | ||
ent-ADTLeftLegBorgSecurity = левая нога киборга-офицера | ||
ent-ADTRightLegBorgSecurity = правая нога киборга-офицера | ||
ent-ADTHeadBorgSecurity = голова киборга-офицера | ||
ent-ADTTorsoBorgSecurity = туловище киборга-офицера |
5 changes: 4 additions & 1 deletion
5
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/specific.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 |
---|---|---|
@@ -1,2 +1,5 @@ | ||
ent-ADTClothingNeckSecBadge = жетон Службы Безопасности | ||
.desc = Позолоченный жетон с символикой Службы Безопасности и индивидуальным номером сотрудника. Предмет особой гордости среди офицеров. | ||
.desc = Позолоченный жетон с символикой Службы Безопасности и индивидуальным номером сотрудника. Предмет особой гордости среди офицеров. | ||
ent-ADTClothingNeckBodyCamera = бодикамера | ||
.desc = Носимая камера для обеспечения подотчетности и ответственности. |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Cyborgs/borg.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,2 @@ | ||
ent-ADTBorgChassisSec = киборг-офицер | ||
.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
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/security.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,2 @@ | ||
ent-ADTBorgflash = вспышка | ||
.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
28 changes: 28 additions & 0 deletions
28
Resources/Prototypes/ADT/Entities/Clothing/Neck/bodycamera.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,28 @@ | ||
- type: entity | ||
parent: Clothing | ||
id: ADTClothingNeckBodyCamera | ||
name: bodycamera | ||
description: Wearable camera to ensure accountability and responsibility. | ||
components: | ||
- type: Item | ||
size: Small | ||
- type: Sprite | ||
state: icon | ||
sprite: ADT/Clothing/Neck/bodycam.rsi | ||
- type: Clothing | ||
sprite: ADT/Clothing/Neck/bodycam.rsi | ||
quickEquip: true | ||
slots: | ||
- neck | ||
- type: DeviceNetwork | ||
deviceNetId: Wireless | ||
receiveFrequencyId: SurveillanceCameraSecurity | ||
transmitFrequencyId: SurveillanceCamera | ||
- type: SurveillanceCamera | ||
networkSet: true | ||
nameSet: true | ||
- type: ActiveListener | ||
range: 3 | ||
- type: Eye | ||
- type: WirelessNetworkConnection | ||
range: 100 |
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.