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

Киборги Службы Безопасности #100

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
ent-StunbatonROW = stun baton+
.desc = A stun baton for incapacitating people with. It is charged by cyborg power.
ent-StunbatonDouble = double-baton
.desc = An advanced stun baton, with which you can very effectively disable people. She is powered by cyborg energy.
ent-FlashBorg = flash
.desc = An ultra bright flashbulb with a trigger, which causes the victim to be dazed and lose their eyesight for a moment. It has a burnout auto-stop system.
ent-WeaponDisablerROW = disabler-MK3
.desc = A self-defense weapon that exhausts organic targets, weakening them until they collapse. Powered by cyborg power.
ent-WeaponDisablerSMGROW = disabler-SMG+
.desc = An advanced weapon that exhausts organic targets until they fall off their feet. Powered by cyborg energy.

ent-WeaponPistolMk58ROW = mk 59
.desc = A cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. This version automatically synthesizes ammunition using cyborg energy.

ent-HandHeldCriminalRecords = handheld criminal records
.desc = A device for remote access to the station's criminal records.

ent-HandHeldCriminalRecordsBorg = handheld criminal records
.desc = A device for remote access to the station's criminal records.

ent-HoloprojectorSecurityBorg = holobarrier projector
.desc = Creates a solid but fragile holographic barrier. Self-rechargable.
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/borg/borg.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,8 @@ borg-type-service-name = Service
borg-type-service-desc = Help out with a wide range of crew services, ranging from serving snacks and drinks to botany to entertainment.
borg-type-service-transponder = service cyborg

borg-type-security-name = Security
borg-type-security-desc = Assist the Security Department in monitoring compliance with space law and eliminating threats.
borg-type-security-transponder = security cyborg


Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ ent-BaseBorgModuleJanitor = { ent-BaseBorgModule }
.desc = { ent-BaseBorgModule.desc }
ent-BaseBorgModuleMedical = { ent-BaseBorgModule }
.desc = { ent-BaseBorgModule.desc }
ent-BaseBorgModuleSecurity = { ent-BaseBorgModule }
.desc = { ent-BaseBorgModule.desc }
ent-BaseBorgModuleService = { ent-BaseBorgModule }
.desc = { ent-BaseBorgModule.desc }
ent-BaseBorgModuleSyndicate = { ent-BaseBorgModule }
Expand Down Expand Up @@ -68,6 +70,14 @@ ent-BorgModuleHarvesting = harvesting cyborg module
.desc = { ent-BaseBorgModuleService.desc }
ent-BorgModuleClowning = clowning cyborg module
.desc = { ent-BaseBorgModuleService.desc }
ent-BorgModuleNeutralization = neutralization cyborg module
.desc = { ent-BaseBorgModuleSecurity.desc }
ent-BorgModuleNeutralizationAdvanced = advanced neutralization cyborg module
.desc = { ent-BaseBorgModuleSecurity.desc }
ent-BorgModuleCombat = protective cyborg module
.desc = { ent-BaseBorgModuleSecurity.desc }
ent-BorgModuleSecurityControlling = controlling cyborg module
.desc = { ent-BaseBorgModuleSecurity.desc }
ent-BorgModuleSyndicateWeapon = weapon cyborg module
.desc = { ent-BaseBorgModule.desc }
ent-BorgModuleOperative = operative cyborg module
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
ent-StunbatonROW = дубинка-шокер+
.desc = Электрошоковая дубинка для обездвиживания людей. Заряжается от питания киборга.
ent-StunbatonDouble = двойная дубинка-шокер
.desc = Продвинутая электрошоковая дубинка, с помощью которой можно очень эффектно выводить людей из строя. Она питается от энергии киборга.
ent-FlashBorg = вспышка
.desc = Сверхъяркая лампочка с кнопкой включения, вызывает оцепенение и кратковременную потерю зрения. Имеет систему авто-починки от перегорания.
ent-WeaponDisablerROW = станнер-MK3
.desc = Оружие для самозащиты, которое изнуряет органические цели, пока они не свалятся с ног. Работает от питания киборга.
ent-WeaponDisablerSMGROW = станнер-пулемёт+
.desc = Усовершенствованное оружие, которое изнуряет органические цели, пока они не свалятся с ног. Питается от энергии киборга.

