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

Замена позитронного мозга на роботический #147

Merged
merged 3 commits into from
Jun 24, 2024
Merged
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
11 changes: 11 additions & 0 deletions Resources/Locale/ru-RU/_sunrise/robotics/boris.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
boris-installed = Обнаружена нейронная активность.
boris-off = Нейронная активность не обнаружена.
boris-still-searching = Идёт процесс синтетического нейронного дескремблирования...
boris-searching = Начинается процесс синтетического нейронного дескремблирования...
boris-role-name = роботический мозг
boris-role-description = Служите экипажу станции.
boris-wipe-device-verb-text = Стереть мозг
boris-wiped-device = Нейронная активность была прекращена.
boris-stop-searching-verb-text = Прекратить поиск
boris-stopped-searching = Нейронное дескремблирование прекращено.
boris-slot-component-slot-name-brain = Мозг
11 changes: 11 additions & 0 deletions Resources/Locale/ru-RU/_sunrise/robotics/sofia.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
sofia-installed = Обнаружена нейронная активность.
sofia-off = Нейронная активность не обнаружена.
sofia-still-searching = Идёт процесс синтетического нейронного дескремблирования...
sofia-searching = Начинается процесс синтетического нейронного дескремблирования...
sofia-role-name = роботический мозг синдиката
sofia-role-description = Служите членам синдиката.
sofia-wipe-device-verb-text = Стереть мозг
sofia-wiped-device = Нейронная активность была прекращена.
sofia-stop-searching-verb-text = Прекратить поиск
sofia-stopped-searching = Нейронное дескремблирование прекращено.
sofia-slot-component-slot-name-brain = Мозг
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@ ent-MMIFilled = { ent-MMI }
.suffix = Заполненный
.desc = { ent-MMI.desc }
ent-PositronicBrain = позитронный мозг
.desc = Искусственный мозг, способный к спонтанной нейронной активности.
.desc = Загадочный мозг, способный к нейронной активности. Не гниет и не страеет.
ent-Boris = роботический мозг
.desc = Искусственный мозг, способной к банальной интелектуальной активности.
ent-Sofia = роботический мозг синдиката
.desc = Искусственный мозг, способной к банальной интелектуальной активности.
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Mobs/Player/silicon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- type: ContainerFill
containers:
borg_brain:
- PositronicBrain
- Boris
borg_module:
- BorgModuleTool
- type: ItemSlots
Expand Down Expand Up @@ -41,7 +41,7 @@
- type: ContainerFill
containers:
borg_brain:
- PositronicBrain
- Sofia
borg_module:
- BorgModuleOperative
- BorgModuleL6C
Expand Down
35 changes: 13 additions & 22 deletions Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,30 +77,21 @@
- state: posibrain
map: ["base"]
- type: Input
context: human
context: "ghost" # Sunrise-Edit
- type: BlockMovement
- type: ToggleableGhostRole
examineTextMindPresent: positronic-brain-installed
examineTextMindSearching: positronic-brain-still-searching
examineTextNoMind: positronic-brain-off
beginSearchingText: positronic-brain-searching
roleName: positronic-brain-role-name
roleDescription: positronic-brain-role-description
roleRules: ghost-role-information-silicon-rules
wipeVerbText: positronic-brain-wipe-device-verb-text
wipeVerbPopup: positronic-brain-wiped-device
stopSearchVerbText: positronic-brain-stop-searching-verb-text
stopSearchVerbPopup: positronic-brain-stopped-searching
# - type: ToggleableGhostRole
# examineTextMindPresent: positronic-brain-installed
# examineTextMindSearching: positronic-brain-still-searching
# examineTextNoMind: positronic-brain-off
# beginSearchingText: positronic-brain-searching
# roleName: positronic-brain-role-name
# roleDescription: positronic-brain-role-description
# roleRules: ghost-role-information-silicon-rules
# wipeVerbText: positronic-brain-wipe-device-verb-text
# wipeVerbPopup: positronic-brain-wiped-device
# stopSearchVerbText: positronic-brain-stop-searching-verb-text
# stopSearchVerbPopup: positronic-brain-stopped-searching
- type: Examiner
- type: BorgBrain
- type: IntrinsicRadioReceiver
- type: IntrinsicRadioTransmitter
channels:
- Binary
- type: ActiveRadio
channels:
- Binary
- Common
- type: NameIdentifier
group: PositronicBrain
- type: DoAfter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@
runningState: fab-active
staticRecipes:
- MMI
- PositronicBrain
- Boris
- SciFlash
- BorgModuleCable
- BorgModuleFireExtinguisher
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Recipes/Lathes/robotics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,8 @@
Gold: 200

- type: latheRecipe
id: PositronicBrain
result: PositronicBrain
id: Boris
result: Boris
category: Robotics
completetime: 3
materials:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
- type: entity
parent: BaseItem
id: Boris
name: robotic brain
description:
components:
- type: Organ
- type: Brain
- type: Sprite
sprite: _Sunrise/Entities/Objects/boris.rsi
layers:
- state: boris_blank
map: ["base"]
- type: Input
context: "ghost"
- type: BlockMovement
- type: ToggleableGhostRole
examineTextMindPresent: boris-installed
examineTextMindSearching: boris-still-searching
examineTextNoMind: boris-off
beginSearchingText: boris-searching
roleName: boris-role-name
roleDescription: boris-role-description
roleRules: ghost-role-information-silicon-rules
wipeVerbText: boris-wipe-device-verb-text
wipeVerbPopup: boris-wiped-device
stopSearchVerbText: boris-stop-searching-verb-text
stopSearchVerbPopup: boris-stopped-searching
- type: Examiner
- type: BorgBrain
- type: IntrinsicRadioReceiver
- type: IntrinsicRadioTransmitter
channels:
- Binary
- type: ActiveRadio
channels:
- Binary
- Common
- type: NameIdentifier
group: Boris
- type: DoAfter
- type: Actions
- type: TypingIndicator
proto: robot
- type: Speech
speechSounds: Pai
- type: MobState
allowedStates:
- Alive
- type: Appearance
- type: Tag
tags:
- CannotSuicide
- type: GenericVisualizer
visuals:
enum.ToggleableGhostRoleVisuals.Status:
base:
Off: { state: boris_blank }
Searching: { state: boris_recharging }
On: { state: boris }
- type: GuideHelp
guides:
- Cyborgs
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
- type: entity
parent: Boris
id: Sofia
name: syndicate robotic brain
description:
components:
- type: Organ
- type: Brain
- type: Sprite
sprite: _Sunrise/Entities/Objects/sofia.rsi
layers:
- state: sofia_blank
map: ["base"]
- type: Input
context: "ghost"
- type: BlockMovement
- type: ToggleableGhostRole
examineTextMindPresent: sofia-installed
examineTextMindSearching: sofia-still-searching
examineTextNoMind: sofia-off
beginSearchingText: sofia-searching
roleName: sofia-role-name
roleDescription: sofia-role-description
roleRules: ghost-role-information-silicon-rules
wipeVerbText: sofia-wipe-device-verb-text
wipeVerbPopup: sofia-wiped-device
stopSearchVerbText: sofia-stop-searching-verb-text
stopSearchVerbPopup: sofia-stopped-searching
- type: Examiner
- type: BorgBrain
- type: IntrinsicRadioReceiver
- type: IntrinsicRadioTransmitter
channels:
- Syndicate
- type: ActiveRadio
channels:
- Syndicate
- type: NameIdentifier
group: Sofia
- type: DoAfter
- type: Actions
- type: TypingIndicator
proto: robot
- type: Speech
speechSounds: Pai
- type: MobState
allowedStates:
- Alive
- type: Appearance
- type: Tag
tags:
- CannotSuicide
- type: GenericVisualizer
visuals:
enum.ToggleableGhostRoleVisuals.Status:
base:
Off: { state: sofia_blank }
Searching: { state: sofia_recharging }
On: { state: sofia }
- type: GuideHelp
guides:
- Cyborgs
11 changes: 11 additions & 0 deletions Resources/Prototypes/_Sunrise/name_identifier_groups.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- type: nameIdentifierGroup
id: Boris
prefix: БОРИС
minValue: 10
maxValue: 99

- type: nameIdentifierGroup
id: Sofia
prefix: СОФИЯ
minValue: 10
maxValue: 99
4 changes: 3 additions & 1 deletion Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@

Свежесобранным киборгам необходим [color=#a4885c]мозг[/color], способный взаимодействовать с электронным телом. Существует два основных типа мозгов. Их работоспособность не зависит от шасси, и даже если шасси будет выведено из строя, заменено или подвергнется внеплановому демонтажу, они сохранят способность к общению.
- [color=#a4885c]Мозго-машинный интерфейс[/color], или сокращенно ММИ, - это устройство, способное поддерживать связь между биологическим мозгом и электронными компонентами. Оно позволяет членам экипажа, пострадавшим в результате несчастных случаев на работе, продолжать служить своей команде еще долго после того, как их тела не станет.
- [color=#a4885c]Позитронный мозг[/color] - это полностью искусственный мозг, способный к спонтанной нейронной активности. Время, за которое синтетические нейроны образуют рабочий мозг, может сильно варьироваться, но это позволяет создавать киборгов без необходимости извлекать мозг из члена экипажа.
- [color=#a4885c]Роботический мозг[/color] - это полностью искусственный мозг, способный к спонтанной нейронной активности. Время, за которое синтетические нейроны образуют рабочий мозг, может сильно варьироваться, но это позволяет создавать киборгов без необходимости извлекать мозг из члена экипажа.
- [color=#a4885c]Позитронный мозг[/color] - неизвестная технология которая имеет ничем не уступает человеческим мозгам, может быть установлен только в тело КПБ.
<Box>
<GuideEntityEmbed Entity="MMIFilled" Caption="Человеко-машинный интерфейс"/>
<GuideEntityEmbed Entity="Boris" Caption="Роботический мозг"/>
<GuideEntityEmbed Entity="PositronicBrain" Caption="Позитронный мозг"/>
</Box>
Оба вида мозгов можно изготовить, не прибегая к дополнительным исследованиям.
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Спизжено из SS13 Paradise",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "boris",
"delays": [
[
0.1,
0.1
]
]
},
{
"name": "boris_recharging",
"delays": [
[
1,
1
]
]
},
{
"name": "boris_blank"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Спизжено из SS13 Paradise",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "sofia_recharging",
"delays": [
[
0.1,
0.1
]
]
},
{
"name": "sofia_blank"
},
{
"name": "sofia",
"delays": [
[
0.1,
0.1
]
]
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading