From 65cd54a7030879b751350c7ff2575e703db10f64 Mon Sep 17 00:00:00 2001 From: GaMEWAR360 Date: Mon, 5 Jan 2026 02:59:16 +0300 Subject: [PATCH 1/7] fix-translate --- .../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 + .../objects/specific/medical/healing.ftl | 3 + .../entities/objects/vehicles/buckleable.ftl | 7 +- .../weapons/guns/launchers/launchers..ftl | 2 + .../objects/weapons/guns/snipers/snipers.ftl | 3 +- .../Catalog/Fills/Backpacks/duffelbag.yml | 2 +- .../Mobs/Cyborgs/base_borg_chassis.yml | 3 +- .../Catalog/Fills/Backpacks/duffelbag.yml | 8 +-- .../_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 | 26 +------ .../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 25 files changed, 118 insertions(+), 91 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/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/launchers/launchers..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 46e45704d1e..1158c3e5c62 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 05f5209f591..3a0c043df7f 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 f70788ffa80..fed58910d8a 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 00000000000..74c43ca7209 --- /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 7f290451f0d..b4f8affe872 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 00000000000..150a752e571 --- /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 dd9cc95553f..127938a6b78 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 b95759e0a66..9c58faa9d30 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 00000000000..aeffe102e34 --- /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 888288da176..3d10c1a1247 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,14 +1,14 @@ -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 } 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 00000000000..310eb3f0e1d --- /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/specific/medical/healing.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/medical/healing.ftl index c20e2401b37..0e09ecf0c64 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/medical/healing.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/medical/healing.ftl @@ -102,4 +102,7 @@ ent-PillCanisterDylomet = баночка для таблеток .desc = { ent-PillCanister.desc } ent-PillCanisterFresium = баночка для таблеток .suffix = Фризиум 10 ед, 5 шт + .desc = { ent-PillCanister.desc } +ent-PillCanisterAmbuzol = баночка для таблеток + .suffix = Амбузол 10 ед, 5 шт .desc = { ent-PillCanister.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 a5b7b1c0441..4a040f62f3f 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/launchers/launchers..ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/launchers/launchers..ftl new file mode 100644 index 00000000000..c3143ff230b --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/launchers/launchers..ftl @@ -0,0 +1,2 @@ +ent-WeaponORG430 = ручной гранатомет "ОРГ-430" + .desc = Однозарядный ручной гранатомет, необходимый для подавления толпы и бронерованных целей в узкой местности. 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 9b25441ad44..3c59e3abacd 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 2f17c33dd2f..b23d56e430c 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -353,7 +353,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 b0e767ae63b..5b522ee964a 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 @@ -252,6 +252,7 @@ voice: BarksCitadelSynthetic2 # Corvax-Wega-Barks - type: TTS # Corvax-TTS voice: TrainingRobot + - type: OfferGiver # Corvax-Wega-Offer - type: entity abstract: true diff --git a/Resources/Prototypes/_Wega/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_Wega/Catalog/Fills/Backpacks/duffelbag.yml index 02d3b69e19c..8a969025eae 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 @@ -20,9 +20,7 @@ - id: SheetGlass1 amount: 2 - id: MicroManipulatorStockPart - amount: 2 - - id: CapacitorStockPart - + amount: 3 - type: entity parent: ClothingBackpackDuffelSyndicateBundle id: ClothingBackpackDuffelSyndicateFilledXC67 diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml b/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml index eb849627a5f..0e612496dbc 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml @@ -200,10 +200,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 c6bfd45e8f2..d1c3dbd8945 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -1,43 +1,39 @@ - type: entity - name: rg 430 - parent: BaseStorageItem - id: WeaponRG430 + name: ORG 430 + parent: [ BaseWeaponLauncher, BaseGunWieldable, BaseMajorContraband ] + id: WeaponORG430 description: Load granade for optimal results. 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 3742b3bdff3..faca50e1390 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 8d9dbdf46bd..4650f206c8d 100644 --- a/Resources/Prototypes/borg_types.yml +++ b/Resources/Prototypes/borg_types.yml @@ -62,7 +62,8 @@ damageContainers: - Inorganic - Silicon - - Android + - Android #Corvax-Wega-android-health-display\ + - type: ShowAccessReaderSettings # Corvax-Wega-end # Visual @@ -218,29 +219,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 cac6899c489..1d53b36cd9f 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 47e4a1291ed01fbe9011116867eab7c79318022f Mon Sep 17 00:00:00 2001 From: GaMEWAR360 Date: Mon, 5 Jan 2026 03:32:07 +0300 Subject: [PATCH 2/7] commit2 --- .../Prototypes/_Wega/Catalog/uplink_catalog.yml | 2 +- .../_Wega/Entities/Mobs/Species/android.yml | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml index bc3adf23919..2396d83b3ad 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 0e612496dbc..24b7e19be8c 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml @@ -200,15 +200,17 @@ 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: - - !type:Electrocute - shockDamage: 1 + - !type:HealthChange + damage: + types: + Shock: 0.5 - type: Operated raceGraph: AndroidSurgery limbLossChance: 1.75 From f0bd3c06651e170b7c7737ae7252768055ea64b9 Mon Sep 17 00:00:00 2001 From: GaMEWAR360 Date: Mon, 5 Jan 2026 16:36:58 +0300 Subject: [PATCH 3/7] Revert "commit2" This reverts commit 47e4a1291ed01fbe9011116867eab7c79318022f. --- .../Prototypes/_Wega/Catalog/uplink_catalog.yml | 2 +- .../_Wega/Entities/Mobs/Species/android.yml | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml index 2396d83b3ad..bc3adf23919 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 diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml b/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml index 24b7e19be8c..0e612496dbc 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml @@ -200,17 +200,15 @@ 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: - - !type:HealthChange - damage: - types: - Shock: 0.5 + - !type:Electrocute + shockDamage: 1 - type: Operated raceGraph: AndroidSurgery limbLossChance: 1.75 From da22440a409b997fe281ceec4da8ad0f0552e9fe Mon Sep 17 00:00:00 2001 From: GaMEWAR360 Date: Mon, 5 Jan 2026 16:37:13 +0300 Subject: [PATCH 4/7] 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 - .../objects/specific/medical/healing.ftl | 3 - .../entities/objects/vehicles/buckleable.ftl | 7 +- .../weapons/guns/launchers/launchers..ftl | 2 - .../objects/weapons/guns/snipers/snipers.ftl | 3 +- .../Catalog/Fills/Backpacks/duffelbag.yml | 2 +- .../Mobs/Cyborgs/base_borg_chassis.yml | 3 +- .../Catalog/Fills/Backpacks/duffelbag.yml | 8 ++- .../_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 | 26 ++++++- .../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 25 files changed, 91 insertions(+), 118 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/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/launchers/launchers..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 1158c3e5c62..46e45704d1e 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 3a0c043df7f..05f5209f591 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 fed58910d8a..f70788ffa80 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 74c43ca7209..00000000000 --- 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 b4f8affe872..7f290451f0d 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 150a752e571..00000000000 --- 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 127938a6b78..dd9cc95553f 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 9c58faa9d30..b95759e0a66 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 aeffe102e34..00000000000 --- 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 3d10c1a1247..888288da176 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,14 +1,14 @@ -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 } 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 310eb3f0e1d..00000000000 --- 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/specific/medical/healing.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/medical/healing.ftl index 0e09ecf0c64..c20e2401b37 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/medical/healing.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/medical/healing.ftl @@ -102,7 +102,4 @@ ent-PillCanisterDylomet = баночка для таблеток .desc = { ent-PillCanister.desc } ent-PillCanisterFresium = баночка для таблеток .suffix = Фризиум 10 ед, 5 шт - .desc = { ent-PillCanister.desc } -ent-PillCanisterAmbuzol = баночка для таблеток - .suffix = Амбузол 10 ед, 5 шт .desc = { ent-PillCanister.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 4a040f62f3f..a5b7b1c0441 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/launchers/launchers..ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/launchers/launchers..ftl deleted file mode 100644 index c3143ff230b..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/launchers/launchers..ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-WeaponORG430 = ручной гранатомет "ОРГ-430" - .desc = Однозарядный ручной гранатомет, необходимый для подавления толпы и бронерованных целей в узкой местности. 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 3c59e3abacd..9b25441ad44 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 b23d56e430c..2f17c33dd2f 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -353,7 +353,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 5b522ee964a..b0e767ae63b 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 @@ -252,7 +252,6 @@ voice: BarksCitadelSynthetic2 # Corvax-Wega-Barks - type: TTS # Corvax-TTS voice: TrainingRobot - - type: OfferGiver # Corvax-Wega-Offer - type: entity abstract: true diff --git a/Resources/Prototypes/_Wega/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_Wega/Catalog/Fills/Backpacks/duffelbag.yml index 8a969025eae..02d3b69e19c 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 @@ -20,7 +20,9 @@ - id: SheetGlass1 amount: 2 - id: MicroManipulatorStockPart - amount: 3 + amount: 2 + - id: CapacitorStockPart + - type: entity parent: ClothingBackpackDuffelSyndicateBundle id: ClothingBackpackDuffelSyndicateFilledXC67 diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml b/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml index 0e612496dbc..eb849627a5f 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml @@ -200,10 +200,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 d1c3dbd8945..c6bfd45e8f2 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -1,39 +1,43 @@ - type: entity - name: ORG 430 - parent: [ BaseWeaponLauncher, BaseGunWieldable, BaseMajorContraband ] - id: WeaponORG430 + name: rg 430 + parent: BaseStorageItem + id: WeaponRG430 description: Load granade for optimal results. 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 faca50e1390..3742b3bdff3 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 4650f206c8d..8d9dbdf46bd 100644 --- a/Resources/Prototypes/borg_types.yml +++ b/Resources/Prototypes/borg_types.yml @@ -62,8 +62,7 @@ damageContainers: - Inorganic - Silicon - - Android #Corvax-Wega-android-health-display\ - - type: ShowAccessReaderSettings + - Android # Corvax-Wega-end # Visual @@ -219,6 +218,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 1d53b36cd9f..cac6899c489 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 5ba8674a0de74a3c5548ad9623f2bf43ee1d8696 Mon Sep 17 00:00:00 2001 From: GaMEWAR360 Date: Wed, 7 Jan 2026 01:20:54 +0300 Subject: [PATCH 5/7] 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 + .../objects/specific/medical/healing.ftl | 3 + .../entities/objects/vehicles/buckleable.ftl | 7 +- .../weapons/guns/launchers/launchers..ftl | 2 + .../objects/weapons/guns/snipers/snipers.ftl | 3 +- .../Catalog/Fills/Backpacks/duffelbag.yml | 2 +- .../Mobs/Cyborgs/base_borg_chassis.yml | 3 +- .../Catalog/Fills/Backpacks/duffelbag.yml | 8 +-- .../_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 | 26 +------ .../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 25 files changed, 118 insertions(+), 91 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/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/launchers/launchers..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 46e45704d1e..1158c3e5c62 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 05f5209f591..3a0c043df7f 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 f70788ffa80..fed58910d8a 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 00000000000..74c43ca7209 --- /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 7f290451f0d..b4f8affe872 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 00000000000..150a752e571 --- /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 dd9cc95553f..127938a6b78 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 b95759e0a66..9c58faa9d30 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 00000000000..aeffe102e34 --- /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 888288da176..3d10c1a1247 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,14 +1,14 @@ -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 } 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 00000000000..310eb3f0e1d --- /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/specific/medical/healing.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/medical/healing.ftl index c20e2401b37..0e09ecf0c64 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/medical/healing.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/medical/healing.ftl @@ -102,4 +102,7 @@ ent-PillCanisterDylomet = баночка для таблеток .desc = { ent-PillCanister.desc } ent-PillCanisterFresium = баночка для таблеток .suffix = Фризиум 10 ед, 5 шт + .desc = { ent-PillCanister.desc } +ent-PillCanisterAmbuzol = баночка для таблеток + .suffix = Амбузол 10 ед, 5 шт .desc = { ent-PillCanister.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 a5b7b1c0441..4a040f62f3f 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/launchers/launchers..ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/launchers/launchers..ftl new file mode 100644 index 00000000000..c3143ff230b --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/launchers/launchers..ftl @@ -0,0 +1,2 @@ +ent-WeaponORG430 = ручной гранатомет "ОРГ-430" + .desc = Однозарядный ручной гранатомет, необходимый для подавления толпы и бронерованных целей в узкой местности. 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 9b25441ad44..3c59e3abacd 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 2f17c33dd2f..b23d56e430c 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -353,7 +353,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 b0e767ae63b..5b522ee964a 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 @@ -252,6 +252,7 @@ voice: BarksCitadelSynthetic2 # Corvax-Wega-Barks - type: TTS # Corvax-TTS voice: TrainingRobot + - type: OfferGiver # Corvax-Wega-Offer - type: entity abstract: true diff --git a/Resources/Prototypes/_Wega/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_Wega/Catalog/Fills/Backpacks/duffelbag.yml index 02d3b69e19c..8a969025eae 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 @@ -20,9 +20,7 @@ - id: SheetGlass1 amount: 2 - id: MicroManipulatorStockPart - amount: 2 - - id: CapacitorStockPart - + amount: 3 - type: entity parent: ClothingBackpackDuffelSyndicateBundle id: ClothingBackpackDuffelSyndicateFilledXC67 diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml b/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml index eb849627a5f..0e612496dbc 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml @@ -200,10 +200,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 c6bfd45e8f2..d1c3dbd8945 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -1,43 +1,39 @@ - type: entity - name: rg 430 - parent: BaseStorageItem - id: WeaponRG430 + name: ORG 430 + parent: [ BaseWeaponLauncher, BaseGunWieldable, BaseMajorContraband ] + id: WeaponORG430 description: Load granade for optimal results. 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 3742b3bdff3..faca50e1390 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 8d9dbdf46bd..4650f206c8d 100644 --- a/Resources/Prototypes/borg_types.yml +++ b/Resources/Prototypes/borg_types.yml @@ -62,7 +62,8 @@ damageContainers: - Inorganic - Silicon - - Android + - Android #Corvax-Wega-android-health-display\ + - type: ShowAccessReaderSettings # Corvax-Wega-end # Visual @@ -218,29 +219,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 cac6899c489..1d53b36cd9f 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 b9cdfbcd98e7e300f5a0b08efb37282ea1246d60 Mon Sep 17 00:00:00 2001 From: GaMEWAR360 Date: Wed, 7 Jan 2026 01:21:00 +0300 Subject: [PATCH 6/7] Reapply "commit2" This reverts commit caaab7eb623b0f438a9c03e7dd2bc31dab203a00. --- .../Prototypes/_Wega/Catalog/uplink_catalog.yml | 2 +- .../_Wega/Entities/Mobs/Species/android.yml | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml index bc3adf23919..2396d83b3ad 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 0e612496dbc..24b7e19be8c 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml @@ -200,15 +200,17 @@ 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: - - !type:Electrocute - shockDamage: 1 + - !type:HealthChange + damage: + types: + Shock: 0.5 - type: Operated raceGraph: AndroidSurgery limbLossChance: 1.75 From f3717211a101ab581f7b5a93614a62fb47e156a2 Mon Sep 17 00:00:00 2001 From: GaMEWAR360 Date: Tue, 27 Jan 2026 14:55:24 +0300 Subject: [PATCH 7/7] coolpr --- .../_wega/construction/recipes/crates.ftl | 1 + .../ru-RU/_wega/prototypes/access/groups.ftl | 1 + .../_wega/catalog/fills/boxes/misc.ftl | 3 ++ .../objects/misc/identification_cards.ftl | 2 ++ .../VendingMachines/Inventories/cart.yml | 1 + .../Entities/Mobs/Cyborgs/xenoborgs.yml | 1 + .../Prototypes/Entities/Mobs/NPCs/silicon.yml | 29 ++++++++++++++-- .../Roles/Jobs/Medical/paramedic.yml | 1 + Resources/Prototypes/_Wega/Access/misc.yml | 20 +++++++++++ .../_Wega/Catalog/Fills/Boxes/misc.yml | 20 ++++++++++- .../_Wega/Entities/Mobs/NPCs/silicon.yml | 16 +++++++++ .../Objects/Misc/identification_cards.yml | 32 ++++++++++++++++++ .../_Wega/InventoryTemplates/bots.yml | 2 ++ .../Crafting/Graphs/storage/cardboardbox.yml | 13 +++++++ .../_Wega/Recipes/Crafting/storage.yml | 8 +++++ Resources/Prototypes/borg_types.yml | 3 +- .../Misc/emenegrcy_id.rsi/equipped-NECK.png | Bin 0 -> 157 bytes .../Objects/Misc/emenegrcy_id.rsi/icon.png | Bin 0 -> 572 bytes .../Misc/emenegrcy_id.rsi/inhand-left.png | Bin 0 -> 252 bytes .../Misc/emenegrcy_id.rsi/inhand-right.png | Bin 0 -> 362 bytes .../Objects/Misc/emenegrcy_id.rsi/meta.json | 26 ++++++++++++++ 21 files changed, 175 insertions(+), 4 deletions(-) create mode 100644 Resources/Locale/ru-RU/_wega/construction/recipes/crates.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/boxes/misc.ftl create mode 100644 Resources/Prototypes/_Wega/InventoryTemplates/bots.yml create mode 100644 Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/storage/cardboardbox.yml create mode 100644 Resources/Prototypes/_Wega/Recipes/Crafting/storage.yml create mode 100644 Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/icon.png create mode 100644 Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/inhand-left.png create mode 100644 Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/inhand-right.png create mode 100644 Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/meta.json diff --git a/Resources/Locale/ru-RU/_wega/construction/recipes/crates.ftl b/Resources/Locale/ru-RU/_wega/construction/recipes/crates.ftl new file mode 100644 index 00000000000..4105b2f5ec9 --- /dev/null +++ b/Resources/Locale/ru-RU/_wega/construction/recipes/crates.ftl @@ -0,0 +1 @@ +construction-recipe-boxhug-cardboard = коробка обнимашек \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_wega/prototypes/access/groups.ftl b/Resources/Locale/ru-RU/_wega/prototypes/access/groups.ftl index 0dd3e00a133..4755870d066 100644 --- a/Resources/Locale/ru-RU/_wega/prototypes/access/groups.ftl +++ b/Resources/Locale/ru-RU/_wega/prototypes/access/groups.ftl @@ -1,2 +1,3 @@ extended-access-group = Расширенный доступ all-access-group = Полный доступ +ancillary-access-group = Служебный доступ \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/boxes/misc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/boxes/misc.ftl new file mode 100644 index 00000000000..0cf4233202a --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/boxes/misc.ftl @@ -0,0 +1,3 @@ +ent-BoxHugEmpty = { ent-BoxHug } + .desc = { ent-BoxHug.desc } + .suffix = Пустой \ No newline at end of file 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 3d10c1a1247..8500eca63b7 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 @@ -12,3 +12,5 @@ ent-BlueShieldIDCard = ID-карта офицера синий щит .desc = { ent-IDCardStandard.desc } ent-PostmanIDCard = ID-карта почтальона .desc = { ent-IDCardStandard.desc } +ent-IDCardNeck = бейджик служебного доступа + .desc = Специальный бейджик с доступами служебной группы, позволяя проходить в большенство помещений. Снимайте только его перед использованием! diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml index df4af37f522..98f007f93c7 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml @@ -4,6 +4,7 @@ PassengerPDA: 5 ClearPDA: 5 PassengerIDCard: 5 + IDCardNeck: 2 # Corvax-Wega-Add ClothingHeadsetGrey: 5 RubberStampApproved: 1 RubberStampDenied: 1 diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml index ae07eab6c99..5a4bb5318f5 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml @@ -48,6 +48,7 @@ damageContainers: - Inorganic - Silicon + - Android #Corvax-Wega-android-health-display - type: ItemSlots slots: cell_slot: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index 7c9f3ca95c5..ce9d100ae71 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -160,7 +160,7 @@ dataset: FirebotAd - type: entity - parent: MobSiliconBase + parent: [ MobSiliconBase, MobCombat ] # Corvax-Wega-Add id: MobHonkBot name: honkbot description: Horrifying. @@ -221,6 +221,16 @@ path: /Audio/Items/bikehorn.ogg params: variation: 0.125 +# Corvax-Wega-start + - type: MeleeWeapon + attackRate: 0.75 + hidden: true + soundHit: + collection: BananiumHorn + damage: + groups: + Brute: 0 +# Corvax-Wega-end - type: entity parent: MobHonkBot @@ -391,7 +401,7 @@ templateId: head - type: entity - parent: MobSiliconBase + parent: [MobSiliconBase, StripableInventoryBase] # Corvax-Wega-Add id: MobSupplyBot name: supplybot description: Delivers cargo! @@ -433,6 +443,10 @@ interfaces: enum.StorageUiKey.Key: type: StorageBoundUserInterface +# Corvax-Wega-start + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface +# Corvax-Wega-end - type: ContainerContainer containers: storagebase: !type:Container @@ -460,6 +474,17 @@ - Supply - type: Puller needsHands: false +# Corvax-Wega-start + - type: Body + prototype: HugBot + - type: ComplexInteraction + - type: Hands + showInHands: false + canBeStripped: true + - type: Inventory + templateId: bots + - type: OfferGiver +# Corvax-Wega-end - type: entity parent: [ MobSiliconBase, MobCombat ] diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index 83efafa3821..17edade2f79 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -28,6 +28,7 @@ id: ParamedicPDA ears: ClothingHeadsetMedical belt: ClothingBeltMedicalEMTFilled + neck: IDCardNeck storage: back: - EmergencyRollerBedSpawnFolded diff --git a/Resources/Prototypes/_Wega/Access/misc.yml b/Resources/Prototypes/_Wega/Access/misc.yml index f8b4f7583f2..a1e82564fb6 100644 --- a/Resources/Prototypes/_Wega/Access/misc.yml +++ b/Resources/Prototypes/_Wega/Access/misc.yml @@ -26,3 +26,23 @@ - Theatre - GenpopEnter - GenpopLeave + +- type: accessGroup + id: AncillaryAccess + name: ancillary-access-group + consoleAvaible: true + tags: + - Bar + - Cargo + - Chapel + - Engineering + - External + - Hydroponics + - Janitor + - Kitchen + - Maintenance + - Medical + - Research + - Salvage + - Service + - Theatre \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Catalog/Fills/Boxes/misc.yml b/Resources/Prototypes/_Wega/Catalog/Fills/Boxes/misc.yml index cb11b2c0142..2567c1545f5 100644 --- a/Resources/Prototypes/_Wega/Catalog/Fills/Boxes/misc.yml +++ b/Resources/Prototypes/_Wega/Catalog/Fills/Boxes/misc.yml @@ -6,4 +6,22 @@ - type: EntityTableContainerFill containers: entity_storage: !type:NestedSelector - tableId: MaintenanceLockerLoot \ No newline at end of file + tableId: MaintenanceLockerLoot + +- type: entity + parent: BoxCardboard + id: BoxHugEmpty + name: box of hugs + suffix: empty + description: A special box for sensitive people. + components: + - type: Sprite + layers: + - state: box_hug + - state: heart + - type: Item + heldPrefix: hug + - type: Tag + tags: + - BoxCardboard + - BoxHug \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/silicon.yml index 28082ac9ad5..212af7827c3 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/silicon.yml @@ -34,3 +34,19 @@ - type: Construction graph: TaxiBot node: bot + - type: Instrument + allowPercussion: false + - type: UserInterface + interfaces: + enum.InstrumentUiKey.Key: + type: InstrumentBoundUserInterface + - type: MovementSpeedModifier + baseAcceleration: 1 + baseFriction: 1 + baseWalkSpeed: 4.5 + baseSprintSpeed: 7 + - type: AmbientSound + sound: "/Audio/Effects/Vehicle/vehicleengineidle.ogg" + range: 10 + volume: -10 + enabled: true \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_Wega/Entities/Objects/Misc/identification_cards.yml index fac2a022151..2adae3cb73b 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Misc/identification_cards.yml @@ -1,3 +1,35 @@ +- type: entity + parent: Clothing + id: IDCardNeck + name: identification neck card + description: A card necessary to access various areas aboard the station. + components: + - type: Sprite + sprite: _Wega/Objects/Misc/emenegrcy_id.rsi + state: icon + - type: Clothing + slots: + - neck + sprite: _Wega/Objects/Misc/emenegrcy_id.rsi + - type: Label + currentLabel: ancillary-access-group + - type: Item + size: Small + heldPrefix: + sprite: _Wega/Objects/Misc/emenegrcy_id.rsi + storedRotation: -90 + - type: Access + groups: + - AncillaryAccess + - type: StationRecordKeyStorage + - type: Tag + tags: + - DoorBumpOpener + - WhitelistChameleon + - WhitelistChameleonIdCard + - type: EdibleMatter # Corvax-Wega-Add + canBeEaten: false # Corvax-Wega-Add + - type: entity parent: IDCardStandard id: BarberIDCard diff --git a/Resources/Prototypes/_Wega/InventoryTemplates/bots.yml b/Resources/Prototypes/_Wega/InventoryTemplates/bots.yml new file mode 100644 index 00000000000..00ed09c291f --- /dev/null +++ b/Resources/Prototypes/_Wega/InventoryTemplates/bots.yml @@ -0,0 +1,2 @@ +- type: inventoryTemplate + id: bots \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/storage/cardboardbox.yml b/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/storage/cardboardbox.yml new file mode 100644 index 00000000000..c884c9c9cb3 --- /dev/null +++ b/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/storage/cardboardbox.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: BoxHugEmpty + start: start + graph: + - node: start + edges: + - to: boxhugempty + steps: + - material: Cardboard + amount: 1 + doAfter: 4 + - node: boxhugempty + entity: BoxHugEmpty \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Recipes/Crafting/storage.yml b/Resources/Prototypes/_Wega/Recipes/Crafting/storage.yml new file mode 100644 index 00000000000..56f14dd93ee --- /dev/null +++ b/Resources/Prototypes/_Wega/Recipes/Crafting/storage.yml @@ -0,0 +1,8 @@ +- type: construction + id: BoxHugEmpty + name: construction-recipe-boxhug-cardboard + graph: BoxHugEmpty + startNode: start + targetNode: boxhugempty + category: construction-category-storage + objectType: Item \ No newline at end of file diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml index 4650f206c8d..a686e9b038c 100644 --- a/Resources/Prototypes/borg_types.yml +++ b/Resources/Prototypes/borg_types.yml @@ -58,11 +58,12 @@ # Corvax-Wega-start addComponents: + - type: ShowElectrocutionHUD - type: ShowHealthBars damageContainers: - Inorganic - Silicon - - Android #Corvax-Wega-android-health-display\ + - Android - type: ShowAccessReaderSettings # Corvax-Wega-end diff --git a/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/equipped-NECK.png b/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..5bc316e277f47bb0d3964687f447cd9432b140a0 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|!aZFaLn`LH zy?l|g!GOo%;48C#95>hO$Z)@8&z{ljx>x$aM3x|+aSqGh-Z+2L_)C-k}@P)Px$_DMuRR9J=WmcL5FKpe-vRk5>Uw^9q@61=6zO*%=Td!b^$K0zpjPTlR|BUs4L zC&&x9+!~OAv|LNKzJZJ2IbFCUm&+xMo%~LhOD^Bf?|Z-esUb&~&sRc@&oAl#fX~;D zTHZQao!OX6nih%Ula^OmhG@(M_7n2_b?IB2tU01TdNF#(xHIJ#xhL z$Pucc=XsdTW|cu?_5c9TubXIoxn9Hbyy&>mXkap#006=;EZrli1UB{r@*q@m05Jd?2;;Xv zT@(aC6uH_P(p)u`FaU60?;3j|7r+K0X|5hGc5k?^cQfy81z-b_gc&r4(Ok!KFn$QN zTTuAjt?LQ(F;o*6G>7PTPON~WtP_yZC80hEw?B8$*i^Yx>F>CjMDnSysa&dX0#eC0 zrtO|rF8Px>oleE~`>81U(^?6kYB+uf@%U2BeG5ZW`MdtFqv;odtWDm5=K47R0000< KMNUMnLSTY_r2)DC literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..74d158d670d817c873f372b3fa68dc535f6322f8 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|wt2cZhE&XX zduyTKVFRAlhtvH6Cn>scb?x@;C@5qIn)&rw)conXHoLc8GoDq@$z`u#;@U+I+BRe5vDNA{GbOb}BU7#2)gD8B6GzkeUo-wQfz tKfHfRX@7v%k-H8zIVW`8W(0Rfv?${3GcxuSD`ReD2oL}*slEq~KV(vS4hCq3_cH}THV zOQ)yK71<^UG!Fr+h^}KkeJcAFt1rT|1pMOU+;N=ik@U{}|bq{?spbYsqVzzx;cm zjJvhmy!OpmaW|&TT`j-HUhV5XtGazTcgsaj&po{1o}$bG_lXP->l>q88NM=@GOb`= zA?RT1(97_OF^eUDKR~&mszHkJ3iB0?1#%1AP?bdc-+AqP>Di+5kG@y9%qiu5^Ruw> x$})z%dyFr*e2Luit7!i(-3zC!nHd-!#Mf&dc#`h;(@h8DRZmwxmvv4FO#n~`n=1eS literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/meta.json b/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/meta.json new file mode 100644 index 00000000000..0d91df6f4de --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by BombasterDS - https://github.com/MetalSage/space-stories-archive/commit/26812e79c19c5f998bcbc445afbdceea625bc887, Executive sprited by SolsticeOfTheWinter, mody by Discord ID <@500744677352407051>", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +}