From 5a620685825b72045b93260778f195a9a5e9fcb6 Mon Sep 17 00:00:00 2001 From: GaMEWAR360 Date: Mon, 5 Jan 2026 16:36:58 +0300 Subject: [PATCH 1/6] Revert "commit2" This reverts commit 47e4a1291ed01fbe9011116867eab7c79318022f. # Conflicts: # Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml --- Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml index 2396d83b3a..bc3adf2391 100644 --- a/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml @@ -217,7 +217,7 @@ icon: { sprite: _Wega/Objects/Weapons/Melee/syndicate_rapier.rsi, state: icon } productEntity: BeltSheathSyndieFilledBox cost: - Telecrystal: 8 + Telecrystal: 6 categories: - UplinkWeaponry From c51fe7d23f1671040ff8e8a3fd168e5d8350cccc Mon Sep 17 00:00:00 2001 From: GaMEWAR360 Date: Mon, 5 Jan 2026 16:37:13 +0300 Subject: [PATCH 2/6] Revert "fix-translate" This reverts commit 65cd54a7030879b751350c7ff2575e703db10f64. --- .../Locale/ru-RU/_wega/genetics/basic.ftl | 1 - .../ghost/roles/ghost-role-component.ftl | 4 +- .../prototypes/_wega/body/parts/android.ftl | 4 +- .../prototypes/_wega/body/parts/harpy.ftl | 22 ------ .../catalog/fills/backpacks/duffelbag.ftl | 14 ++-- .../catalog/fills/crates/engineering.ftl | 2 - .../_wega/catalog/fills/items/belts.ftl | 4 +- .../_wega/entities/mobs/npcs/animals.ftl | 2 +- .../_wega/entities/mobs/player/polymorph.ftl | 4 -- .../objects/misc/identification_cards.ftl | 14 ++-- .../_wega/entities/objects/misc/tile.ftl | 2 - .../entities/objects/vehicles/buckleable.ftl | 7 +- .../objects/weapons/guns/snipers/snipers.ftl | 3 +- .../Catalog/Fills/Backpacks/duffelbag.yml | 2 +- .../Mobs/Cyborgs/base_borg_chassis.yml | 2 +- .../Catalog/Fills/Backpacks/duffelbag.yml | 4 +- .../Weapons/Guns/Launchers/launchers.yml | 64 ++++++++++-------- .../Entities/Objects/Weapons/Melee/sabre.yml | 2 +- Resources/Prototypes/borg_types.yml | 23 +++++++ .../Weapons/Guns/Rifles/carbine.rsi/meta.json | 8 --- .../carbine.rsi/wielded-inhand-left.png | Bin 1043 -> 0 bytes .../carbine.rsi/wielded-inhand-right.png | Bin 1058 -> 0 bytes 22 files changed, 83 insertions(+), 105 deletions(-) delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/body/parts/harpy.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/crates/engineering.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/player/polymorph.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/tile.ftl delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-right.png diff --git a/Resources/Locale/ru-RU/_wega/genetics/basic.ftl b/Resources/Locale/ru-RU/_wega/genetics/basic.ftl index 1158c3e5c6..46e45704d1 100644 --- a/Resources/Locale/ru-RU/_wega/genetics/basic.ftl +++ b/Resources/Locale/ru-RU/_wega/genetics/basic.ftl @@ -1,5 +1,4 @@ matter-eater-succes = Вы съели {$eat} -food-system-verb-eat = Съесть # Messages genetics-empathetic-thought-message = Вы вдруг стали замечать в окружающих больше, чем раньше. diff --git a/Resources/Locale/ru-RU/_wega/ghost/roles/ghost-role-component.ftl b/Resources/Locale/ru-RU/_wega/ghost/roles/ghost-role-component.ftl index 3a0c043df7..05f5209f59 100644 --- a/Resources/Locale/ru-RU/_wega/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/ru-RU/_wega/ghost/roles/ghost-role-component.ftl @@ -30,6 +30,4 @@ ghost-role-information-harvester-description = Самокопирующися с ghost-role-information-proteon-name = Протеон ghost-role-information-proteon-description = Слаб. ghost-role-information-possessed-blade-name = Одержимый меч -ghost-role-information-possessed-blade-description = Ты — древний клинок, пропитанный жаждой крови. Твоя душа, заточённая в стали, жаждет разрушения. -ghost-role-information-taxibot-name = Таксибот -ghost-role-information-taxibot-description = Отвезите членов экипажа к месту назначения. \ No newline at end of file +ghost-role-information-possessed-blade-description = Ты — древний клинок, пропитанный жаждой крови. Твоя душа, заточённая в стали, жаждет разрушения. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/body/parts/android.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/body/parts/android.ftl index fed58910d8..f70788ffa8 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/body/parts/android.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/body/parts/android.ftl @@ -1,8 +1,6 @@ ent-PartAndroid = часть тела андроида .desc = { ent-BaseItem.desc } -ent-HeadAndroid = голова андроида - .desc = { ent-PartAndroid.desc } -ent-TorsoAndroid = торс андроида +ent-HeadAndroid = торс андроида .desc = { ent-PartAndroid.desc } ent-LeftArmAndroid = левая рука андроида .desc = { ent-PartAndroid.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/body/parts/harpy.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/body/parts/harpy.ftl deleted file mode 100644 index 74c43ca720..0000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/body/parts/harpy.ftl +++ /dev/null @@ -1,22 +0,0 @@ -ent-PartHarpy = часть тела гарпии - .desc = { ent-BaseItem.desc } -ent-TorsoHarpy = торс гарпии - .desc = { ent-PartHarpy.desc } -ent-HeadHarpy = голова гарпии - .desc = { ent-PartHarpy.desc } -ent-LeftArmHarpy = левая рука гарпии - .desc = { ent-PartHarpy.desc } -ent-RightArmHarpy = правая рука гарпии - .desc = { ent-PartHarpy.desc } -ent-LeftHandHarpy = левая кисть гарпии - .desc = { ent-PartHarpy.desc } -ent-RightHandHarpy = правая кисть гарпии - .desc = { ent-PartHarpy.desc } -ent-LeftLegHarpy = левая нога гарпии - .desc = { ent-PartHarpy.desc } -ent-RightLegHarpy = правая нога гарпии - .desc = { ent-PartHarpy.desc } -ent-LeftFootHarpy = левая стопа гарпии - .desc = { ent-PartHarpy.desc } -ent-RightFootHarpy = правая стопа гарпии - .desc = { ent-PartHarpy.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/backpacks/duffelbag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/backpacks/duffelbag.ftl index b4f8affe87..7f290451f0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/backpacks/duffelbag.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/backpacks/duffelbag.ftl @@ -1,13 +1,13 @@ -ent-ClothingBackpackDuffelVoidThruster = вещмешок с деталями двигателя +ent-ClothingBackpackDuffelVoidThruster = { ent-ClothingBackpackDuffel } .desc = { ent-ClothingBackpackDuffel.desc } -ent-ClothingBackpackDuffelVoidGyroscope = вещмешок с деталями гироскопа +ent-ClothingBackpackDuffelVoidGyroscope = { ent-ClothingBackpackDuffel } .desc = { ent-ClothingBackpackDuffel.desc } -ent-ClothingBackpackDuffelSyndicateFilledXC67 = набор "xC-67" - .desc = Громко и мощно: Штурмовая винтовка "xC-67" и три магазина к нему на 45 патронов. +ent-ADTClothingBackpackDuffelSyndicateFilledXC67 = { ent-ClothingBackpackDuffelSyndicate } + .desc = { ent-ClothingBackpackDuffelSyndicate.desc } .suffix = набор "xC-67" -ent-ClothingBackpackDuffelSyndicateFilledHristov = набор "Христов МК-2" - .desc = Метко и больно: Модернизированая снайперская винтовка "Христов МК-2" и 5 магазинов к нему. - .suffix = набор "Христов МК-2" +ent-ADTClothingBackpackDuffelSyndicateFilledHristov = { ent-ClothingBackpackDuffelSyndicate } + .desc = { ent-ClothingBackpackDuffelSyndicate.desc } + .suffix = набор "Продвинутой снайперской винтовки" diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/crates/engineering.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/crates/engineering.ftl deleted file mode 100644 index 150a752e57..0000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/crates/engineering.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-CrateEngineeringTEG = ящик с упакованным ТЭГ - .desc = Ящик с упаковками для восстановления работы ТЭГ, для тех случаев, когда он сбежал. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/items/belts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/items/belts.ftl index 127938a6b7..dd9cc95553 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/items/belts.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/items/belts.ftl @@ -1,9 +1,9 @@ -ent-ClothingBeltMilitaryWebbingFilled = { ent-ClothingBeltAssault } +ent-ClothingBeltAssaultFilled = { ent-ClothingBeltAssault } .suffix = Заполненный .desc = { ent-ClothingBeltAssault.desc } ent-ClothingBeltSheathSyndicateFilled = { ent-ClothingBeltSheathSyndicate } .suffix = Заполненый .desc = { ent-ClothingBeltSheathSyndicate.desc } -ent-BeltSheathSyndieFilledBox = завернутая рапира Синдиката +ent-BeltSheathSyndieFilledBox = Завернутая рапира Синдиката .desc = Обёртка. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/npcs/animals.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/npcs/animals.ftl index 9c58faa9d3..b95759e0a6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/npcs/animals.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/npcs/animals.ftl @@ -18,7 +18,7 @@ ent-MobStokkeyVox = {ent-MobStokkey} .suffix = AI, Вокс ent-MobWolfling = вольпин - .desc = Собрат по генетике Вульпакинам. Их очень весело сжигать но аккуратно, у них есть план. + .desc = Собрат по генетике Вульпакинам. Их очень весело сжигать но аккуратно, у их есть план. ent-MobTajkey = фарва .desc = Маленькая версия Таярина. Он не похож на себя побольше. Чёрт возьми, что он вообще такое? \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/player/polymorph.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/player/polymorph.ftl deleted file mode 100644 index aeffe102e3..0000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/player/polymorph.ftl +++ /dev/null @@ -1,4 +0,0 @@ -ent-MobHulk = халк - .desc = "ОНО БОЛЬШОЕ И СИЛЬНОЕ!" -ent-MobZilla = Унатзила - .desc = { ent-MobHulk.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/identification_cards.ftl index 8500eca63b..c2c4526f1e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/identification_cards.ftl @@ -1,16 +1,16 @@ -ent-BarberIDCard = ID-карта барбера +ent-BarberIDCard = ID карта барбера .desc = { ent-IDCardStandard.desc } -ent-GeneticistIDCard = ID-карта генетика +ent-GeneticistIDCard = ID карта генетика .desc = { ent-IDCardStandard.desc } -ent-SurgeonIDCard = ID-карта хирурга +ent-SurgeonIDCard = ID карта хирурга .desc = { ent-IDCardStandard.desc } -ent-CoronerIDCard = ID-карта коронера +ent-CoronerIDCard = ID карта коронера .desc = { ent-IDCardStandard.desc } -ent-CBURNLeaderIDcard = ID-карта лидера РХБЗЗ +ent-CBURNLeaderIDcard = ID карта лидера РХБЗЗ .desc = { ent-IDCardStandard.desc } -ent-BlueShieldIDCard = ID-карта офицера синий щит +ent-BlueShieldIDCard = ID карта офицера синий щит .desc = { ent-IDCardStandard.desc } -ent-PostmanIDCard = ID-карта почтальона +ent-PostmanIDCard = ID карта почтальона .desc = { ent-IDCardStandard.desc } ent-IDCardNeck = бейджик служебного доступа .desc = Специальный бейджик с доступами служебной группы, позволяя проходить в большенство помещений. Снимайте только его перед использованием! diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/tile.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/tile.ftl deleted file mode 100644 index 310eb3f0e1..0000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/tile.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-FloorTileItemSepia = стальная темная клетчатая плитка - .desc = { ent-FloorTileItemWhite.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/vehicles/buckleable.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/vehicles/buckleable.ftl index 4a040f62f3..a5b7b1c044 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/vehicles/buckleable.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/vehicles/buckleable.ftl @@ -15,9 +15,4 @@ ent-VehicleWheelchair = инвалидная коляска .desc = Кресло на больших колесиках. Похоже, в нем можно передвигаться самостоятельно. ent-VehicleWheelchairFolded = { ent-VehicleWheelchair } .desc = { ent-VehicleWheelchair.desc } - .suffix = Сложенное -ent-VehicleUnicycle = моноцикл - .desc = У него всего одно колесо! -ent-VehicleUnicycleFolded = { ent-VehicleUnicycle } - .desc = { ent-VehicleUnicycle.desc } - .suffix = Сложенное + .suffix = Сложенное \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/snipers/snipers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/snipers/snipers.ftl index 3c59e3abac..9b25441ad4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/snipers/snipers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/snipers/snipers.ftl @@ -1,3 +1,2 @@ -ent-WeaponSniperHristovAdvanced = Христов "МК-2" +ent-WeaponSniperHristovAdvanced = продвинутая снайперская винтовка .desc = Продвинутая снайперская винтовка, использующая калибр .60 антиматериальный. Идеально подходит для работы в условиях тесных коридоров космической станции. - .suffix = Винтовка \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index d979fcf442..d8363a68d9 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -372,7 +372,7 @@ children: - id: DefibrillatorSyndicate - id: SyringeSpaceacillin # Corvax-Wega-Disease - amount: 1 # Corvax-Wega-Disease + amount: 2 # Corvax-Wega-Disease - id: MedkitCombatFilled amount: 4 - id: Tourniquet diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index ab9c44be92..7e451efb76 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -89,7 +89,7 @@ - type: Hands showInHands: false disableExplosionRecursion: true - canBeStripped: true #Corvax-Wega-add + canBeStripped: false - type: ComplexInteraction - type: IntrinsicRadioReceiver - type: IntrinsicRadioTransmitter diff --git a/Resources/Prototypes/_Wega/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_Wega/Catalog/Fills/Backpacks/duffelbag.yml index 8a969025ea..557a8fd54b 100644 --- a/Resources/Prototypes/_Wega/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/_Wega/Catalog/Fills/Backpacks/duffelbag.yml @@ -6,8 +6,8 @@ contents: - id: ThrusterMachineCircuitboard amount: 2 - - id: SheetSteel - - id: MicroManipulatorStockPart + - id: SheetSteel10 + - id: CapacitorStockPart amount: 8 - type: entity diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 178cd20fd3..fc85425911 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -1,40 +1,44 @@ - type: entity - name: ORG 430 - parent: [ BaseWeaponLauncher, BaseGunWieldable, BaseMajorContraband ] - id: WeaponORG430 + name: rg 430 + parent: BaseStorageItem + id: WeaponRG430 description: Load granade for optimal results. suffix: launcher components: - type: Sprite - sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + sprite: _Wega/Objects/Weapons/Guns/Launchers/rg_430.rsi layers: - - state: icon - map: ["enum.GunVisualLayers.Base"] - - type: Clothing - sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - slots: - - Back - - suitStorage - - type: Item - size: Huge - shape: - - 0,0,4,2 - - type: AmmoCounter + - state: base + - type: Storage + maxItemSize: Normal + grid: + - 0,0,0,1 + - 1,0,0,0 + whitelist: + tags: + - HandGrenade + - Grenade - type: Gun - fireRate: 1 + fireRate: 2 selectedMode: SemiAuto availableModes: - - SemiAuto + - SemiAuto + - FullAuto soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg - - type: BallisticAmmoProvider - whitelist: - tags: - - Grenade - capacity: 3 - proto: GrenadeFrag - soundInsert: - path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - - type: GunRequiresWield - - type: StaticPrice - price: 10000 \ No newline at end of file + path: /Audio/Effects/thunk.ogg + soundEmpty: + path: /Audio/Items/hiss.ogg + clumsyProof: true + - type: ContainerAmmoProvider + container: storagebase + - type: Item + size: Large + - type: Clothing + sprite: Objects/Weapons/Guns/Cannons/pie_cannon.rsi + quickEquip: false + slots: + - Back + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/sabre.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/sabre.yml index faca50e139..3742b3bdff 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/sabre.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/sabre.yml @@ -39,7 +39,7 @@ reflectProb: 0.1 spread: 90 - type: Item - size: Normal + size: Ginormous storedSprite: state: storage sprite: _Wega/Objects/Weapons/Melee/syndicate_rapier_storage_64x.rsi diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml index 323e27263c..02365a9d65 100644 --- a/Resources/Prototypes/borg_types.yml +++ b/Resources/Prototypes/borg_types.yml @@ -233,6 +233,29 @@ - Medical addComponents: +# Corvax-Wega-start + - type: UserInterface + interfaces: + enum.SiliconLawsUiKey.Key: + type: SiliconLawBoundUserInterface + requireInputValidation: false + enum.BorgUiKey.Key: + type: BorgBoundUserInterface + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface + enum.BorgSwitchableTypeUiKey.SelectBorgType: + type: BorgSelectTypeUserInterface + enum.CrewMonitoringUIKey.Key: + type: CrewMonitoringBoundUserInterface + - type: IntrinsicUI + uis: + enum.CrewMonitoringUIKey.Key: + toggleAction: ActionAGhostShowCrewMonitoring + - type: CrewMonitoringConsole + - type: DeviceNetwork + deviceNetId: Wireless + receiveFrequencyId: CrewMonitor +# Corvax-Wega-end - type: SolutionScanner - type: ShowHealthBars damageContainers: diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json index 1d53b36cd9..cac6899c48 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json @@ -27,14 +27,6 @@ "name": "inhand-right", "directions": 4 }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 - }, { "name": "equipped-BACKPACK", "directions": 4 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-left.png deleted file mode 100644 index ece4edaccad2ebfe360efc5a3d555a67148ab0f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1043 zcmV+u1nm2XP)Px&%}GQ-RCt{2n!#%0NDzj951EBMERhDq(&nJUG8%*q5zHx|AO`djd4U}L0C|Eu zK#sXDVNaU}$R&^ma1JJ{_tb~1JQ1{qg=I7uw)bF4C~{kFTTaYEeJ8oqT~(^?F4^uM zU>JsB7=~dOhA||LW3}xVHpPxfr@>&LMxzk`pePEYX^P=+2w;{B$8k^;1%|_6@8v=@ zBg--sMG?-=&y8YP+G){jJB|ZjmJk3)({#>hee5d9(fKqTPh(B{w|0u-Sm_>&?)Ce9 zgkcB(xVgCjFiXt!^>x*MFc_#LNpN;{W)xH$$LjR-6t}mxRa=rII6gjpk=3=(Xg!dt ztE;*Dwr#_49E``~>T{Z=0Prkf&Dm^ALR)Pyol)QS6#xh!dStV0thNUDzOST|xVX5` z4hn(*NI&XB1Q4}Ev0syn+NZ0hRLWo`v1SrcAj^jW|iLxwz(Ag@AqMAihXv{DE zK8_AQ;_2Jhx2ue&c`egM$OLx3`ByTVSQ&ntRK2-5)*A`-eVL@d?9F;ot9&U;f5qGFdwTuInm$_b1@Z z4({*oU-x@}DX!~QE27K8ZVRK|0!yIcw^E^E7=~dOhG7_nVHk#C80P=MHpCGx>2v9y zqT3Khyr$2k`T$*fn>eD2xM5wNIvbq@66=a1PEJnd#0{&6Bf1JQ0O0cSQknW(n89_$ z5fqq?W#WiU2r|f)iBCY206P1l6V~RLKZzrn)K6ra;s)x!=y0@)&*tn?{aEIcSQwB_ z0MQ1W0Mj_yvjB{OS;wbtcC#!~ral49TVMm?2t{r6Rnf+}J~zRfKA@{O;_2Jhw?c@X z5Ta))j_B(1XRp5l%=8GW3Nq#r&{Z7qSN{1sU7Ly{y87I;-aUOfI#jFpB(!^|i#USL z@xu@Am8m#ln}Q7E&aW+wcrBlu0^Ei;V$(jm3M956j$lCs!!XRI_zx*#-aucm_)-7> N002ovPDHLkV1l2__x}I@ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-right.png deleted file mode 100644 index 05277ed41fb60a4fc34719fa071a5e5d2dd4bdc8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1058 zcmV+-1l{|IP)Px&+(|@1RCt{2nlWzMNEC*D8u1#~ATS-!mXl&CGZ0uTfvtjNAY{P; zf*=TjAP9mWo`~zZvdilahePT6ekU5wng+P8D=o_c=Nz}Uw*~+V1_J<)mSq6|9LK@s z<)zV9lH>8XagOCNm1`O8VDSRwz~OKxRYK~9Ip^9$szkfy>gq~PCX@Ww^E`xMsLkim zfa|(42m(wdleJm&eP5~@{W9Z-;~4Y#Tzg?vsHYaebzP}q8DkOvk|e2htxa39oX^@8 zP=R3>J_>Xk2f)K}yuQ8$0NA#TVuEFYAV3&~vS|?*V^RpwBxDWCvhsWZU^<;*Hk)bB z-76jlAs~c+Wm)+w7cVlMPEky3Hk&~Rkr$$TeiTIzLR1#0it0aQ*-k=k#8!c9nZvvrg5 zeP7<(+|(|DTE0n=0C?DHRZCdM>eK!H?}Oh~cXw&!16r}C8|0i<1}>M&pVT&4E|;)v zJ1>qZjBVR_kftf# zzkB;=?`B!HDlYfp%nk+vn5GHGaq^@c$ARa0wUY;cD2gx|jq>BsXoSULQ9J(EU-|%m zbk31wnUN%kQMC;>F3bL#GkJPq;q~iN{PAauIF1d*n6zyhoO7gUii3lL{QM+I491vL zv$a?(V45b5kB`x03w$g6eqZ9h&k+B9K$c}2bvJ(4>-FT(;R|5z8R9rLfc1B5nx;Qz zS@uyKGsa}o2j2Ilak9N$FE7Bh>i!5c{w)CDIe=B$i4X)q5ClOG1VIo4K@bG-W7D;1 zqAk6r{3)sx-=%4yO}*L)75nvNx-d;_a(T3=S38*?2yk(6v37n}rir3SL*aQIq9{V! zdRq&y%`O8xm?l&MQnk%=o#XTK^Nn_uvR)Z=({1W)Er2pNs4j1LUzL0L3SCQEb&S=x zu8mgKQxyFQZR#~D003>1v*{C92vKR8DC+@V_qUqmx^9s=dab+#gb?V;G*O(@E=(F) zgMb3F~!0t^GWYQoA cf@p*P0T4j!ubJWL>;M1&07*qoM6N<$f`Z8D_y7O^ From 3dbc8be99a6f66d5c3419c745f9b4bab2ac12e79 Mon Sep 17 00:00:00 2001 From: GaMEWAR360 Date: Wed, 7 Jan 2026 01:20:54 +0300 Subject: [PATCH 3/6] Reapply "fix-translate" This reverts commit ab4df3441eb1327c65ac1f95b58708a9a81f55ab. --- .../Locale/ru-RU/_wega/genetics/basic.ftl | 1 + .../ghost/roles/ghost-role-component.ftl | 4 +- .../prototypes/_wega/body/parts/android.ftl | 4 +- .../prototypes/_wega/body/parts/harpy.ftl | 22 ++++++ .../catalog/fills/backpacks/duffelbag.ftl | 14 ++-- .../catalog/fills/crates/engineering.ftl | 2 + .../_wega/catalog/fills/items/belts.ftl | 4 +- .../_wega/entities/mobs/npcs/animals.ftl | 2 +- .../_wega/entities/mobs/player/polymorph.ftl | 4 ++ .../objects/misc/identification_cards.ftl | 14 ++-- .../_wega/entities/objects/misc/tile.ftl | 2 + .../entities/objects/vehicles/buckleable.ftl | 7 +- .../objects/weapons/guns/snipers/snipers.ftl | 3 +- .../Catalog/Fills/Backpacks/duffelbag.yml | 2 +- .../Mobs/Cyborgs/base_borg_chassis.yml | 2 +- .../Catalog/Fills/Backpacks/duffelbag.yml | 4 +- .../_Wega/Entities/Mobs/Species/android.yml | 8 +-- .../Weapons/Guns/Launchers/launchers.yml | 64 ++++++++---------- .../Entities/Objects/Weapons/Melee/sabre.yml | 2 +- Resources/Prototypes/borg_types.yml | 23 ------- .../Weapons/Guns/Rifles/carbine.rsi/meta.json | 8 +++ .../carbine.rsi/wielded-inhand-left.png | Bin 0 -> 1043 bytes .../carbine.rsi/wielded-inhand-right.png | Bin 0 -> 1058 bytes 23 files changed, 109 insertions(+), 87 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/body/parts/harpy.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/crates/engineering.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/player/polymorph.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/tile.ftl create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-right.png diff --git a/Resources/Locale/ru-RU/_wega/genetics/basic.ftl b/Resources/Locale/ru-RU/_wega/genetics/basic.ftl index 46e45704d1..1158c3e5c6 100644 --- a/Resources/Locale/ru-RU/_wega/genetics/basic.ftl +++ b/Resources/Locale/ru-RU/_wega/genetics/basic.ftl @@ -1,4 +1,5 @@ matter-eater-succes = Вы съели {$eat} +food-system-verb-eat = Съесть # Messages genetics-empathetic-thought-message = Вы вдруг стали замечать в окружающих больше, чем раньше. diff --git a/Resources/Locale/ru-RU/_wega/ghost/roles/ghost-role-component.ftl b/Resources/Locale/ru-RU/_wega/ghost/roles/ghost-role-component.ftl index 05f5209f59..3a0c043df7 100644 --- a/Resources/Locale/ru-RU/_wega/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/ru-RU/_wega/ghost/roles/ghost-role-component.ftl @@ -30,4 +30,6 @@ ghost-role-information-harvester-description = Самокопирующися с ghost-role-information-proteon-name = Протеон ghost-role-information-proteon-description = Слаб. ghost-role-information-possessed-blade-name = Одержимый меч -ghost-role-information-possessed-blade-description = Ты — древний клинок, пропитанный жаждой крови. Твоя душа, заточённая в стали, жаждет разрушения. \ No newline at end of file +ghost-role-information-possessed-blade-description = Ты — древний клинок, пропитанный жаждой крови. Твоя душа, заточённая в стали, жаждет разрушения. +ghost-role-information-taxibot-name = Таксибот +ghost-role-information-taxibot-description = Отвезите членов экипажа к месту назначения. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/body/parts/android.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/body/parts/android.ftl index f70788ffa8..fed58910d8 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/body/parts/android.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/body/parts/android.ftl @@ -1,6 +1,8 @@ ent-PartAndroid = часть тела андроида .desc = { ent-BaseItem.desc } -ent-HeadAndroid = торс андроида +ent-HeadAndroid = голова андроида + .desc = { ent-PartAndroid.desc } +ent-TorsoAndroid = торс андроида .desc = { ent-PartAndroid.desc } ent-LeftArmAndroid = левая рука андроида .desc = { ent-PartAndroid.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/body/parts/harpy.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/body/parts/harpy.ftl new file mode 100644 index 0000000000..74c43ca720 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/body/parts/harpy.ftl @@ -0,0 +1,22 @@ +ent-PartHarpy = часть тела гарпии + .desc = { ent-BaseItem.desc } +ent-TorsoHarpy = торс гарпии + .desc = { ent-PartHarpy.desc } +ent-HeadHarpy = голова гарпии + .desc = { ent-PartHarpy.desc } +ent-LeftArmHarpy = левая рука гарпии + .desc = { ent-PartHarpy.desc } +ent-RightArmHarpy = правая рука гарпии + .desc = { ent-PartHarpy.desc } +ent-LeftHandHarpy = левая кисть гарпии + .desc = { ent-PartHarpy.desc } +ent-RightHandHarpy = правая кисть гарпии + .desc = { ent-PartHarpy.desc } +ent-LeftLegHarpy = левая нога гарпии + .desc = { ent-PartHarpy.desc } +ent-RightLegHarpy = правая нога гарпии + .desc = { ent-PartHarpy.desc } +ent-LeftFootHarpy = левая стопа гарпии + .desc = { ent-PartHarpy.desc } +ent-RightFootHarpy = правая стопа гарпии + .desc = { ent-PartHarpy.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/backpacks/duffelbag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/backpacks/duffelbag.ftl index 7f290451f0..b4f8affe87 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/backpacks/duffelbag.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/backpacks/duffelbag.ftl @@ -1,13 +1,13 @@ -ent-ClothingBackpackDuffelVoidThruster = { ent-ClothingBackpackDuffel } +ent-ClothingBackpackDuffelVoidThruster = вещмешок с деталями двигателя .desc = { ent-ClothingBackpackDuffel.desc } -ent-ClothingBackpackDuffelVoidGyroscope = { ent-ClothingBackpackDuffel } +ent-ClothingBackpackDuffelVoidGyroscope = вещмешок с деталями гироскопа .desc = { ent-ClothingBackpackDuffel.desc } -ent-ADTClothingBackpackDuffelSyndicateFilledXC67 = { ent-ClothingBackpackDuffelSyndicate } - .desc = { ent-ClothingBackpackDuffelSyndicate.desc } +ent-ClothingBackpackDuffelSyndicateFilledXC67 = набор "xC-67" + .desc = Громко и мощно: Штурмовая винтовка "xC-67" и три магазина к нему на 45 патронов. .suffix = набор "xC-67" -ent-ADTClothingBackpackDuffelSyndicateFilledHristov = { ent-ClothingBackpackDuffelSyndicate } - .desc = { ent-ClothingBackpackDuffelSyndicate.desc } - .suffix = набор "Продвинутой снайперской винтовки" +ent-ClothingBackpackDuffelSyndicateFilledHristov = набор "Христов МК-2" + .desc = Метко и больно: Модернизированая снайперская винтовка "Христов МК-2" и 5 магазинов к нему. + .suffix = набор "Христов МК-2" diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/crates/engineering.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/crates/engineering.ftl new file mode 100644 index 0000000000..150a752e57 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/crates/engineering.ftl @@ -0,0 +1,2 @@ +ent-CrateEngineeringTEG = ящик с упакованным ТЭГ + .desc = Ящик с упаковками для восстановления работы ТЭГ, для тех случаев, когда он сбежал. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/items/belts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/items/belts.ftl index dd9cc95553..127938a6b7 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/items/belts.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/items/belts.ftl @@ -1,9 +1,9 @@ -ent-ClothingBeltAssaultFilled = { ent-ClothingBeltAssault } +ent-ClothingBeltMilitaryWebbingFilled = { ent-ClothingBeltAssault } .suffix = Заполненный .desc = { ent-ClothingBeltAssault.desc } ent-ClothingBeltSheathSyndicateFilled = { ent-ClothingBeltSheathSyndicate } .suffix = Заполненый .desc = { ent-ClothingBeltSheathSyndicate.desc } -ent-BeltSheathSyndieFilledBox = Завернутая рапира Синдиката +ent-BeltSheathSyndieFilledBox = завернутая рапира Синдиката .desc = Обёртка. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/npcs/animals.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/npcs/animals.ftl index b95759e0a6..9c58faa9d3 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/npcs/animals.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/npcs/animals.ftl @@ -18,7 +18,7 @@ ent-MobStokkeyVox = {ent-MobStokkey} .suffix = AI, Вокс ent-MobWolfling = вольпин - .desc = Собрат по генетике Вульпакинам. Их очень весело сжигать но аккуратно, у их есть план. + .desc = Собрат по генетике Вульпакинам. Их очень весело сжигать но аккуратно, у них есть план. ent-MobTajkey = фарва .desc = Маленькая версия Таярина. Он не похож на себя побольше. Чёрт возьми, что он вообще такое? \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/player/polymorph.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/player/polymorph.ftl new file mode 100644 index 0000000000..aeffe102e3 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/mobs/player/polymorph.ftl @@ -0,0 +1,4 @@ +ent-MobHulk = халк + .desc = "ОНО БОЛЬШОЕ И СИЛЬНОЕ!" +ent-MobZilla = Унатзила + .desc = { ent-MobHulk.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/identification_cards.ftl index c2c4526f1e..8500eca63b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/identification_cards.ftl @@ -1,16 +1,16 @@ -ent-BarberIDCard = ID карта барбера +ent-BarberIDCard = ID-карта барбера .desc = { ent-IDCardStandard.desc } -ent-GeneticistIDCard = ID карта генетика +ent-GeneticistIDCard = ID-карта генетика .desc = { ent-IDCardStandard.desc } -ent-SurgeonIDCard = ID карта хирурга +ent-SurgeonIDCard = ID-карта хирурга .desc = { ent-IDCardStandard.desc } -ent-CoronerIDCard = ID карта коронера +ent-CoronerIDCard = ID-карта коронера .desc = { ent-IDCardStandard.desc } -ent-CBURNLeaderIDcard = ID карта лидера РХБЗЗ +ent-CBURNLeaderIDcard = ID-карта лидера РХБЗЗ .desc = { ent-IDCardStandard.desc } -ent-BlueShieldIDCard = ID карта офицера синий щит +ent-BlueShieldIDCard = ID-карта офицера синий щит .desc = { ent-IDCardStandard.desc } -ent-PostmanIDCard = ID карта почтальона +ent-PostmanIDCard = ID-карта почтальона .desc = { ent-IDCardStandard.desc } ent-IDCardNeck = бейджик служебного доступа .desc = Специальный бейджик с доступами служебной группы, позволяя проходить в большенство помещений. Снимайте только его перед использованием! diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/tile.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/tile.ftl new file mode 100644 index 0000000000..310eb3f0e1 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/tile.ftl @@ -0,0 +1,2 @@ +ent-FloorTileItemSepia = стальная темная клетчатая плитка + .desc = { ent-FloorTileItemWhite.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/vehicles/buckleable.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/vehicles/buckleable.ftl index a5b7b1c044..4a040f62f3 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/vehicles/buckleable.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/vehicles/buckleable.ftl @@ -15,4 +15,9 @@ ent-VehicleWheelchair = инвалидная коляска .desc = Кресло на больших колесиках. Похоже, в нем можно передвигаться самостоятельно. ent-VehicleWheelchairFolded = { ent-VehicleWheelchair } .desc = { ent-VehicleWheelchair.desc } - .suffix = Сложенное \ No newline at end of file + .suffix = Сложенное +ent-VehicleUnicycle = моноцикл + .desc = У него всего одно колесо! +ent-VehicleUnicycleFolded = { ent-VehicleUnicycle } + .desc = { ent-VehicleUnicycle.desc } + .suffix = Сложенное diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/snipers/snipers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/snipers/snipers.ftl index 9b25441ad4..3c59e3abac 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/snipers/snipers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/snipers/snipers.ftl @@ -1,2 +1,3 @@ -ent-WeaponSniperHristovAdvanced = продвинутая снайперская винтовка +ent-WeaponSniperHristovAdvanced = Христов "МК-2" .desc = Продвинутая снайперская винтовка, использующая калибр .60 антиматериальный. Идеально подходит для работы в условиях тесных коридоров космической станции. + .suffix = Винтовка \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index d8363a68d9..d979fcf442 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -372,7 +372,7 @@ children: - id: DefibrillatorSyndicate - id: SyringeSpaceacillin # Corvax-Wega-Disease - amount: 2 # Corvax-Wega-Disease + amount: 1 # Corvax-Wega-Disease - id: MedkitCombatFilled amount: 4 - id: Tourniquet diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 7e451efb76..ab9c44be92 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -89,7 +89,7 @@ - type: Hands showInHands: false disableExplosionRecursion: true - canBeStripped: false + canBeStripped: true #Corvax-Wega-add - type: ComplexInteraction - type: IntrinsicRadioReceiver - type: IntrinsicRadioTransmitter diff --git a/Resources/Prototypes/_Wega/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_Wega/Catalog/Fills/Backpacks/duffelbag.yml index 557a8fd54b..8a969025ea 100644 --- a/Resources/Prototypes/_Wega/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/_Wega/Catalog/Fills/Backpacks/duffelbag.yml @@ -6,8 +6,8 @@ contents: - id: ThrusterMachineCircuitboard amount: 2 - - id: SheetSteel10 - - id: CapacitorStockPart + - id: SheetSteel + - id: MicroManipulatorStockPart amount: 8 - type: entity diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml b/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml index 60dfd45677..e2988a0e7b 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml @@ -219,10 +219,10 @@ Flammable: [ Touch ] Extinguish: [ Touch ] reactions: - - reagents: [ Water, SpaceCleaner ] - methods: [ Touch ] - effects: - - !type:WashCreamPie + # - reagents: [ Water, SpaceCleaner ] + # methods: [ Touch ] + # effects: + # - !type:WashCreamPie - reagents: [ Water ] methods: [ Touch ] effects: diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index fc85425911..178cd20fd3 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -1,44 +1,40 @@ - type: entity - name: rg 430 - parent: BaseStorageItem - id: WeaponRG430 + name: ORG 430 + parent: [ BaseWeaponLauncher, BaseGunWieldable, BaseMajorContraband ] + id: WeaponORG430 description: Load granade for optimal results. suffix: launcher components: - type: Sprite - sprite: _Wega/Objects/Weapons/Guns/Launchers/rg_430.rsi + sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi layers: - - state: base - - type: Storage - maxItemSize: Normal - grid: - - 0,0,0,1 - - 1,0,0,0 - whitelist: - tags: - - HandGrenade - - Grenade + - state: icon + map: ["enum.GunVisualLayers.Base"] + - type: Clothing + sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + slots: + - Back + - suitStorage + - type: Item + size: Huge + shape: + - 0,0,4,2 + - type: AmmoCounter - type: Gun - fireRate: 2 + fireRate: 1 selectedMode: SemiAuto availableModes: - - SemiAuto - - FullAuto + - SemiAuto soundGunshot: - path: /Audio/Effects/thunk.ogg - soundEmpty: - path: /Audio/Items/hiss.ogg - clumsyProof: true - - type: ContainerAmmoProvider - container: storagebase - - type: Item - size: Large - - type: Clothing - sprite: Objects/Weapons/Guns/Cannons/pie_cannon.rsi - quickEquip: false - slots: - - Back - - type: ContainerContainer - containers: - storagebase: !type:Container - ents: [] \ No newline at end of file + path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg + - type: BallisticAmmoProvider + whitelist: + tags: + - Grenade + capacity: 3 + proto: GrenadeFrag + soundInsert: + path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + - type: GunRequiresWield + - type: StaticPrice + price: 10000 \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/sabre.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/sabre.yml index 3742b3bdff..faca50e139 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/sabre.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/sabre.yml @@ -39,7 +39,7 @@ reflectProb: 0.1 spread: 90 - type: Item - size: Ginormous + size: Normal storedSprite: state: storage sprite: _Wega/Objects/Weapons/Melee/syndicate_rapier_storage_64x.rsi diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml index 02365a9d65..323e27263c 100644 --- a/Resources/Prototypes/borg_types.yml +++ b/Resources/Prototypes/borg_types.yml @@ -233,29 +233,6 @@ - Medical addComponents: -# Corvax-Wega-start - - type: UserInterface - interfaces: - enum.SiliconLawsUiKey.Key: - type: SiliconLawBoundUserInterface - requireInputValidation: false - enum.BorgUiKey.Key: - type: BorgBoundUserInterface - enum.StrippingUiKey.Key: - type: StrippableBoundUserInterface - enum.BorgSwitchableTypeUiKey.SelectBorgType: - type: BorgSelectTypeUserInterface - enum.CrewMonitoringUIKey.Key: - type: CrewMonitoringBoundUserInterface - - type: IntrinsicUI - uis: - enum.CrewMonitoringUIKey.Key: - toggleAction: ActionAGhostShowCrewMonitoring - - type: CrewMonitoringConsole - - type: DeviceNetwork - deviceNetId: Wireless - receiveFrequencyId: CrewMonitor -# Corvax-Wega-end - type: SolutionScanner - type: ShowHealthBars damageContainers: diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json index cac6899c48..1d53b36cd9 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json @@ -27,6 +27,14 @@ "name": "inhand-right", "directions": 4 }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, { "name": "equipped-BACKPACK", "directions": 4 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ece4edaccad2ebfe360efc5a3d555a67148ab0f1 GIT binary patch literal 1043 zcmV+u1nm2XP)Px&%}GQ-RCt{2n!#%0NDzj951EBMERhDq(&nJUG8%*q5zHx|AO`djd4U}L0C|Eu zK#sXDVNaU}$R&^ma1JJ{_tb~1JQ1{qg=I7uw)bF4C~{kFTTaYEeJ8oqT~(^?F4^uM zU>JsB7=~dOhA||LW3}xVHpPxfr@>&LMxzk`pePEYX^P=+2w;{B$8k^;1%|_6@8v=@ zBg--sMG?-=&y8YP+G){jJB|ZjmJk3)({#>hee5d9(fKqTPh(B{w|0u-Sm_>&?)Ce9 zgkcB(xVgCjFiXt!^>x*MFc_#LNpN;{W)xH$$LjR-6t}mxRa=rII6gjpk=3=(Xg!dt ztE;*Dwr#_49E``~>T{Z=0Prkf&Dm^ALR)Pyol)QS6#xh!dStV0thNUDzOST|xVX5` z4hn(*NI&XB1Q4}Ev0syn+NZ0hRLWo`v1SrcAj^jW|iLxwz(Ag@AqMAihXv{DE zK8_AQ;_2Jhx2ue&c`egM$OLx3`ByTVSQ&ntRK2-5)*A`-eVL@d?9F;ot9&U;f5qGFdwTuInm$_b1@Z z4({*oU-x@}DX!~QE27K8ZVRK|0!yIcw^E^E7=~dOhG7_nVHk#C80P=MHpCGx>2v9y zqT3Khyr$2k`T$*fn>eD2xM5wNIvbq@66=a1PEJnd#0{&6Bf1JQ0O0cSQknW(n89_$ z5fqq?W#WiU2r|f)iBCY206P1l6V~RLKZzrn)K6ra;s)x!=y0@)&*tn?{aEIcSQwB_ z0MQ1W0Mj_yvjB{OS;wbtcC#!~ral49TVMm?2t{r6Rnf+}J~zRfKA@{O;_2Jhw?c@X z5Ta))j_B(1XRp5l%=8GW3Nq#r&{Z7qSN{1sU7Ly{y87I;-aUOfI#jFpB(!^|i#USL z@xu@Am8m#ln}Q7E&aW+wcrBlu0^Ei;V$(jm3M956j$lCs!!XRI_zx*#-aucm_)-7> N002ovPDHLkV1l2__x}I@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..05277ed41fb60a4fc34719fa071a5e5d2dd4bdc8 GIT binary patch literal 1058 zcmV+-1l{|IP)Px&+(|@1RCt{2nlWzMNEC*D8u1#~ATS-!mXl&CGZ0uTfvtjNAY{P; zf*=TjAP9mWo`~zZvdilahePT6ekU5wng+P8D=o_c=Nz}Uw*~+V1_J<)mSq6|9LK@s z<)zV9lH>8XagOCNm1`O8VDSRwz~OKxRYK~9Ip^9$szkfy>gq~PCX@Ww^E`xMsLkim zfa|(42m(wdleJm&eP5~@{W9Z-;~4Y#Tzg?vsHYaebzP}q8DkOvk|e2htxa39oX^@8 zP=R3>J_>Xk2f)K}yuQ8$0NA#TVuEFYAV3&~vS|?*V^RpwBxDWCvhsWZU^<;*Hk)bB z-76jlAs~c+Wm)+w7cVlMPEky3Hk&~Rkr$$TeiTIzLR1#0it0aQ*-k=k#8!c9nZvvrg5 zeP7<(+|(|DTE0n=0C?DHRZCdM>eK!H?}Oh~cXw&!16r}C8|0i<1}>M&pVT&4E|;)v zJ1>qZjBVR_kftf# zzkB;=?`B!HDlYfp%nk+vn5GHGaq^@c$ARa0wUY;cD2gx|jq>BsXoSULQ9J(EU-|%m zbk31wnUN%kQMC;>F3bL#GkJPq;q~iN{PAauIF1d*n6zyhoO7gUii3lL{QM+I491vL zv$a?(V45b5kB`x03w$g6eqZ9h&k+B9K$c}2bvJ(4>-FT(;R|5z8R9rLfc1B5nx;Qz zS@uyKGsa}o2j2Ilak9N$FE7Bh>i!5c{w)CDIe=B$i4X)q5ClOG1VIo4K@bG-W7D;1 zqAk6r{3)sx-=%4yO}*L)75nvNx-d;_a(T3=S38*?2yk(6v37n}rir3SL*aQIq9{V! zdRq&y%`O8xm?l&MQnk%=o#XTK^Nn_uvR)Z=({1W)Er2pNs4j1LUzL0L3SCQEb&S=x zu8mgKQxyFQZR#~D003>1v*{C92vKR8DC+@V_qUqmx^9s=dab+#gb?V;G*O(@E=(F) zgMb3F~!0t^GWYQoA cf@p*P0T4j!ubJWL>;M1&07*qoM6N<$f`Z8D_y7O^ literal 0 HcmV?d00001 From de8e206eaa7570cdd9ac8aec27de733ed7099092 Mon Sep 17 00:00:00 2001 From: GaMEWAR360 Date: Wed, 7 Jan 2026 01:21:00 +0300 Subject: [PATCH 4/6] Reapply "commit2" This reverts commit caaab7eb623b0f438a9c03e7dd2bc31dab203a00. --- Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml | 2 +- .../Prototypes/_Wega/Entities/Mobs/Species/android.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml index bc3adf2391..2396d83b3a 100644 --- a/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml @@ -217,7 +217,7 @@ icon: { sprite: _Wega/Objects/Weapons/Melee/syndicate_rapier.rsi, state: icon } productEntity: BeltSheathSyndieFilledBox cost: - Telecrystal: 6 + Telecrystal: 8 categories: - UplinkWeaponry diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml b/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml index e2988a0e7b..60dfd45677 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml @@ -219,10 +219,10 @@ Flammable: [ Touch ] Extinguish: [ Touch ] reactions: - # - reagents: [ Water, SpaceCleaner ] - # methods: [ Touch ] - # effects: - # - !type:WashCreamPie + - reagents: [ Water, SpaceCleaner ] + methods: [ Touch ] + effects: + - !type:WashCreamPie - reagents: [ Water ] methods: [ Touch ] effects: From e215607b9f1f868533ab4980245c82fd300f3941 Mon Sep 17 00:00:00 2001 From: GaMEWAR360 Date: Mon, 9 Feb 2026 00:06:02 +0300 Subject: [PATCH 5/6] port --- .../interaction-popup-component.ftl | 4 +- Resources/Locale/ru-RU/borg/borg.ftl | 7 +- .../Locale/ru-RU/silicons/borg-module.ftl | 2 +- .../entities/mobs/cyborg/borg_chassis.ftl | 5 + .../objects/specific/robotics/borg_items.ftl | 12 ++ .../specific/robotics/borg_modules.ftl | 19 +- .../Specific/Robotics/borg_modules.yml | 5 +- .../Structures/Specific/Anomaly/cores.yml | 1 + .../Recipes/Lathes/Packs/robotics.yml | 4 +- .../Prototypes/Research/experimental.yml | 2 + .../Entities/Markers/Spawners/Random/misc.yml | 1 + .../Entities/Mobs/Cyborgs/borg_chassis.yml | 27 +++ .../Robotics/BorgItem/scienceitem.yml | 100 ++++++++++ .../Specific/Robotics/borg_modules.yml | 178 ++++++++++++++++++ .../_Wega/Recipes/Lathes/robotics.yml | 10 + Resources/Prototypes/_Wega/borg_types.yml | 46 ++++- Resources/Prototypes/borg_types.yml | 2 +- .../ServerInfo/Guidebook/Science/Cyborgs.xml | 1 + .../Mobs/Silicon/chassis.rsi/meta.json | 18 +- .../Mobs/Silicon/chassis.rsi/science.png | Bin 0 -> 1335 bytes .../Mobs/Silicon/chassis.rsi/science_e.png | Bin 0 -> 1009 bytes .../Mobs/Silicon/chassis.rsi/science_e_r.png | Bin 0 -> 980 bytes .../Mobs/Silicon/chassis.rsi/science_l.png | Bin 0 -> 1328 bytes .../actions_borg.rsi/adv-anomaly-module.png | Bin 0 -> 868 bytes .../actions_borg.rsi/anomaly-module.png | Bin 0 -> 806 bytes .../actions_borg.rsi/genetic-module.png | Bin 0 -> 432 bytes .../Actions/actions_borg.rsi/meta.json | 23 ++- .../actions_borg.rsi/node-scanner-module.png | Bin 0 -> 868 bytes .../Actions/actions_borg.rsi/rnd-rare.png | Bin 0 -> 936 bytes .../actions_borg.rsi/robotic-module.png | Bin 0 -> 506 bytes .../Actions/actions_borg.rsi/slime-module.png | Bin 0 -> 523 bytes .../borgmodule.rsi/icon-anomalies-adv.png | Bin 0 -> 235 bytes .../Robotics/borgmodule.rsi/icon-dna.png | Bin 0 -> 210 bytes .../Robotics/borgmodule.rsi/icon-rnd-rare.png | Bin 0 -> 202 bytes .../Robotics/borgmodule.rsi/icon-robotic.png | Bin 0 -> 231 bytes .../Robotics/borgmodule.rsi/icon-slime.png | Bin 0 -> 222 bytes .../Robotics/borgmodule.rsi/meta.json | 20 +- .../Robotics/borgmodule.rsi/science.png | Bin 0 -> 628 bytes 38 files changed, 473 insertions(+), 14 deletions(-) create mode 100644 Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/scienceitem.yml create mode 100644 Resources/Textures/Mobs/Silicon/chassis.rsi/science.png create mode 100644 Resources/Textures/Mobs/Silicon/chassis.rsi/science_e.png create mode 100644 Resources/Textures/Mobs/Silicon/chassis.rsi/science_e_r.png create mode 100644 Resources/Textures/Mobs/Silicon/chassis.rsi/science_l.png create mode 100644 Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/adv-anomaly-module.png create mode 100644 Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/anomaly-module.png create mode 100644 Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/genetic-module.png create mode 100644 Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/node-scanner-module.png create mode 100644 Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/rnd-rare.png create mode 100644 Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/robotic-module.png create mode 100644 Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/slime-module.png create mode 100644 Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-anomalies-adv.png create mode 100644 Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-dna.png create mode 100644 Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-rnd-rare.png create mode 100644 Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-robotic.png create mode 100644 Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-slime.png create mode 100644 Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/science.png 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..9bc39f29da --- /dev/null +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/scienceitem.yml @@ -0,0 +1,100 @@ +- 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 + autoRecharge: true + 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 + color: "#3db83b" + - 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/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 0000000000000000000000000000000000000000..15e3e0a1712def2f2a07da9492d8cba18e12ce1e GIT binary patch literal 1335 zcmV-71<3k|P)Px(@kvBMRCt{2T3b&WM-={Sk=Q}OF204x!J-MIxhRb+q%=g8@>=Dszcg=Eo+`Df zN?M6pq)Jl^A!rE-F$S~t${5GOeORB>FwE}Etar1d>?c{6@!9##&1cqo4iF%`FrM-yXD+`h;ipY#-*Pd^_K>2FfiB=Gh8PBfi^1FJ5k3OZD$aof% z36Dw-#>xUd`o!;c0uU$@cz(AmP|5&;%y?Cq^90u-Xcb#XPMyFo{1r5+(EW-9t78Iv zz3Ykpug(rI1W+8Uqos8H&%hx~L#dDHxK1`G3ZBiaNMC`+OI57@YuAD>l<6n|FY;q^|wH~V>;D%ePhchF!|y%0APQw<$OkRfz~NdoHQ0+Y6MTV9tG6^8rCQf;aq& znhzM)3DhI>%OB4NNZ@%2h~@*>E-m{aMW{7R(W3O#Im1bouJy~Go|tqkm`V;Hxb^2( zdz)D8ZJt`A{(Qat0c(R@tPOS@gH)Wr%F^}q_6Kc#)%gHd2e8qnjd^l{NQofZ{|JH%Fni*VE2^q>%i3kE4AeW_1e}qw$8Ms@7^vsvUhKn@TT6tn|cEnb&&ly!RuB3`6 zTx%$Kw)wGyqvJi5t(6cazjB01`6t6GDSKSAaIGPfX@0a*^yqlcSEn`#ek~Px&t4TybRCt{2nq5d!VHn5%GrtDe*HYH93sZz#P(h}Q5sDhp#f)G<1PXa03CD>y z)zzSjKp5?e1aAx!g4n>+i;$)C!4ms`2tAhJ){UmPhG~Ma)YHx0ag?d&%=2=ry+0Tm zJMZ)CdH(19+Ib&7XhC4FS@W8j$46#Tt;;?U}OxV2xe-r%)t7tlL}5#TxWxbzp65 zl3N>_(Q?xi4cbcMj6(Ez~yYy$s zPbn^!$r3drgK z7DI!0;L1ff9^dq|6`EVH%|^%-6nOWIN8D21Yb+Yyt2!;x=mE0kfRRYI&e8{QRCfY` zFafieEj1QdssQ$o+rFC<-%RO zic0UAq<&y?Vq4kr#I9VdN$68es0iR~AM+xXgmHYOPxseAY%p zAU@S5sncOO47bmFkAI7NTxiZgeMcFdUf0_I49Ky4Qq^g5xa;t_IS0$PB6o%h=Bb^( z)0+fC5dgsZj3LFQM|8%GwlQBcpwk0F5ma?nTst8eP&!`L-s57yTk>OQD5qV800000NkvXXu0mjfmweT` literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5b9eff15b67bf4e3ae849e7ac6d60b5eb8de998d GIT binary patch literal 980 zcmV;_11tQAP)Px&j!8s8RCt{2nq5d!VHn5%lld`7`dGmlVy5DS3$jEv)QhAP@?zaIK`-1z7@BdM zcvInpP!L3;ouLs*7kU*gEEYJKK?+X%xX8d`5l#yHLK-Fs#u}b3+!;qvJ3F4ktNH$5 zoWnWq^YA?XyYm{aNM-w zK4l4Dn|0X$lx%xF?8$VfDuNmUB*beVByZu%ApGvl=K(-T^xdH%E&-z5zQn?pp*Oi5 z>67D3`s6snobQQ=uzhG8bhL7e+=)$iI#$K>KAgnGNHH8^1E8f=)ML6W?S8GT0|2x?QUCygP1{oQo>9pXAT1#qk;vx#Cv5;($dltn z5+C$0V+nBFG_Vwh@#?>u$P!>~V+L)-aNi9SFj_6(GEcaXJON`kM~*w9#Jvg#li;|v z4`~V6nA?~^T0*vvys9e!u~nc|=V$vat1l}`^_s%moEdWh6zQdMKyYWq&Z+D)TM#X&X;Qj zV$XKl`HgA@;P+)KpH9l=>SMW1t1*&X{Z3C z10W3*fOG()p#qQ&fHYJ9(gBc$3P3sl(og|N2S6GsfSS&2vo70yPK@_!F9p@U3X1}d z)e(3y9gPxg#fK`xQCrWU`6?{_*F^OL+Y{T(mKE$QeA$jZl|&r@S|0TvnuK9$(fXh! zU=>7=f`u=G|JqxtVQSGTh#>e>8d;~qQmAX`?0FZu{Bflr6*cWTun_=Y~|Q-3i^V(|2A9sT8Mbli;f$^a}@ALe57&SQ}pXG|js@M>)&AM1;kQ3Js0MW#SKH&IL0e>QV(#`yN2BC&PSi0m^jcm7f207N9*o2=+E6hl!ONElGeNv>i z^Q}5R>#MHkmGPx(>PbXFRCt{2nq5p&XBfx-Z9yrDW^E@e5D{U7z(6KaK9)!es~H2#lG!W^Ocz-) z#InakpmC0?<(qzna@unQD*88O?1PDf#dXhDG$q86JCnT6FBN^uNm2_HSXSj#Ho zqo+G(XU6w;bH1ME>HqoXocC?dTYx|y5C{YUfj}S-2!y8&9-ZK%q{QX@&+i)*zSpW^ zlR6mGwJJvAAmcTI0!dO2YZRmM_QJ=`^=iS2u{GM!&&U$Rws&qW<| zArdi9qzM8#!RMyO6_orz;R}*IBBYrY@@nMsiHD+oxBuYy1-WDDP`k*XzI$@MRaF0g z4Y78+o$;Eq?f_YdHNo)+BExgvBps;CmtSu>h1jKJWK`zF%$^kVeCfVWB`--FLN^$@ z3zUvh-6od|^Fk|>QeaUs2LK4$Dts(%ddBrvLlYqY0B_DITa|LX`T>mr+j-*U{riGD zh(JytW&A=X{%W}aqj3DIbip@XbbOfQ<6;X93`rrpG=$GH*=g zr(d@=%S?!+Q2j-^e8SR*FATX8&wJk3YD zhJ@84H>gwq(S1FqatSNSj$x&JcbXkeVfJ9_Vg_Xvx{OGmdA*D&PG2a9R$)Y_~bvChd)zQ?vg6 z&4b1m5bblyyw-E=x!wJW4FopEfPjAsaKV2*2tExE1GpBzHN*g}1#k^9fNKFAF0RS>76+W`00{?7mRlG5olnR-Y3ILE& z%um?AtB7JlD=P*_B%$bE&^Nep4Z5g%qeUMd)@OT7@P|xFh1Qq8%Z|D?TI9+#==vA* z4H8Kx8&U&X9^Z)4(o5KiOE`D=SLlyhR7dO5wBNoV%m&cqPyW|=XR@p73dH*37L_z< zFWxMS!3Rm~K;Jm^>V?MMYo>?4z24<$qNRN;7%76km(j~Ng+6nHk5tS#bxi=S zcrKfTTa>hx$yY4P7lec=kGL^_dFP`h0QGe1tp#HSz{dp7VZhC=sJCo_XUkagVA=pL mzJILxw_=&BMIaCeEBO;8oY4I5&a(ah0000Px&9!W$&R9J=Wm&;ERQ51*2(wW9q@lou9aV!ODNU9|uS`$pvjmFdsi5nI!Tp2em z-1#TCV_`^4*Dh*;iHUJcTtSRzs@MkN2u8GGGqk}F>!Zc#Ll@YAQp93KWAwKez-B@AUUnm=IPtV>`_oYG7O)GfY$& z0BB_Ah8lRsY{j_Bzz5!LsDYLGdkOT1LI6x_FL@N7k1my9Uc zTwJ+%t!kZh6F3zL0wCMm1l?UkZE*y%z~eV@j{1552)er%HcfDBPk>?51h&Q^$!v;7 zcGgGW^oip*EOrh!0|4ao907X=0eeS9UQW-ku#hw2p_Tw6FGg2gyJiCWdfc>bUBr7Q zIf86+lgy@;NTlLMZqVJurcG9?7ON2jvrr#_FGUw4FGh{=G%o>gc$=Zt>AQR2?%mj` u=j+w~Z^AVRbozUK+mA_EfBe_%zrF%z-g5_LnrmDD00001KIqEP)Px%;7LS5R9J=Wm)}cMVHn3hy0fE4x3sbRH7(55MBQPu(vSp$f+8{n@A9Inyy~XE zBf9Czs~{o>yfAN~9~VVY8BWF|QP0lE%I$ zta&xC#C%3S%Rm?Ng6@1cOk@alGzmRIb@_quK*;UCGZ-^-r#H&U+ zY;8>W6wFw&2o!Ek7)GH}c2iYZopm`a4&M4dWZaYQN=zkm%5K6aXlpuQ6v8MxdOpm% z*^yL#vocmf--L%coV43pu-R%UGnKQvvV`TBxE<*omHhJ46<{2>$-VVTm?W@h3bMEy z#G%U^wTd_`j+_kK>b}B*p~pMMZ21jnnnrO^F`_}FNDz@kiTm#d{;K%h3;h%cV%DtM z)hy80%xJnsOpg)OK#i%`Dr&I*lChSQ?^sw_UBX}LLyf6Kwb&nL)s_Sdg$4wJfM^gI z4S4COZN(@UsXbCf-|bU`0&|RynQ@*8Q(0F7!0TsW0E$CFz88E&5+z0h-rNWXf;B}z z(>2tXN?eN*S&uM07~7~!mLM>@Fh{+;ZpUOv&HCq%PVa#LzzhEy z0M5A@2?ZCpY46!paex!{9zwx|+zDg^7zCbt8`^d8bWM7d+zBN0(UadD(&3))U=i5( kP3F}=`k8=(a5OvAZ-MkctbVia0000007*qoM6N<$g7s8%00000 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..beee0b4f335747a1af00bf4db78bfaf52660feb5 GIT binary patch literal 432 zcmV;h0Z;ykP)Px$YDq*vR9J=Wmp@BFQ5eR5L4ysFg9u_FT{Fbc2#2752o-m3XfTQ(il8shAoL0P z0tK~%s}3!-W&}l-z(Hu~pM)rPxFJ*!QG<2z=q+ftB6eT6@SMX7&%^I@81+NNyhx2n2}-BU1n4ONDNS69C2k zN+wleXuJo2-NQ8Hav6XrWsLLdtKSK@@KQl%U0s!oJihN^nTgDShWK`XQ($yu509^p z$q6s_&o`o9e=>wNqbmh4DAG%W{iBT3r1(QZC)1l%;Re*I>;f(ew+ufxIL?+B7z}Wx zUjUFj+2F45#zJDtlz=pjn=uUyibTUP^KlGqatr=aHUXP}O`x?1eEy*<4N&_gfEIX~ a+4TX$(~6IpUv1|A0000", + "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 0000000000000000000000000000000000000000..cbdfd383b2fa1c3e13a26ab9890b795018cb334c GIT binary patch literal 868 zcmV-q1DpJbP)Px&9!W$&R9J=Wmt9C4R}{y8?##|OMw=KG!P@qrENE6-QWqleNkS_G7b>L>#TR`j zzElW7k)#hP$%9BpXdwn<=}SonDU^OtrC2RUOQkEUt+p&uwg!cevP_L(n~pPkSNmXg z*e_>Rqba5R!{L6-J?B6Fxo0>R{_Cj79RvfR?Pn2mDIT-q+MR6hrFiU6g9ihlJQ8vN zGmcSzs05bcF`GmY0e~8Ohe}|B2YKTn0x9%EB~Xa66zJ~`m*p(-`Go5;dsbi|+(WSL zL|FuS!xm!`cglKpR|2^T^mm78d!d!fv)5f6z1J~_Dl5EkGGDFfpMJ<2?@0kuSQwT; z=26;}fMFS!!lJ6Wisz0TwdXs6A--Ii+I63&aH0mEZK|xGDH@VT;>zn699vD%P-O*0 zQcz{pHm}E<=d%#yDX^8{(ifv#JbSKWo2!785tzcXeWbV2j+y1C!18*+RzUJdT%8&# z*=7}3UQeJ%3Y(jTZPs7r{uL0Jmv$65vd!7H*LHo2ucFf!mVw9!R)4>jxAx7-_q*;Z zNg$V{EXin!#+5U}j!sUWd4pTPb?$J!QenoQ}u{$KYAiYDcNl zd^9%&`1Oz9XrO_axp~)pu7AQ~Xls9&FiVk54y~su*;~3T^rmz@|jAIIu(a1O{bY|w}N&cy`vayOO zEc|{yTeTImG&Yy?RS3r{$Tdx=M3oh4@NsMEGtPGn*lV%q8Y$~BNkiXJ;Ndo&hugf` zeyYfiD}hq1Q|R=K4B_|t=?!<1LdO(l-nz&L(wVfY3WeBHJurOj18%%~fk9cJCD4c} z5AfmS-5p1gj92oa%8KJTcQZgxhcTM-+gK;kj;da+Gf{G*mp(r z(ZtsPyxsK{i9~`>eUQauoTQlks u`uca)ga-*n1%iRlGrO2%@sD54{>R^4<9~e&U9Bqs0000Px&Vo5|nR9J=WmtSa8R~*MbZIh_}ZJs~RFi+os*srrgA)n$*UJn|qpj zZ__qv+=G50obx;9m*4MuzW4V#mkaMY%JL0Ypf~$Al0FUvMP4yclh1~NB~89D(5oR~ z%HNy~1+jh5R#F19p`ajPAOK*g^^}xAYGPDl8wfm~n|kde9X=lb!}sp3>H9_%Xlrl+ z@a&^Q3K6a``d?DxQ!)iQd_IvllbTb;Ej_d`w5k&8QoxxQFBl+M?FT@PM+mj{@Zr=g zaJa<&QYfN{S+oN66*AF%QP`^3$45q9h4AYs;H)sR z-kpWP2Ce__9CRqfj|@x<_Tm3{*P5NMssfeOZkW8O7?+e`(Crq<0i2uL#axcxA!gl9 zHufZEM{sU#C!LUlPf-fA?mkLv@+RH^uUNZbTlV!1cyV=ik(>$R+|oR?cx#hN{&1!0DNX-#)U8dacc_z>4a3g0waY!)CK-_KWU<{k0w{frC?j0dVls!x}$5iGN1^Sh4-|af`YME34i7 z(DD`D_Pu!ZjyXhc{{(1ze|kEmOkB$(i|+zpG4dw>k=$4a<-np87Iw^DuN>g+uVUZg zRyv}%x1rg-YT|-OE0w>H|NmD}pcGhDfsKLQxAtM8;(z}%dykiLUSE;HVrA3-0000< KMNUMnLSTZgPx$v`IukR9J=WSHEk*Kp1^3r7bOjgIEN+1q2BJaqCcAiY=v!QfE^nL zLU-Uq5Lw*R)L;%|M8P+4Th&;+d$5P;c)}gq(Se*aTPg#ykNe!+(&WWP30G1c05Ba- zaC3SI0BAl0bbvzc)?A4TsS9qt@>X5mf$K9e$jC5pc(hHDy1kb__;P?&Q8B8lUDSI& z65z`LyUkvPx$#Ysd#R9J=WSI2niF8%>jth^X9U zJ3?#pgwCV`9^_qMA8~Nm+^adzM;j3wQ(x%5zfofXA^y{GfsFA zG;IJNhLXsovuO2Rw5PtGOJ^a5k_&nCSjvHV`xZBk3VebC`En6H!2tkTKVL3tKPk(0 z!NutrHD0Kes656RnEM1nbWNKvf%+uPE#gtZ?0^y&06j14E{-Z|&zg*RN(L N002ovPDHLkV1mB=;cx%| literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..01df85ca9feaf33a37e9fee9c55e9ccd7cf04838 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}OFdm2Ln2z= zUR=n1$U)@z$Ms43HmM~=8FO{FCnoIrpK2K*@snIW8O_$wKf0idVYh}=aO%> zO-MiEyd+|&iR?GUIi@nYIc-n=Y~j5kJ4gC~*tuQ5KQb&|v{3$`m4kg-^{N;80)jn; j#Tk)%UU_LQ4e3(9<)+!7HE#+p(7_Czu6{1-oD!M<+T~=B literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..de145b9646f34b9ae3e6d29a7bc316aa0e9c56b4 GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}J)SO(ArY-_ zFYV=RHV|NaP#%^gKC@Nmq)tL-q!C|s1*6Wz^fr-9%{+z$Y7gDhIWO*6Uvq7i7SPLS1_<*3925woT6d)Onk(DEoc$%L}jDG|YCp;=B7)TiuZ-^IVx{ zgflR_U|GQ;aM1fqcD&*C;&Y$xMRGj+<-cOpvN;_cFU~Mktd-VM-`6q?=q?6NS3j3^ HP6jwN6lxZ1&rb?s>(c#K=&|sy85}Sb4q9e02>2O A)c^nh literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1bd7b674c964d00a46f611792e72dda1a779f6cf GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}3q4&NLn2y} z6C_v{Cy4Yk1sZU%Nf=C8mH7GD+5bO({4h9TU;FFGgV(RUH&yB^$!dt4H#L+=e74!z zcE;I@GafO_c&exOkmt^wn1X*>GHt&UGuYc}AKt8fTykB^?qdrUFFktT{CTfwPkDgA z=Sh}{kzry-cXu)e2ba?AA~rT7=LLKB&Rw`^lTfR_Is1X2-v^u7|1a+D2RXy-poRqN b69$HhYt-g`oZ7<=bS#6XtDnm{r-UW|?j2gU literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..187f996ba30097889a15e28899aa5548db77bdba GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Gdx`!Ln2y} z6C_v{Cy4Yk1sZU%Nf=C8mH7GD+5bO({4h9TU;FFGgV(RUH&yy9$vTi`X;r93Meo>**t`|p3etHhzQ?a2u@IKTdx zyPb!p-CHtqKHG$YexID@)v!;=%t_qwc^V`0^vs-vcT8a}a8qGm;MuLbuzdE, 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 0000000000000000000000000000000000000000..c23374b94a4316453c69b779363e89d802259c34 GIT binary patch literal 628 zcmV-)0*n2LP)Px%E=fc|R9J=Wls#w@VI0PP73(6DLPPPAAvCmF#2C@RTGFeOLcxzE#0*jwF`zXC zgAgaDPKH1fV+=%G93s^E)|J>2lBVe*B;N zKhHh)-U}KuXwb0F=-X=nqj6lR&)3$zsq_x^(j*WFDF3eCxGE~nOyF?S+U0UJ#D)cd zpM^rp-fa_D7W}-QG?0?98&%Ks9Dg!H5 zPALHEIf!oih~{8)w5DjWSkUYB?L3pu=Xbn727pEPoq7VQXAbP#nDq=GzBtoZkDsu# z73_p$A%j&g1GNOi39%(lWgzC=Abu@PvXG%tE|Gp4`!55>@BZf3)lXe{s!uTM8DP^q z#`=sItFS_{kReNCSK>CCt!J*vK+L-Vq#F^|4`HwHPo;1tCW*X!4Zy`qbAKx*fjK4k zAJQs*+XSHbB=?GX0#8HFTMBkHaN*UL zK7fUhjAH0t=0_<7rn3OZvWzUt9UCqsCIPs0^Ev?Y^G@RLKQ zk|gYQJJ9(mmL#cZzfvx-8h=NnT Date: Mon, 9 Feb 2026 00:24:59 +0300 Subject: [PATCH 6/6] fix --- .../Objects/Specific/Robotics/BorgItem/scienceitem.yml | 2 -- Resources/Prototypes/_Wega/tags.yml | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/scienceitem.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/scienceitem.yml index 9bc39f29da..c9e79835c0 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/scienceitem.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/scienceitem.yml @@ -5,7 +5,6 @@ description: An even smaller particle handcannon, designed for cyborg use. components: - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 10 - type: entity @@ -62,7 +61,6 @@ startingItem: PowerCellSmallNuclear disableEject: true swap: false - color: "#3db83b" - type: ActivatableUI key: enum.ResearchClientUiKey.Key - type: UserInterface 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