Skip to content

Commit 755d823

Browse files
authored
Изменение боргов...опять... (#307)
* Revert "commit2" This reverts commit 47e4a12. # Conflicts: # Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml * Revert "fix-translate" This reverts commit 65cd54a. * Reapply "fix-translate" This reverts commit ab4df34. * Reapply "commit2" This reverts commit caaab7e. * tweakborgs-again * fix * coolfix * fix2
1 parent df9d1cc commit 755d823

File tree

89 files changed

+4795
-1631
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+4795
-1631
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
terror-xenoborgs = Внимание экипажу, похоже, что кто-то с вашей станции неожиданно отправил сигнал неизвестному шаттлу в ближайшем секторе.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
### Prototype names (note: constructable items will be puralized)
2+
3+
rcd-component-floor-xeno = ксеноборг-пол
4+
rcd-component-b-circuit-xeno = плитка голубых микросхем
Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,23 @@
11
ent-BorgChassisSecurity = киборг-охранник
2-
.desc = { ent-BorgChassisSelectable.desc }
2+
.desc = { ent-BorgChassisSelectable.desc }
3+
ent-BorgChassisSecurityPlayer = { ent-BorgChassisSecurity }
4+
.desc = { ent-BorgChassisSelectable.desc }
5+
.suffix = Охранник, Батарея, Все модули, НЕ МАППИТЬ
6+
ent-BorgChassisGenericPlayer = { ent-BorgChassisGeneric }
7+
.desc = { ent-BorgChassisSelectable.desc }
8+
.suffix = Общий, Батарея, Все модули, НЕ МАППИТЬ
9+
ent-BorgChassisMiningPlayer = { ent-BorgChassisMining }
10+
.desc = { ent-BorgChassisSelectable.desc }
11+
.suffix = Шахтёр, Батарея, Все модули, НЕ МАППИТЬ
12+
ent-BorgChassisEngineerPlayer = { ent-BorgChassisEngineer }
13+
.desc = { ent-BorgChassisSelectable.desc }
14+
.suffix = Инженер, Батарея, Все модули, НЕ МАППИТЬ
15+
ent-BorgChassisJanitorPlayer = { ent-BorgChassisJanitor }
16+
.desc = { ent-BorgChassisSelectable.desc }
17+
.suffix = Уборщик, Батарея, Все модули, НЕ МАППИТЬ
18+
ent-BorgChassisMedicalPlayer = { ent-BorgChassisMedical }
19+
.desc = { ent-BorgChassisSelectable.desc }
20+
.suffix = Врач, Батарея, Все модули, НЕ МАППИТЬ
21+
ent-BorgChassisServicePlayer = { ent-BorgChassisService }
22+
.desc = { ent-BorgChassisSelectable.desc }
23+
.suffix = Официант, Батарея, Все модули, НЕ МАППИТЬ

Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/medical/healing.ftl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ ent-Tyriumpack3 = { ent-Tyriumpack }
116116
.desc = { ent-Tyriumpack.desc }
117117
.suffix = Три
118118
ent-Nanopast = тюбик нанопасты
119-
.desc = Залей пасту в андроида и он станет как новый!
119+
.desc = Залей пасту в силикона и он станет как новый!
120120
.suffix = Полный
121121
ent-Nanopast1 = { ent-Nanopast }
122122
.desc = { ent-Nanopast.desc }
123-
.suffix = Один
123+
.suffix = Один

Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/robotics/borg_items.ftl

Lines changed: 222 additions & 0 deletions
Large diffs are not rendered by default.

Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/robotics/borg_modules.ftl

Lines changed: 75 additions & 122 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
ent-WeaponORG430 = ручной гранатомет "ОРГ-430"
22
.desc = Однозарядный ручной гранатомет, необходимый для подавления толпы и бронерованных целей в узкой местности.
3-
.suffix = Гранатомет
3+
.suffix = Гранатомет

Resources/Prototypes/Catalog/Fills/Boxes/general.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@
7575
storagebase:
7676
id: LightBulb
7777
amount: 12
78+
# Corvax-Wega-start
79+
- type: Tag
80+
tags:
81+
- Lightbox
82+
- BoxCardboard
83+
# Corvax-Wega-end
7884

7985
- type: entity
8086
name: lightbulb box warm

Resources/Prototypes/Catalog/uplink_catalog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1362,7 +1362,7 @@
13621362
productEntity: ReinforcementRadioSyndicateCyborgAssault
13631363
icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-borg-assault }
13641364
cost:
1365-
Telecrystal: 45 # Corvax-Wega-Syndi
1365+
Telecrystal: 100 # Corvax-Wega-Syndi
13661366
categories:
13671367
- UplinkAllies
13681368
conditions:

Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
map: ["light"]
2323
visible: false
2424
- type: BorgChassis
25-
maxModules: 7
25+
maxModules: 4 #Corvax-Wega-add
2626
hasMindState: xenoborg_engi_e
2727
noMindState: xenoborg_engi_e_r
2828
moduleWhitelist:
@@ -37,12 +37,17 @@
3737
- MMIFilled
3838
borg_module:
3939
- XenoborgModuleBasic
40-
- BorgModuleAdvancedTool
41-
- BorgModuleConstruction
42-
- BorgModuleRCD
43-
- BorgModuleCable
40+
# Corvax-Wega-robots-start
41+
# - BorgModuleAdvancedTool
42+
# - BorgModuleConstruction
43+
# - BorgModuleRCD
44+
# - BorgModuleRCD
4445
- XenoborgModuleAccessBreaker
45-
- XenoborgModuleFireExtinguisher
46+
- BorgModuleXenoConstruction
47+
# - BorgModuleCable
48+
# Corvax-Wega-robots-end
49+
# - XenoborgModuleAccessBreaker # Corvax-Wega-robots
50+
# - XenoborgModuleFireExtinguisher # Corvax-Wega-robots
4651
- type: ShowElectrocutionHUD
4752
- type: ShowHealthBars
4853
damageContainers:
@@ -140,12 +145,17 @@
140145
- XenoborgModuleBasic
141146
- XenoborgModuleTool
142147
- XenoborgModuleLaser
143-
- XenoborgModuleJammer
148+
- XenoborgHoloprojector # XenoborgModuleJammer Corvax-Wega-Add
144149
- type: ItemSlots
145150
slots:
146151
cell_slot:
147152
name: power-cell-slot-component-slot-name-default
148153
startingItem: PowerCellHigh
154+
# Corvax-Wega-start
155+
- type: ShowHealthBars
156+
damageContainers:
157+
- Biological
158+
# Corvax-Wega-end
149159