ent-WeaponPistolMk58ROW = МК 59
.desc = Дешёвый и распространённый пистолет, производимый дочерней компанией Nanotrasen. Эта версия автоматически синтезирует боеприпасы, используя энергию киборга.

ent-HandHeldCriminalRecords = пульт криминальных записей
.desc = Устройство для дистанционного доступа к криминальным записям станции.

ent-HandHeldCriminalRecordsBorg = пульт криминальных записей
.desc = Устройство для дистанционного доступа к криминальным записям станции.

ent-HoloprojectorSecurityBorg = проектор голобарьера
.desc = Создаёт твёрдый но хрупкий барьер. Самоперезарежаемый.
15 changes: 15 additions & 0 deletions Resources/Locale/ru-RU/borg/borg.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -13,34 +13,49 @@ borg-ui-no-brain = Мозг отсутствует
borg-ui-remove-battery = Извлечь
borg-ui-modules-label = Модули:
borg-ui-module-counter = { $actual }/{ $max }

# Transponder
borg-transponder-disabled-popup = Мозг вылетает из верхушки { $name }!
borg-transponder-disabling-popup = Ваш транспондер начинает отсоединять вас от шасси!
borg-transponder-destroying-popup = Система самоуничтожения { $name } начинает пикать!
borg-transponder-emagged-disabled-popup = Огни вашего транспондера погасли!
borg-transponder-emagged-destroyed-popup = Предохранитель вашего транспондера перегорел!

## Borg type selection UI.
borg-select-type-menu-title = Выберите тип шасси
borg-select-type-menu-bottom-text = Выбор шасси является необратимым
borg-select-type-menu-available = Доступные:
borg-select-type-menu-information = Информация
borg-select-type-menu-select-type = Выберите тип шасси для просмотра информации
borg-select-type-menu-confirm = Подтвердите выбор
borg-select-type-menu-guidebook = Руководство

## Borg type information

borg-type-generic-name = Универсал
borg-type-generic-desc = Может всё, но одинаково не очень хорошо. Выполняйте различные случайные поручения на станции, или, быть может, окажите помощь научному отделу, который вас построил.
borg-type-generic-transponder = обычный киборг

borg-type-engineering-name = Инженер
borg-type-engineering-desc = Помогайте команде инженеров в строительстве станции, ликвидации повреждений или исправлении проблем с электричеством и атмосферой.
borg-type-engineering-transponder = киборг-инженер

borg-type-mining-name = Утилизатор
borg-type-mining-desc = Присоединитесь к утилизаторам и окажите им помощь в добыче ресурсов, исследованию обломков и борьбе с враждебной фауной космоса.
borg-type-mining-transponder = киборг-шахтёр

borg-type-janitor-name = Уборщик
borg-type-janitor-desc = Поддерживайте порядок на станции, убирайте пролитую жидкость, собирайте и правильно утилизируйте мусор, оставленный ленивыми членами экипажа.
borg-type-janitor-transponder = киборг-уборщик

borg-type-medical-name = Медик
borg-type-medical-desc = Оказывайте медицинскую помощь нуждающемуся экипажу в медотсеке или в опасных зонах, куда обычные парамедики не могут добраться.
borg-type-medical-transponder = киборг-доктор

borg-type-service-name = Сервисный
borg-type-service-desc = Помогайте членам экипажа в самых разных ситуациях - от подачи закусок и напитков до занятий ботаникой и развлечений.
borg-type-service-transponder = киборг-официант

