Skip to content
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
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/_wega/communications/terror.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
terror-xenoborgs = Внимание экипажу, похоже, что кто-то с вашей станции неожиданно отправил сигнал неизвестному шаттлу в ближайшем секторе.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
### Prototype names (note: constructable items will be puralized)

rcd-component-floor-xeno = ксеноборг-пол
rcd-component-b-circuit-xeno = плитка голубых микросхем
Original file line number Diff line number Diff line change
@@ -1,2 +1,23 @@
ent-BorgChassisSecurity = киборг-охранник
.desc = { ent-BorgChassisSelectable.desc }
.desc = { ent-BorgChassisSelectable.desc }
ent-BorgChassisSecurityPlayer = { ent-BorgChassisSecurity }
.desc = { ent-BorgChassisSelectable.desc }
.suffix = Охранник, Батарея, Все модули, НЕ МАППИТЬ
ent-BorgChassisGenericPlayer = { ent-BorgChassisGeneric }
.desc = { ent-BorgChassisSelectable.desc }
.suffix = Общий, Батарея, Все модули, НЕ МАППИТЬ
ent-BorgChassisMiningPlayer = { ent-BorgChassisMining }
.desc = { ent-BorgChassisSelectable.desc }
.suffix = Шахтёр, Батарея, Все модули, НЕ МАППИТЬ
ent-BorgChassisEngineerPlayer = { ent-BorgChassisEngineer }
.desc = { ent-BorgChassisSelectable.desc }
.suffix = Инженер, Батарея, Все модули, НЕ МАППИТЬ
ent-BorgChassisJanitorPlayer = { ent-BorgChassisJanitor }
.desc = { ent-BorgChassisSelectable.desc }
.suffix = Уборщик, Батарея, Все модули, НЕ МАППИТЬ
ent-BorgChassisMedicalPlayer = { ent-BorgChassisMedical }
.desc = { ent-BorgChassisSelectable.desc }
.suffix = Врач, Батарея, Все модули, НЕ МАППИТЬ
ent-BorgChassisServicePlayer = { ent-BorgChassisService }
.desc = { ent-BorgChassisSelectable.desc }
.suffix = Официант, Батарея, Все модули, НЕ МАППИТЬ
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ ent-Tyriumpack3 = { ent-Tyriumpack }
.desc = { ent-Tyriumpack.desc }
.suffix = Три
ent-Nanopast = тюбик нанопасты
.desc = Залей пасту в андроида и он станет как новый!
.desc = Залей пасту в силикона и он станет как новый!
.suffix = Полный
ent-Nanopast1 = { ent-Nanopast }
.desc = { ent-Nanopast.desc }
.suffix = Один
.suffix = Один

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ent-WeaponORG430 = ручной гранатомет "ОРГ-430"
.desc = Однозарядный ручной гранатомет, необходимый для подавления толпы и бронерованных целей в узкой местности.
.suffix = Гранатомет
.suffix = Гранатомет
6 changes: 6 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Boxes/general.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@
storagebase:
id: LightBulb
amount: 12
# Corvax-Wega-start
- type: Tag
tags:
- Lightbox
- BoxCardboard
# Corvax-Wega-end

- type: entity
name: lightbulb box warm
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1362,7 +1362,7 @@
productEntity: ReinforcementRadioSyndicateCyborgAssault
icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-borg-assault }
cost:
Telecrystal: 45 # Corvax-Wega-Syndi
Telecrystal: 100 # Corvax-Wega-Syndi
categories:
- UplinkAllies
conditions:
Expand Down
46 changes: 31 additions & 15 deletions Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
map: ["light"]
visible: false
- type: BorgChassis
maxModules: 7
maxModules: 4 #Corvax-Wega-add
hasMindState: xenoborg_engi_e
noMindState: xenoborg_engi_e_r
moduleWhitelist:
Expand All @@ -37,12 +37,17 @@
- MMIFilled
borg_module:
- XenoborgModuleBasic
- BorgModuleAdvancedTool
- BorgModuleConstruction
- BorgModuleRCD
- BorgModuleCable
# Corvax-Wega-robots-start
# - BorgModuleAdvancedTool
# - BorgModuleConstruction
# - BorgModuleRCD
# - BorgModuleRCD
- XenoborgModuleAccessBreaker
- XenoborgModuleFireExtinguisher
- BorgModuleXenoConstruction
# - BorgModuleCable
# Corvax-Wega-robots-end
# - XenoborgModuleAccessBreaker # Corvax-Wega-robots
# - XenoborgModuleFireExtinguisher # Corvax-Wega-robots
- type: ShowElectrocutionHUD
- type: ShowHealthBars
damageContainers:
Expand Down Expand Up @@ -140,12 +145,17 @@
- XenoborgModuleBasic
- XenoborgModuleTool
- XenoborgModuleLaser
- XenoborgModuleJammer
- XenoborgHoloprojector # XenoborgModuleJammer Corvax-Wega-Add
- type: ItemSlots
slots:
cell_slot:
name: power-cell-slot-component-slot-name-default
startingItem: PowerCellHigh
# Corvax-Wega-start
- type: ShowHealthBars
damageContainers:
- Biological
# Corvax-Wega-end

- type: entity
parent: [ BaseXenoborgChassis, BaseXenoborgTransponder ]
Expand Down Expand Up @@ -228,7 +238,7 @@
footstepSoundCollection:
collection: FootstepHoverXenoborg
- type: BorgChassis
maxModules: 5
maxModules: 4 #Corvax-Wega-add
hasMindState: xenoborg_stealth_e
noMindState: xenoborg_stealth_e_r
moduleWhitelist:
Expand All @@ -247,7 +257,7 @@
- XenoborgModuleBasic
- XenoborgModuleTool
- XenoborgModuleHypo
- XenoborgModuleChameleonProjector
# - XenoborgModuleChameleonProjector Corvax-Wega
- XenoborgModuleCloakDevice
- type: ItemSlots
slots:
Expand All @@ -268,11 +278,17 @@
- MMI
borg_module:
- XenoborgModuleBasic
- BorgModuleAdvancedTool
- BorgModuleConstruction
- BorgModuleRCD
- BorgModuleCable
# Corvax-Wega-robots-start
# - BorgModuleAdvancedTool
# - BorgModuleConstruction
# - BorgModuleRCD
# - BorgModuleRCD
- XenoborgModuleAccessBreaker
- BorgModuleXenoConstruction
# - BorgModuleCable
# Corvax-Wega-robots-end
# - XenoborgModuleAccessBreaker # Corvax-Wega-robots
# - XenoborgModuleFireExtinguisher # Corvax-Wega-robots
- XenoborgModuleFireExtinguisher
- type: ItemSlots
slots:
Expand All @@ -293,7 +309,7 @@
- XenoborgModuleBasic
- XenoborgModuleTool
- XenoborgModuleLaser
- XenoborgModuleJammer
- XenoborgHoloprojector # XenoborgModuleJammer Corvax-Wega-Add
- type: ItemSlots
slots:
cell_slot:
Expand Down Expand Up @@ -333,7 +349,7 @@
- XenoborgModuleBasic
- XenoborgModuleTool
- XenoborgModuleHypo
- XenoborgModuleChameleonProjector
# - XenoborgModuleChameleonProjector Corvax-Wega
- XenoborgModuleCloakDevice
- type: ItemSlots
slots:
Expand Down
14 changes: 12 additions & 2 deletions Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
staticPacks:
- EmptyXenoborgs
- XenoborgUpgradeModules
- XenoborgLaws # Corvax-Wega-add
- type: MaterialStorage
whitelist:
tags:
Expand Down Expand Up @@ -156,12 +157,13 @@
- type: MothershipCore
- type: Tag
tags:
- BypassInteractionRangeChecks # Corvax-Wega-add
- SiliconEmotes
- CanPilot
- Structure
- type: GuideHelp
guides:
- Robotics
# - Robotics Corvax-Wega
- Xenoborgs
- type: Inventory
templateId: borg
Expand All @@ -185,7 +187,7 @@
containers:
borg_module:
- MothershipModule
- BorgModuleAdvancedTool
- XenoborgModuleToolMother # BorgModuleAdvancedTool Corvax-Wega
- type: ContainerContainer
containers:
cell_slot: !type:ContainerSlot { }
Expand Down Expand Up @@ -236,6 +238,14 @@
- type: ShowElectrocutionHUD
- type: PowerMonitoringCableNetworks
- type: RadarConsole
# Corvax-Wega-start
- type: ShowHealthBars
damageContainers:
- Biological
- Inorganic
- Silicon
- Android
# Corvax-Wega-end

- type: entity
parent: BaseAGhostAction
Expand Down
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 @@ -555,12 +555,12 @@
borg_module:
- BorgModuleOperative
- BorgModuleL6C
- BorgModuleDoubleEsword
- BorgModuleChina # BorgModuleDoubleEsword Corvax-Wega
- type: ItemSlots
slots:
cell_slot:
name: power-cell-slot-component-slot-name-default
startingItem: PowerCellHyper
startingItem: PowerCellMicroreactor # PowerCellHyper Corvax-Wega

- type: entity
id: PlayerBorgSyndicateAssaultGhostRole
Expand Down
Loading
Loading