150160
- type: entity
151161
parent: [ BaseXenoborgChassis, BaseXenoborgTransponder ]
@@ -228,7 +238,7 @@
228238
footstepSoundCollection:
229239
collection: FootstepHoverXenoborg
230240
- type: BorgChassis
231-
maxModules: 5
241+
maxModules: 4 #Corvax-Wega-add
232242
hasMindState: xenoborg_stealth_e
233243
noMindState: xenoborg_stealth_e_r
234244
moduleWhitelist:
@@ -247,7 +257,7 @@
247257
- XenoborgModuleBasic
248258
- XenoborgModuleTool
249259
- XenoborgModuleHypo
250-
- XenoborgModuleChameleonProjector
260+
# - XenoborgModuleChameleonProjector Corvax-Wega
251261
- XenoborgModuleCloakDevice
252262
- type: ItemSlots
253263
slots:
@@ -268,11 +278,17 @@
268278
- MMI
269279
borg_module:
270280
- XenoborgModuleBasic
271-
- BorgModuleAdvancedTool
272-
- BorgModuleConstruction
273-
- BorgModuleRCD
274-
- BorgModuleCable
281+
# Corvax-Wega-robots-start
282+
# - BorgModuleAdvancedTool
283+
# - BorgModuleConstruction
284+
# - BorgModuleRCD
285+
# - BorgModuleRCD
275286
- XenoborgModuleAccessBreaker
287+
- BorgModuleXenoConstruction
288+
# - BorgModuleCable
289+
# Corvax-Wega-robots-end
290+
# - XenoborgModuleAccessBreaker # Corvax-Wega-robots
291+
# - XenoborgModuleFireExtinguisher # Corvax-Wega-robots
276292
- XenoborgModuleFireExtinguisher
277293
- type: ItemSlots
278294
slots:
@@ -293,7 +309,7 @@
293309
- XenoborgModuleBasic
294310
- XenoborgModuleTool
295311
- XenoborgModuleLaser
296-
- XenoborgModuleJammer
312+
- XenoborgHoloprojector # XenoborgModuleJammer Corvax-Wega-Add
297313
- type: ItemSlots
298314
slots:
299315
cell_slot:
@@ -333,7 +349,7 @@
333349
- XenoborgModuleBasic
334350
- XenoborgModuleTool
335351
- XenoborgModuleHypo
336-
- XenoborgModuleChameleonProjector
352+
# - XenoborgModuleChameleonProjector Corvax-Wega
337353
- XenoborgModuleCloakDevice
338354
- type: ItemSlots
339355
slots:

0 commit comments

Comments
 (0)