borg-type-security-name = Охранный
borg-type-security-desc = Помогайте отделу Службы безопасности в контроле соблюдения космического закона и устранении угроз станции.
borg-type-security-transponder = киборг-службы-безопасности
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ petting-success-salvage-cyborg = Вы гладите { $target } по { POSS-ADJ
petting-success-engineer-cyborg = Вы гладите { $target } по { POSS-ADJ($target) } светоотражающей металлической голове.
petting-success-janitor-cyborg = Вы гладите { $target } по { POSS-ADJ($target) } сырой металлической голове.
petting-success-medical-cyborg = Вы гладите { $target } по { POSS-ADJ($target) } стерильной металлической голове.
petting-success-security-cyborg = Вы гладите { $target } по { POSS-ADJ($target) } бронированной металлической голове.
petting-success-service-cyborg = Вы гладите { $target } по { POSS-ADJ($target) } нарядной металлической голове.
petting-success-syndicate-cyborg = Вы гладите { $target } по { POSS-ADJ($target) } угрожающего вида металлической голове.
petting-failure-honkbot = Вы тянетесь погладить { $target }, но { $target } хонкает и уворачивается!
Expand All @@ -73,6 +74,7 @@ petting-failure-medibot = Вы тянетесь погладить { $target },
petting-failure-firebot = Вы тянетесь погладить { $target }, но { $target } брызгает вам в лицо, прежде чем вы успеваете приблизиться!
petting-failure-generic-cyborg = Вы тянетесь погладить { $target }, но { $target } занимается перечислением законов!
petting-failure-salvage-cyborg = Вы тянетесь погладить { $target }, но { $target } занимается бурением!
petting-failure-security-cyborg = Вы тянетесь погладить { $target }, но { $target } занимается обеспечением безопасности!
petting-failure-engineer-cyborg = Вы тянетесь погладить { $target }, но { $target } занимается починкой!
petting-failure-janitor-cyborg = Вы тянетесь погладить { $target }, но { $target } занимается уборкой!
petting-failure-medical-cyborg = Вы тянетесь погладить { $target }, но { $target } занимается спасением жизней!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ ent-ActionBorgSwapModule = Сменить модуль
.desc = Выбор этого модуля позволит вам использовать предоставляемые им инструменты.
ent-BaseBorgModuleCargo = { ent-BaseBorgModule }
.desc = { ent-BaseBorgModule.desc }
ent-BaseBorgModuleSecurity = { ent-BaseBorgModule }
.desc = { ent-BaseBorgModule.desc }
ent-BaseBorgModuleEngineering = { ent-BaseBorgModule }
.desc = { ent-BaseBorgModule.desc }
ent-BaseBorgModuleJanitor = { ent-BaseBorgModule }
Expand Down Expand Up @@ -68,6 +70,14 @@ ent-BorgModuleHarvesting = урожайный модуль киборга
.desc = { ent-BaseBorgModule.desc }
ent-BorgModuleClowning = клоунский модуль киборга
.desc = { ent-BaseBorgModule.desc }
ent-BorgModuleNeutralization = обезвреживающий модуль киборга
.desc = { ent-BaseBorgModuleSecurity.desc }
ent-BorgModuleNeutralizationAdvanced = продвинутый обезвреживающий модуль киборга
.desc = { ent-BaseBorgModuleSecurity.desc }
ent-BorgModuleCombat = защитный модуль киборга
.desc = { ent-BaseBorgModuleSecurity.desc }
ent-BorgModuleSecurityControlling = контролирующий модуль киборга
.desc = { ent-BaseBorgModuleSecurity.desc }
ent-BorgModuleSyndicateWeapon = кроваво-красный модуль киборга
.desc = { ent-BaseBorgModule.desc }
.suffix = оружейный модуль киборга
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@
prob: 0.5
- id: ClothingOuterCoatHoSGreatcoat # Corvax-Resprite
- id: BookBusido # Corvax-Books
- id: BorgModuleLecter # Corvax Next- Security Borg

# Hardsuit table, used for suit storage as well
- type: entityTable
Expand Down
8 changes: 8 additions & 0 deletions Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,14 @@
- type: BorgSwitchableType
selectedBorgType: mining

- type: entity
id: BorgChassisSec
parent: BorgChassisSelectable
name: киборг-службы безопасности
components:
- type: BorgSwitchableType
selectedBorgType: security

- type: entity
id: BorgChassisEngineer
parent: BorgChassisSelectable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,22 @@
slots:
cell_slot:
name: power-cell-slot-component-slot-name-default

- type: entity
parent: HoloprojectorSecurity
id: HoloprojectorSecurityBorg
name: holobarrier projector
suffix: Borg
categories: [ HideSpawnMenu ]
description: Creates a solid but fragile holographic barrier. Self-rechargable
components:
- type: HolosignProjector
signProto: HolosignSecurity
chargeUse: 240
- type: ItemSlots
slots:
cell_slot:
name: power-cell-slot-component-slot-name-default
startingItem: PowerCellMicroreactor
disableEject: true
swap: false
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,20 @@
- Security
- Antagonists

- type: entity
name: disabler-MK3
parent: WeaponDisabler
id: WeaponDisablerROW
description: A self-defense weapon that exhausts organic targets, weakening them until they collapse.
categories: [ HideSpawnMenu ]
components:
- type: Battery
maxCharge: 500
startingCharge: 500
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 15

- type: entity
name: disabler SMG
parent: [ BaseWeaponBattery, BaseRestrictedContraband ]
Expand Down Expand Up @@ -519,6 +533,31 @@
- type: StaticPrice
price: 260

- type: entity
name: disabler-SMG+
parent: WeaponDisablerSMG
id: WeaponDisablerSMGROW
description: Advanced weapon that exhausts organic targets, weakening them until they collapse.
categories: [ HideSpawnMenu ]
components:
- type: Gun
minAngle: 2
maxAngle: 8
selectedMode: FullAuto
fireRate: 4
availableModes:
- SemiAuto
- FullAuto
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
- type: Battery
maxCharge: 330
startingCharge: 330
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 8


- type: entity
name: taser
parent: [ BaseWeaponBatterySmall, BaseRestrictedContraband ]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,50 @@
- type: Clothing
sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
- type: Gun
minAngle: 2
maxAngle: 10
fireRate: 5
availableModes:
- SemiAuto
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/mk58.ogg

- type: entity
name: mk 59
parent: [ BaseItem, BaseRestrictedContraband ]
id: WeaponPistolMk58ROW
description: A cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. This version automatically synthesizes ammunition using cyborg energy.
components:
- type: Gun
fireRate: 5
selectedMode: SemiAuto
availableModes:
- SemiAuto
- FullAuto
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
- type: Sprite
sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
- type: ProjectileBatteryAmmoProvider
proto: BulletPistol
fireCost: 100
- type: Battery
maxCharge: 1000
startingCharge: 1000
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 25
- type: AmmoCounter


- type: entity
name: N1984
parent: [BaseWeaponPistol, BaseRestrictedContraband]
Expand Down
33 changes: 33 additions & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,19 @@
- Security
- Antagonists

- type: entity
name: stun baton+
parent: Stunbaton
id: StunbatonROW
description: A stun baton for incapacitating people with. It is charged by cyborg power
categories: [ HideSpawnMenu ]
components:
- type: Stunbaton
energyPerUse: 200
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 5

- type: entity
name: truncheon
parent: [BaseItem, BaseRestrictedContraband]
Expand Down Expand Up @@ -172,6 +185,26 @@
- Security
- Antagonists

- type: entity
name: flash
categories: [ HideSpawnMenu ]
parent: [BaseItem, Flash]
id: FlashBorg
suffix: Borg
description: An ultra bright flashbulb with a trigger, which causes the victim to be dazed and lose their eyesight for a moment. It has a burnout auto-stop system
components:
- type: AutoRecharge
- type: GenericVisualizer
visuals:
enum.FlashVisuals.Burnt:
enum.FlashVisuals.BaseLayer:
False: {state: burnt}
enum.FlashVisuals.Flashing:
enum.FlashVisuals.LightLayer:
True: {visible: true}
False: {visible: false}


- type: entity
name: flash
parent: Flash
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -759,6 +759,7 @@
- WeaponFlareGunSecurity
- WeaponLaserCarbinePractice
- Zipties
- BorgModuleNeutralization # _CorvaxNext: Security Borg
dynamicRecipes:
- BoxBeanbag
- BoxShotgunIncendiary
Expand Down Expand Up @@ -812,6 +813,9 @@
- WeaponXrayCannon
- SecurityCyberneticEyes # _CorvaxNext: surgery Change
- MedicalCyberneticEyes # _CorvaxNext: surgery Change
- BorgModuleCombat # _CorvaxNext: Security Borg
- BorgModuleSecurityControlling # _CorvaxNext: Security Borg
- BorgModuleNeutralizationAdvanced # _CorvaxNext: Security Borg
- type: MaterialStorage
whitelist:
tags:
Expand Down
Loading
Loading