diff --git a/Resources/Locale/ru-RU/_wega/interaction/interaction-popup-component.ftl b/Resources/Locale/ru-RU/_wega/interaction/interaction-popup-component.ftl
index 1c900b05fa..0294c98eb4 100644
--- a/Resources/Locale/ru-RU/_wega/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/ru-RU/_wega/interaction/interaction-popup-component.ftl
@@ -3,4 +3,6 @@ petting-success-generic-others = { CAPITALIZE($user) } гладит { $target }
## Petting silicons
petting-success-security-cyborg = Вы гладите { $target } по { POSS-ADJ($target) } длинному стволу.
-petting-failure-security-cyborg = Вы тянетесь погладить { $target }, но { SUBJECT($target) } нагревает свой ствол!
\ No newline at end of file
+petting-failure-security-cyborg = Вы тянетесь погладить { $target }, но { SUBJECT($target) } нагревает свой ствол!
+petting-success-science-cyborg = Вы гладите { $target } по { POSS-ADJ($target) } шарообразной голове.
+petting-failure-science-cyborg = Вы тянетесь погладить { $target }, но { SUBJECT($target) } занимается наукой!
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/borg/borg.ftl b/Resources/Locale/ru-RU/borg/borg.ftl
index 04d81ed272..a21045330b 100644
--- a/Resources/Locale/ru-RU/borg/borg.ftl
+++ b/Resources/Locale/ru-RU/borg/borg.ftl
@@ -29,7 +29,7 @@ borg-select-type-menu-select-type = Выберите тип шасси для п
borg-select-type-menu-confirm = Подтвердите выбор
borg-select-type-menu-guidebook = Руководство
borg-type-generic-name = Универсал
-borg-type-generic-desc = Может всё, но одинаково не очень хорошо. Выполняйте различные случайные поручения на станции, или, быть может, окажите помощь научному отделу, который вас построил.
+borg-type-generic-desc = Может всё, но одинаково не очень хорошо. Выполняйте различные случайные поручения на станции.
borg-type-generic-transponder = обычный киборг
borg-type-engineering-name = Инженер
borg-type-engineering-desc = Помогайте команде инженеров в строительстве станции, ликвидации повреждений или исправлении проблем с электричеством и атмосферой.
@@ -48,4 +48,7 @@ borg-type-service-desc = Помогайте членам экипажа в са
borg-type-service-transponder = киборг-официант
borg-type-security-name = Охранник
borg-type-security-desc = Помогайте службе безопасности в поддержании порядка и расследованиях, покажите им, кто тут настоящая щиткур машина.
-borg-type-security-transponder = киборг-охранник
\ No newline at end of file
+borg-type-security-transponder = киборг-охранник
+borg-type-science-name = Учёный
+borg-type-science-desc = Помогайте научному отделу в новых свершениях и подрывах стратегических точек.
+borg-type-science-transponder = киборг-учёный
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/silicons/borg-module.ftl b/Resources/Locale/ru-RU/silicons/borg-module.ftl
index a4a42f7b57..68129164a0 100644
--- a/Resources/Locale/ru-RU/silicons/borg-module.ftl
+++ b/Resources/Locale/ru-RU/silicons/borg-module.ftl
@@ -2,7 +2,7 @@ borg-module-fit = Этот модуль можно установить в { $ty
borg-type-all = [color=white]любого киборга[/color]
borg-type-salvage = [color= #d6b328]киборга-шахтёра[/color]
borg-type-engineer = [color= #ff9900]киборга-инженера[/color]
-borg-type-generic = [color= #666680]обычного киборга[/color]
+borg-type-generic = [color= #FFADFF]киборга-учёного[/color]
borg-type-janitor = [color= #a747c0]киборга-уборщика[/color]
borg-type-medical = [color= #5995ba]киборга-доктора[/color]
borg-type-service = [color= #508242]киборга-официанта[/color]
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/cyborg/borg_chassis.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/cyborg/borg_chassis.ftl
index 28bbddb5ce..6b08464712 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/cyborg/borg_chassis.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/cyborg/borg_chassis.ftl
@@ -1,8 +1,13 @@
ent-BorgChassisSecurity = киборг-охранник
.desc = { ent-BorgChassisSelectable.desc }
+ent-BorgChassisScience = киборг-учёный
+ .desc = { ent-BorgChassisSelectable.desc }
ent-BorgChassisSecurityPlayer = { ent-BorgChassisSecurity }
.desc = { ent-BorgChassisSelectable.desc }
.suffix = Охранник, Батарея, Все модули, НЕ МАППИТЬ
+ent-BorgChassisSciencePlayer = { ent-BorgChassisScience }
+ .desc = { ent-BorgChassisSelectable.desc }
+ .suffix = Учёный, Батарея, Все модули, НЕ МАППИТЬ
ent-BorgChassisGenericPlayer = { ent-BorgChassisGeneric }
.desc = { ent-BorgChassisSelectable.desc }
.suffix = Общий, Батарея, Все модули, НЕ МАППИТЬ
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/robotics/borg_items.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/robotics/borg_items.ftl
index a56ac241c9..ee805a3972 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/robotics/borg_items.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/robotics/borg_items.ftl
@@ -173,6 +173,18 @@ ent-WeaponProtoKineticAcceleratorBorg = протокинетический ус
ent-MailBagBorg = встроенная сумка для почты
.desc = Сумка шахтерского киборга для почты, хотя внешне оно похоже на обычную сумку, вмещает в себя как целая тележка!
+# НИО, не РНД йоу
+ent-WeaponPistolCHIMPBorg = встроенный излучатель М.А.Р.Т.Ы.Х.
+ .desc = Колапс аномалии ещё более вероятен благодаря этому малышу, имеет свойство самозаряжаться.
+ent-BorgGeneratorCleanSe = генератор инъекторов чистых генов
+ .desc = Теперь укол со всеми генами не так страшен, если киборг на вашей стороне.
+ent-BaseResearchAndDevelopmentPointSourceBorg = генератор ОИ
+ .desc = Устройство, которое способно генерировать ОИ буквально из воздуха, главное переодически его проверять.
+ent-HolofanProjectorBorgSci = встроенный атмос голопроектор
+ .desc = ВНИМАНИЕ, данный проектор испукает более слабые барьеры, время жизни таких барьеров крайне низко!
+ent-HoloFanSci = { ent-HoloFan }
+ .desc = { ent-HoloFan.desc }
+
# Синдикат
ent-SyndicateDrill = бур синдиката
.desc = Ээээ капитан, этот пристройка тут не нужен.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/robotics/borg_modules.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/robotics/borg_modules.ftl
index 407ae833e1..659e6ea777 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/robotics/borg_modules.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/robotics/borg_modules.ftl
@@ -63,6 +63,18 @@ ent-BorgModuleKinetic = кинетический модуль киборга
ent-BorgModuleCargoRare = модуль плазменого резака киборга
.desc = Модуль для добычи руды через забытые технологии плазменных резаков и повышенную перевозку руды.
.suffix = Редкий
+# НИО, не РНД
+ent-BorgModuleAdvancedAnomaly = продвинутый аномальный модуль киборга
+ .desc = Наличие М.А.Р.Т.Ы.Х.'а и перчатки Г.О.Р.И.Л.Л.А. поднимает шансы увольнения отдела на 33%.
+ent-BorgModuleSlime = слаймоводский модуль киборга
+ .desc = Модуль для работы на слаймоферме, продайте как можно больше плортов и...стоп..
+ent-BorgModuleDNA = генетический модуль киборга
+ .desc = Модуль для вкалывания генов и помощи генетикам, вот бы была генетика на бинарном уровне.
+ent-BorgModuleRobotics = модуль конструирования киборгов киборга
+ .desc = Модуль для обслуживания, создания и моральной поддержки киборга от киборга. Правда Вы всё равно нужны будете.
+ent-BorgModuleScienceRND = модуль генерации ОИ
+ .desc = Если за час смены отдел состоит в бедности, данный модуль поможет вам!
+ .suffix = Редкий
# Ксеноборги
ent-BorgModuleXenoConstruction = строительный модуль ксеноборга
.desc = { ent-BaseBorgModule.desc }
@@ -115,4 +127,9 @@ borg-slot-surgery-empty = Хирургические инструменты
borg-slot-dice-figure-empty = Кубики и фигурки
borg-slot-nanopasta-empty = Нанопаста
borg-slot-shield-empty = Щиты
-borg-slot-turelgun-empty = Режимы стрельбы
\ No newline at end of file
+borg-slot-turelgun-empty = Режимы стрельбы
+borg-slot-anomaly-core = Ядра аномалии
+borg-slot-slime-core-empty = Слаймовый экстракт
+borg-slot-dnainjector-empty = Инъектор и диски ДНК
+borg-slot-bodypartborg-empty = Части киборгов
+borg-slot-components-empty = Компоненты для киборгов
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 47993ee1cf..5656b34573 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -1219,6 +1219,7 @@
- XenoArtifact
tags:
- ArtifactFragment
+ - item: HolofanProjectorBorgSci
# Corvax-Wega-Robot-end
- item: SprayBottle
- item: GasAnalyzer
@@ -1232,7 +1233,7 @@
- FitsInDispenser
- item: GeigerCounter
- type: BorgModuleIcon
- icon: { sprite: Interface/Actions/actions_borg.rsi, state: node-scanner-module }
+ icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: node-scanner-module } # Corvax-Wega-add
- type: entity
id: BorgModuleAnomaly
@@ -1262,7 +1263,7 @@
tags:
- ConstructionMaterial
- type: BorgModuleIcon
- icon: { sprite: Interface/Actions/actions_borg.rsi, state: anomaly-module }
+ icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: anomaly-module } # Corvax-Wega-add
# service modules
- type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
index c57e848990..7d23d1397e 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
@@ -32,6 +32,7 @@
- type: Tag
tags:
- ForceableFollow
+ - AnomalyCore # Corvax-Wega-add
- type: AnomalyCore
timeToDecay: 600
startPrice: 10000
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
index 88b7c90794..e176dcce10 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
@@ -29,8 +29,6 @@
- BorgModuleCommonCandy
- BorgModuleCleaningCommon
- BorgModuleMusique
- - BorgModuleAnomaly
- - BorgModuleArtifact
# Corvax-Wega-end
- type: latheRecipePack
@@ -68,6 +66,8 @@
- BorgModuleAdvancedTopical
- BorgModuleAdvancedMining
# Corvax-Wega-Start
+ - BorgModuleAdvancedAnomaly
+ - BorgModuleRobotics
- BorgModuleSurgery
- BorgModuleLethal
- BorgModuleKinetic
diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml
index ae37dd6181..174c8a92d8 100644
--- a/Resources/Prototypes/Research/experimental.yml
+++ b/Resources/Prototypes/Research/experimental.yml
@@ -12,6 +12,7 @@
recipeUnlocks:
- ProximitySensor
- AndroidBodyPart # Corvax-Wega-Android
+ - BorgModuleRobotics # Corvax-Wega-Add
- type: technology
id: BasicAnomalousResearch
@@ -106,6 +107,7 @@
cost: 10000
recipeUnlocks:
- WeaponPistolCHIMP
+ - BorgModuleAdvancedAnomaly # Corvax-Wega-Add
- AnomalySynchronizerCircuitboard
- AnomalyVesselExperimentalCircuitboard
technologyPrerequisites:
diff --git a/Resources/Prototypes/_Wega/Entities/Markers/Spawners/Random/misc.yml b/Resources/Prototypes/_Wega/Entities/Markers/Spawners/Random/misc.yml
index dff8b30e23..a47498720b 100644
--- a/Resources/Prototypes/_Wega/Entities/Markers/Spawners/Random/misc.yml
+++ b/Resources/Prototypes/_Wega/Entities/Markers/Spawners/Random/misc.yml
@@ -17,4 +17,5 @@
- BorgModuleCleanerRare
- BorgModuleMedicalRare
- BorgModuleServiceRare
+ - BorgModuleScienceRND
chance: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/_Wega/Entities/Mobs/Cyborgs/borg_chassis.yml
index 99f7d98ceb..fc86f7998a 100644
--- a/Resources/Prototypes/_Wega/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/_Wega/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -7,6 +7,15 @@
selectedBorgType: security
- type: SurgicalSkill # Corvax-Wega-Surgery
+- type: entity
+ id: BorgChassisScience
+ parent: BorgChassisSelectable
+ name: science cyborg
+ components:
+ - type: BorgSwitchableType
+ selectedBorgType: science
+ - type: SurgicalSkill # Corvax-Wega-Surgery
+
- type: entity
id: BorgChassisSecurityPlayer
parent: BorgChassisSecurity
@@ -26,6 +35,24 @@
- BorgModuleSecRare
- BorgModuleSheild
+- type: entity
+ id: BorgChassisSciencePlayer
+ parent: BorgChassisScience
+ name: science cyborg
+ suffix: Science
+ components:
+ - type: ItemSlots
+ slots:
+ cell_slot:
+ name: power-cell-slot-component-slot-name-default
+ startingItem: PowerCellMicroreactor
+ - type: ContainerFill
+ containers:
+ borg_module:
+ - BorgModuleRobotics
+ - BorgModuleAdvancedAnomaly
+ - BorgModuleScienceRND
+
- type: entity
id: BorgChassisGenericPlayer
parent: BorgChassisGeneric
diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/scienceitem.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/scienceitem.yml
new file mode 100644
index 0000000000..c9e79835c0
--- /dev/null
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/scienceitem.yml
@@ -0,0 +1,98 @@
+- type: entity
+ parent: WeaponPistolCHIMP
+ id: WeaponPistolCHIMPBorg
+ name: integrated C.H.I.M.P.
+ description: An even smaller particle handcannon, designed for cyborg use.
+ components:
+ - type: BatterySelfRecharger
+ autoRechargeRate: 10
+
+- type: entity
+ parent: BaseItem
+ id: BorgGeneratorCleanSe
+ name: injector clean ce generator
+ description: Tastes like cardboard.
+ components:
+ - type: UseDelay
+ delay: 60
+ - type: Sprite
+ sprite: _Wega/Mobs/Species/Android/parts.rsi
+ layers:
+ - state: eye_module
+ - type: Item
+ size: Tiny
+ - type: SpawnItemsOnUse
+ uses: 100000
+ items:
+ - id: DnaInjectorCleanSe
+ sound:
+ path: /Audio/Machines/phasein.ogg
+
+
+
+- type: entity
+ id: BaseResearchAndDevelopmentPointSourceBorg
+ parent: BaseItem
+ name: "base R&D point source"
+ # We should make this abstract once there are actual point sources.
+ components:
+ - type: Sprite
+ sprite: Objects/Specific/Research/anomalyscanner.rsi
+ state: icon
+ - type: ResearchClient
+ - type: ItemToggle
+ - type: ComponentToggler
+ components:
+ - type: ResearchPointSource
+ pointspersecond: 25
+ active: true
+ - type: PowerCellDraw
+ drawRate: 37 # 360 seconds
+ - type: ToggleCellDraw
+ - type: PowerCellSlot
+ cellSlotId: cell_slot
+ - type: ContainerContainer
+ containers:
+ cell_slot: !type:ContainerSlot
+ - type: ItemSlots
+ slots:
+ cell_slot:
+ name: power-cell-slot-component-slot-name-default
+ startingItem: PowerCellSmallNuclear
+ disableEject: true
+ swap: false
+ - type: ActivatableUI
+ key: enum.ResearchClientUiKey.Key
+ - type: UserInterface
+ interfaces:
+ enum.ResearchClientUiKey.Key:
+ type: ResearchClientBoundUserInterface
+
+- type: entity
+ parent: HolofanProjectorBorg
+ id: HolofanProjectorBorgSci
+ components:
+ - type: HolosignProjector
+ signProto: HoloFanSci
+ chargeUse: 120
+ - type: ItemSlots
+ slots:
+ cell_slot:
+ name: power-cell-slot-component-slot-name-default
+ startingItem: PowerCellMicroreactor
+ disableEject: true
+ swap: false
+
+- type: entity
+ id: HoloFanSci
+ parent: HoloFan
+ components:
+ - type: TimedDespawn
+ lifetime: 30
+
+
+
+
+
+
+
diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_modules.yml
index 657cc2d621..f01d7a61bc 100644
--- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -104,6 +104,152 @@
- type: BorgModuleIcon
icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: kinetic-weapon-module }
+
+# Science
+- type: entity
+ id: BorgModuleAdvancedAnomaly
+ parent: [ BaseBorgModuleScience, BaseProviderBorgModule ]
+ name: advanced anomaly cyborg module
+ description: Pee wee has never been so much fun!
+ components:
+ - type: Sprite
+ sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi
+ layers:
+ - state: science
+ - state: icon-anomalies-adv
+ - type: ItemBorgModule
+ hands:
+ - item: AnomalyScanner
+ - item: WeaponPistolCHIMPBorg
+ - item: WeaponGauntletGorilla
+ - hand:
+ emptyRepresentative: AnomalyCoreBluespaceInert
+ emptyLabel: borg-slot-anomaly-core
+ whitelist:
+ tags:
+ - AnomalyCore
+ - type: BorgModuleIcon
+ icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: adv-anomaly-module }
+
+- type: entity
+ id: BorgModuleSlime
+ parent: [ BaseBorgModuleScience, BaseProviderBorgModule ]
+ name: slime cyborg module
+ description: Pee wee has never been so much fun!
+ components:
+ - type: Sprite
+ sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi
+ layers:
+ - state: science
+ - state: icon-slime
+ - type: ItemBorgModule
+ hands:
+ - item: HandheldSlimeAnalyzerUnpowered
+ - hand:
+ emptyRepresentative: MaterialSlimeExtractGray
+ emptyLabel: borg-slot-slime-core-empty
+ whitelist:
+ tags:
+ - SlimeRND
+ - item: BorgFireExtinguisher
+ - item: CombatKnife
+ - hand:
+ emptyRepresentative: BorgIconKitchenIcon
+ emptyLabel: borg-slot-food-empty
+ whitelist:
+ components:
+ - Edible
+ - type: BorgModuleIcon
+ icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: slime-module }
+
+- type: entity
+ id: BorgModuleDNA
+ parent: [ BaseBorgModuleScience, BaseProviderBorgModule ]
+ name: DNA cyborg module
+ description: Pee wee has never been so much fun!
+ components:
+ - type: Sprite
+ sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi
+ layers:
+ - state: science
+ - state: icon-dna
+ - type: ItemBorgModule
+ hands:
+ - hand:
+ emptyRepresentative: DnaInjector
+ emptyLabel: borg-slot-dnainjector-empty
+ whitelist:
+ components:
+ - DnaModifierInjector
+ - DnaModifierDisk
+ - item: BoxDnaFisk
+ - item: Pen
+ - hand:
+ emptyLabel: borg-slot-documents-empty
+ emptyRepresentative: Paper
+ whitelist:
+ tags:
+ - Book
+ - Dice
+ - Document
+ - Figurine
+ - TabletopBoard
+ - Write
+ - item: BorgGeneratorCleanSe
+ - type: BorgModuleIcon
+ icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: genetic-module }
+
+- type: entity
+ id: BorgModuleRobotics
+ parent: [ BaseBorgModuleScience, BaseProviderBorgModule ]
+ name: robotic cyborg module
+ description: Pee wee has never been so much fun!
+ components:
+ - type: Sprite
+ sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi
+ layers:
+ - state: science
+ - state: icon-robotic
+ - type: ItemBorgModule
+ hands:
+ - hand:
+ emptyRepresentative: LightHeadBorg
+ emptyLabel: borg-slot-bodypartborg-empty
+ whitelist:
+ tags:
+ - BorgArm
+ - BorgLeg
+ - BorgHead
+ - BorgTorso
+ - hand:
+ emptyRepresentative: Flash
+ emptyLabel: borg-slot-components-empty
+ whitelist:
+ components:
+ - Flash
+ tags:
+ - CableCoil
+ - hand:
+ emptyRepresentative: MMIFilled
+ emptyLabel: borg-slot-brains-empty
+ whitelist:
+ components:
+ - Brain
+ - BorgBrain
+ - hand:
+ emptyRepresentative: BorgModuleTool
+ emptyLabel: borg-slot-modules-empty
+ whitelist:
+ components:
+ - BorgModule
+ - hand:
+ emptyRepresentative: PowerCellSmall
+ emptyLabel: borg-slot-powercell-empty
+ whitelist:
+ components:
+ - PowerCell
+ - type: BorgModuleIcon
+ icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: robotic-module }
## Basic Module
- type: entity
@@ -987,6 +1133,38 @@
- type: BorgModuleIcon
icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: med-rare }
+- type: entity
+ id: BorgModuleScienceRND
+ parent: [ BaseBorgModuleScience, BaseProviderBorgModule ]
+ name: RND cyborg module
+ components:
+ - type: Item
+ inhandVisuals:
+ left:
+ - state: base-icon-inhand-left
+ color: "#db3e2a"
+ - state: base-module-inhand-left
+ color: "#1e548a"
+ - state: base-part-inhand-left
+ - state: base-stripes-inhand-left
+ color: "#C3C3C3"
+ right:
+ - state: base-icon-inhand-right
+ color: "#db3e2a"
+ - state: base-module-inhand-right
+ color: "#1e548a"
+ - state: base-part-inhand-right
+ - state: base-stripes-inhand-right
+ - type: Sprite
+ sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi
+ layers:
+ - state: command
+ - state: icon-rnd-rare
+ - type: ItemBorgModule
+ hands:
+ - item: BaseResearchAndDevelopmentPointSourceBorg
+ - type: BorgModuleIcon
+ icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: rnd-rare }
## Syndicate
- type: entity
id: BorgModuleChina
diff --git a/Resources/Prototypes/_Wega/Recipes/Lathes/robotics.yml b/Resources/Prototypes/_Wega/Recipes/Lathes/robotics.yml
index bc2301e699..e71210c06d 100644
--- a/Resources/Prototypes/_Wega/Recipes/Lathes/robotics.yml
+++ b/Resources/Prototypes/_Wega/Recipes/Lathes/robotics.yml
@@ -3,6 +3,11 @@
id: BorgModuleSurgery
result: BorgModuleSurgery
+- type: latheRecipe
+ parent: BaseGoldBorgModuleRecipe
+ id: BorgModuleAdvancedAnomaly
+ result: BorgModuleAdvancedAnomaly
+
- type: latheRecipe
parent: BaseGoldBorgModuleRecipe
id: BorgModuleLethal
@@ -23,6 +28,11 @@
id: BorgModuleCommonMedical
result: BorgModuleCommonMedical
+- type: latheRecipe
+ parent: BaseBorgModuleRecipe
+ id: BorgModuleRobotics
+ result: BorgModuleRobotics
+
- type: latheRecipe
parent: BaseBorgModuleRecipe
id: BorgModuleAnomaly
diff --git a/Resources/Prototypes/_Wega/borg_types.yml b/Resources/Prototypes/_Wega/borg_types.yml
index 4251b3715d..8f8af3c7df 100644
--- a/Resources/Prototypes/_Wega/borg_types.yml
+++ b/Resources/Prototypes/_Wega/borg_types.yml
@@ -54,4 +54,48 @@
# Pet
petSuccessString: petting-success-security-cyborg
- petFailureString: petting-failure-security-cyborg
\ No newline at end of file
+ petFailureString: petting-failure-security-cyborg
+
+# science borg
+- type: borgType
+ id: science
+
+ # Description
+ dummyPrototype: BorgChassisScience
+
+ # Functional
+ extraModuleCount: 3
+ moduleWhitelist:
+ tags:
+ - BorgModuleGeneric
+ - BorgModuleScience
+
+ defaultModules:
+ - BorgModuleTool
+ - BorgModuleArtifact
+ - BorgModuleAnomaly
+ - BorgModuleSlime
+ - BorgModuleDNA
+ radioChannels:
+ - Science
+
+ addComponents:
+ - type: SolutionScanner
+
+ # Visual
+ inventoryTemplateId: borgShort
+ spriteBodyState: science
+ spriteHasMindState: science_e
+ spriteNoMindState: science_e_r
+ spriteToggleLightState: science_l
+
+ # Pet
+ petSuccessString: petting-success-science-cyborg
+ petFailureString: petting-failure-science-cyborg
+
+ # Sounds
+ footstepCollection:
+ collection: FootstepHoverBorg
+
+ # tts
+ voicePrototypeId: Glados
\ No newline at end of file
diff --git a/Resources/Prototypes/_Wega/tags.yml b/Resources/Prototypes/_Wega/tags.yml
index bf4948fc38..8996aa8feb 100644
--- a/Resources/Prototypes/_Wega/tags.yml
+++ b/Resources/Prototypes/_Wega/tags.yml
@@ -291,4 +291,7 @@
id: Itemborg
- type: Tag
- id: Nanopast
\ No newline at end of file
+ id: Nanopast
+
+- type: Tag
+ id: AnomalyCore
\ No newline at end of file
diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml
index 323e27263c..0bc27d071b 100644
--- a/Resources/Prototypes/borg_types.yml
+++ b/Resources/Prototypes/borg_types.yml
@@ -10,7 +10,7 @@
moduleWhitelist:
tags:
- BorgModuleGeneric
- - BorgModuleScience #until sciborgs are added
+ # - BorgModuleScience until sciborgs are added
defaultModules:
- BorgModuleTool
diff --git a/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml b/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
index e94c9763a6..ebc84a1ba4 100644
--- a/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
+++ b/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
@@ -30,6 +30,7 @@
+
[italic]Примеры различных шасси киборгов[/italic]
diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json b/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
index 57897ecf23..f4b0a8955f 100644
--- a/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
+++ b/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
@@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/faf6db214927874c19b8fa8585d26b5d40de1acc, derelict generic sprites modified by GoldenCan(GitHub), xenoborg sprites, created and modified by Samuka-C (github), Derelict Engineer, Janitor, Miner, Medical, and Assault Borg sprites by _miket on Discord, minor resprite of the service borg by Kittygyat (github), red cross on Syndi Medical Borg changed to blue to avoid Geneva issues by CDWimmer (GitHub), sec-borg by <@1001081072819388456>(Discord ID).",
+ "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/faf6db214927874c19b8fa8585d26b5d40de1acc, derelict generic sprites modified by GoldenCan(GitHub), xenoborg sprites, created and modified by Samuka-C (github), Derelict Engineer, Janitor, Miner, Medical, and Assault Borg sprites by _miket on Discord, minor resprite of the service borg by Kittygyat (github), red cross on Syndi Medical Borg changed to blue to avoid Geneva issues by CDWimmer (GitHub), sec-borg by <@1001081072819388456>(Discord ID), Science sprite modified by Davyei on Discord.",
"states": [
{
"name": "clown",
@@ -390,6 +390,22 @@
{
"name": "security_l",
"directions": 4
+ },
+ {
+ "name": "science",
+ "directions": 4
+ },
+ {
+ "name": "science_e",
+ "directions": 4
+ },
+ {
+ "name": "science_e_r",
+ "directions": 4
+ },
+ {
+ "name": "science_l",
+ "directions": 4
},
{
"name": "synd_sec",
diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/science.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/science.png
new file mode 100644
index 0000000000..15e3e0a171
Binary files /dev/null and b/Resources/Textures/Mobs/Silicon/chassis.rsi/science.png differ
diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/science_e.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/science_e.png
new file mode 100644
index 0000000000..2838960dfd
Binary files /dev/null and b/Resources/Textures/Mobs/Silicon/chassis.rsi/science_e.png differ
diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/science_e_r.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/science_e_r.png
new file mode 100644
index 0000000000..5b9eff15b6
Binary files /dev/null and b/Resources/Textures/Mobs/Silicon/chassis.rsi/science_e_r.png differ
diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/science_l.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/science_l.png
new file mode 100644
index 0000000000..65ab4409eb
Binary files /dev/null and b/Resources/Textures/Mobs/Silicon/chassis.rsi/science_l.png differ
diff --git a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/adv-anomaly-module.png b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/adv-anomaly-module.png
new file mode 100644
index 0000000000..d65488f1b5
Binary files /dev/null and b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/adv-anomaly-module.png differ
diff --git a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/anomaly-module.png b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/anomaly-module.png
new file mode 100644
index 0000000000..75ff8be1a4
Binary files /dev/null and b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/anomaly-module.png differ
diff --git a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/genetic-module.png b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/genetic-module.png
new file mode 100644
index 0000000000..beee0b4f33
Binary files /dev/null and b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/genetic-module.png differ
diff --git a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/meta.json b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/meta.json
index 913ffbe433..8ff37539d9 100644
--- a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/meta.json
+++ b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
- "copyright": "mody by <@500744677352407051>",
+ "copyright": "mody by <@500744677352407051>, adv-anomaly-module created by Davyei (Discord)",
"size": {
"x": 32,
"y": 32
@@ -100,6 +100,27 @@
{
"name": "repeir-xenoborg-module"
},
+ {
+ "name": "adv-anomaly-module"
+ },
+ {
+ "name": "anomaly-module"
+ },
+ {
+ "name": "node-scanner-module"
+ },
+ {
+ "name": "robotic-module"
+ },
+ {
+ "name": "slime-module"
+ },
+ {
+ "name": "genetic-module"
+ },
+ {
+ "name": "rnd-rare"
+ },
{
"name": "speed_xenoborg"
}
diff --git a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/node-scanner-module.png b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/node-scanner-module.png
new file mode 100644
index 0000000000..cbdfd383b2
Binary files /dev/null and b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/node-scanner-module.png differ
diff --git a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/rnd-rare.png b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/rnd-rare.png
new file mode 100644
index 0000000000..61d19808ad
Binary files /dev/null and b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/rnd-rare.png differ
diff --git a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/robotic-module.png b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/robotic-module.png
new file mode 100644
index 0000000000..d8ef2733d6
Binary files /dev/null and b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/robotic-module.png differ
diff --git a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/slime-module.png b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/slime-module.png
new file mode 100644
index 0000000000..d03abcecfe
Binary files /dev/null and b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/slime-module.png differ
diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-anomalies-adv.png b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-anomalies-adv.png
new file mode 100644
index 0000000000..01df85ca9f
Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-anomalies-adv.png differ
diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-dna.png b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-dna.png
new file mode 100644
index 0000000000..de145b9646
Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-dna.png differ
diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-rnd-rare.png b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-rnd-rare.png
new file mode 100644
index 0000000000..3e21a02364
Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-rnd-rare.png differ
diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-robotic.png b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-robotic.png
new file mode 100644
index 0000000000..1bd7b674c9
Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-robotic.png differ
diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-slime.png b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-slime.png
new file mode 100644
index 0000000000..187f996ba3
Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-slime.png differ
diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/meta.json
index 6e17858cc1..fe237dca99 100644
--- a/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/meta.json
+++ b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC0-1.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github). layered inhands by mubururu_ (github), icon-chem.png & icon-mining-adv.png created by mubururu_ (github), Xenoborg modules sprites by Samuka-C (github),surgery and kinetic by <@500744677352407051>, icon-xenoborg-holowall by github Samuka-C>",
+ "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github). layered inhands by mubururu_ (github), icon-chem.png & icon-mining-adv.png created by mubururu_ (github), Xenoborg modules sprites by Samuka-C (github),surgery and kinetic by <@500744677352407051>, icon-xenoborg-holowall by github Samuka-C>, icon-anomalies-adv created by Davyei (Discord)",
"size": {
"x": 32,
"y": 32
@@ -28,6 +28,9 @@
{
"name": "security"
},
+ {
+ "name": "science"
+ },
{
"name": "xenoborg_generic"
},
@@ -97,6 +100,21 @@
{
"name": "icon-doc-rare"
},
+ {
+ "name": "icon-anomalies-adv"
+ },
+ {
+ "name": "icon-slime"
+ },
+ {
+ "name": "icon-robotic"
+ },
+ {
+ "name": "icon-rnd-rare"
+ },
+ {
+ "name": "icon-dna"
+ },
{
"name": "icon-xenoborg-holowall"
},
diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/science.png b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/science.png
new file mode 100644
index 0000000000..c23374b94a
Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/science.png differ