From f662943ce026864df57baa26c7741bf7180d9431 Mon Sep 17 00:00:00 2001 From: HorvatBG-gif Date: Sat, 15 Nov 2025 13:32:19 +0100 Subject: [PATCH 1/7] sherpa role --- .../Marine/Squads/SichSherpaItemComponent.cs | 9 + .../Squads/SichSherpaRiflemanComponent.cs | 9 + .../Marine/Squads/SichSherpaRiflemanSystem.cs | 30 + .../_Sich/armor/sich-rmc-bulky-backpack.ftl | 2 + Resources/Locale/en-US/_Sich/job/marines.ftl | 2 + .../Locale/en-US/_Sich/storage/storage.ftl | 2 + .../Catalog/Cargo/requisitions_catalog.yml | 2 + .../Entities/Clothing/Back/backpacks.yml | 31 +- .../_RMC14/Entities/Objects/Tools/flares.yml | 6 + .../Machines/Vending/Crew/requisitions.yml | 6 +- .../Catalog/Fills/Crates/bullet_boxes.yml | 8 + .../Entities/Clothing/Back/backpacks.yml | 16 + .../_Sich/Entities/Objects/Misc/pamphlets.yml | 26 + .../Entities/Objects/Weapons/Cases/sherpa.yml | 24 + .../Guns/Ammunition/Boxes/bullet_boxes.yml | 35 + .../_RMC14/Interface/map_blips.rsi/meta.json | 1739 +++++++++-------- .../_RMC14/Interface/map_blips.rsi/sherpa.png | Bin 0 -> 143 bytes .../cm_job_icons.rsi/hudsquad_sherpa.png | Bin 0 -> 175 bytes .../Interface/cm_job_icons.rsi/meta.json | 14 + .../Marines/ammo_rack.rsi/ammo_pack-0.png | Bin 0 -> 548 bytes .../Backpacks/Marines/ammo_rack.rsi/meta.json | 14 + .../Objects/Misc/pamphlets.rsi/meta.json | 14 + .../Misc/pamphlets.rsi/pamphlet_sherpa.png | Bin 0 -> 503 bytes 23 files changed, 1109 insertions(+), 880 deletions(-) create mode 100644 Content.Shared/_Sich/Marine/Squads/SichSherpaItemComponent.cs create mode 100644 Content.Shared/_Sich/Marine/Squads/SichSherpaRiflemanComponent.cs create mode 100644 Content.Shared/_Sich/Marine/Squads/SichSherpaRiflemanSystem.cs create mode 100644 Resources/Locale/en-US/_Sich/armor/sich-rmc-bulky-backpack.ftl create mode 100644 Resources/Locale/en-US/_Sich/job/marines.ftl create mode 100644 Resources/Locale/en-US/_Sich/storage/storage.ftl create mode 100644 Resources/Prototypes/_Sich/Catalog/Fills/Crates/bullet_boxes.yml create mode 100644 Resources/Prototypes/_Sich/Entities/Clothing/Back/backpacks.yml create mode 100644 Resources/Prototypes/_Sich/Entities/Objects/Misc/pamphlets.yml create mode 100644 Resources/Prototypes/_Sich/Entities/Objects/Weapons/Cases/sherpa.yml create mode 100644 Resources/Prototypes/_Sich/Entities/Objects/Weapons/Guns/Ammunition/Boxes/bullet_boxes.yml create mode 100644 Resources/Textures/_RMC14/Interface/map_blips.rsi/sherpa.png create mode 100644 Resources/Textures/_Sich/Interface/cm_job_icons.rsi/hudsquad_sherpa.png create mode 100644 Resources/Textures/_Sich/Interface/cm_job_icons.rsi/meta.json create mode 100644 Resources/Textures/_Sich/Objects/Clothing/Back/Backpacks/Marines/ammo_rack.rsi/ammo_pack-0.png create mode 100644 Resources/Textures/_Sich/Objects/Clothing/Back/Backpacks/Marines/ammo_rack.rsi/meta.json create mode 100644 Resources/Textures/_Sich/Objects/Misc/pamphlets.rsi/meta.json create mode 100644 Resources/Textures/_Sich/Objects/Misc/pamphlets.rsi/pamphlet_sherpa.png diff --git a/Content.Shared/_Sich/Marine/Squads/SichSherpaItemComponent.cs b/Content.Shared/_Sich/Marine/Squads/SichSherpaItemComponent.cs new file mode 100644 index 0000000000..b7ca295739 --- /dev/null +++ b/Content.Shared/_Sich/Marine/Squads/SichSherpaItemComponent.cs @@ -0,0 +1,9 @@ +using Robust.Shared.GameObjects; + +namespace Content.Shared._Sich.Marine.Squads +{ + [RegisterComponent] + public sealed partial class SichSherpaItemComponent : Component + { + } +} diff --git a/Content.Shared/_Sich/Marine/Squads/SichSherpaRiflemanComponent.cs b/Content.Shared/_Sich/Marine/Squads/SichSherpaRiflemanComponent.cs new file mode 100644 index 0000000000..8b89e87d95 --- /dev/null +++ b/Content.Shared/_Sich/Marine/Squads/SichSherpaRiflemanComponent.cs @@ -0,0 +1,9 @@ +using Robust.Shared.GameObjects; + +namespace Content.Shared._Sich.Marine.Squads +{ + [RegisterComponent] + public sealed partial class SichSherpaRiflemanComponent : Component + { + } +} diff --git a/Content.Shared/_Sich/Marine/Squads/SichSherpaRiflemanSystem.cs b/Content.Shared/_Sich/Marine/Squads/SichSherpaRiflemanSystem.cs new file mode 100644 index 0000000000..d110adf5c9 --- /dev/null +++ b/Content.Shared/_Sich/Marine/Squads/SichSherpaRiflemanSystem.cs @@ -0,0 +1,30 @@ +using Content.Shared.Inventory.Events; +using Content.Shared.Popups; +using Robust.Shared.GameObjects; +using Robust.Shared.Localization; + +namespace Content.Shared._Sich.Marine.Squads; + +public sealed class SichSherpaRiflemanSystem : EntitySystem +{ + [Dependency] private readonly SharedPopupSystem _popup = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnBeingEquippedAttempt); + } + + private void OnBeingEquippedAttempt(Entity item, ref BeingEquippedAttemptEvent args) + { + if (HasComp(args.EquipTarget)) + return; + + if (args.EquipTarget == args.Equipee) + _popup.PopupClient(Loc.GetString("rmc-bulky-backpack-user-unable"), args.Equipee, args.Equipee, PopupType.MediumCaution); + else + _popup.PopupEntity(Loc.GetString("rmc-bulky-backpack-target-unable", ("target", args.EquipTarget)), args.Equipee, args.Equipee, PopupType.MediumCaution); + + args.Cancel(); + } +} diff --git a/Resources/Locale/en-US/_Sich/armor/sich-rmc-bulky-backpack.ftl b/Resources/Locale/en-US/_Sich/armor/sich-rmc-bulky-backpack.ftl new file mode 100644 index 0000000000..8c7d271b31 --- /dev/null +++ b/Resources/Locale/en-US/_Sich/armor/sich-rmc-bulky-backpack.ftl @@ -0,0 +1,2 @@ +rmc-bulky-backpack-user-unable = Ви плутаєтесь в ременях та скидуєте це з себе! +rmc-bulky-backpack-target-unable = {$target} не знає що робити з усіма цими ременями! diff --git a/Resources/Locale/en-US/_Sich/job/marines.ftl b/Resources/Locale/en-US/_Sich/job/marines.ftl new file mode 100644 index 0000000000..c04a4e4359 --- /dev/null +++ b/Resources/Locale/en-US/_Sich/job/marines.ftl @@ -0,0 +1,2 @@ +sich-rmc-job-name-sherpa = Шерпа +sich-rmc-job-prefix-sherpa = ШРП diff --git a/Resources/Locale/en-US/_Sich/storage/storage.ftl b/Resources/Locale/en-US/_Sich/storage/storage.ftl new file mode 100644 index 0000000000..ce93583eb6 --- /dev/null +++ b/Resources/Locale/en-US/_Sich/storage/storage.ftl @@ -0,0 +1,2 @@ +rmc-storage-limit-not-flarebox = Це кріплення підтримує тільки коробку упаковок фаєрів М94! +rmc-storage-limit-one-bulletbox-smartgun = Кріплення замале щоб вмістити дві коробки з набоями для смарт-гану! diff --git a/Resources/Prototypes/_RMC14/Catalog/Cargo/requisitions_catalog.yml b/Resources/Prototypes/_RMC14/Catalog/Cargo/requisitions_catalog.yml index 661e844ddd..fdd35696e8 100644 --- a/Resources/Prototypes/_RMC14/Catalog/Cargo/requisitions_catalog.yml +++ b/Resources/Prototypes/_RMC14/Catalog/Cargo/requisitions_catalog.yml @@ -18,6 +18,8 @@ crate: RMCCrateBoxBulletsRifleAP - cost: 4000 crate: RMCCrateBoxAmmo458 + - cost: 6000 + crate: SichRMCCrateBoxBulletsSmartGun # Sich - cost: 2000 crate: RMCCrateBoxMagazineRifleM54C - cost: 4000 diff --git a/Resources/Prototypes/_RMC14/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_RMC14/Entities/Clothing/Back/backpacks.yml index 2c1f51fb5f..e2c26e93c1 100644 --- a/Resources/Prototypes/_RMC14/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/_RMC14/Entities/Clothing/Back/backpacks.yml @@ -247,9 +247,10 @@ - type: entity parent: CMBackpack id: RMCBackpackAmmo - name: ІМС для перенесення набоїв - description: A bare IMP frame with buckles designed to hold multiple ammo cans, but can fit any cumbersome box thanks to Marine ingenuity. Helps you lug around extra rounds or supplies. + name: LCF загального призначення + description: Поєднання ременів та пласталевого каркасу що дозволяє переносити громіздкі коробки. Незважаючи на скромність конструкції, далеко не кожен зможе нести цей тягар. components: + - type: SichSherpaItem # Sich - type: Item size: Huge sprite: _RMC14/Objects/Clothing/Back/Backpacks/Marines/standard.rsi @@ -259,23 +260,33 @@ layers: - state: ammo_pack-0 map: ["enum.StorageFillLayers.Fill"] - - type: ClothingSpeedModifier - walkModifier: 0.710 - sprintModifier: 0.710 - type: HeldSpeedModifier + walkModifier: 0.600 + sprintModifier: 0.600 - type: StorageFillVisualizer fillBaseName: ammo_pack maxFillLevels: 4 - type: Storage maxItemSize: Huge grid: - - 0,0,5,1 #3 slots + - 0,0,7,1 #4 slots Sich whitelist: - tags: + tags: #Sich - RMCAmmoBox - components: - - EmptySandbag - - FullSandbag + - RMCFlareBox + - SichBulletBoxSmartGun + - type: LimitedStorage # Sich + limits: + - popup: rmc-storage-limit-one-bulletbox-smartgun + whitelist: + tags: + - SichBulletBoxSmartGun + - popup: rmc-storage-limit-not-flarebox + blacklist: + tags: + - RMCFlareBox + whitelist: null + count: 3 - type: CMStorageVisualizer storageClosed: null storageOpen: null diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Tools/flares.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Tools/flares.yml index 218ef79e94..489a9abacb 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Tools/flares.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Tools/flares.yml @@ -161,6 +161,9 @@ name: box of M94 flare packs (x10) description: A box of M94 marking flare packs, to brighten up your day. components: + - type: Tag + tags: + - RMCFlareBox - type: Construction graph: RMCBoxMagazine node: RMCBoxPackFlareEmpty @@ -416,3 +419,6 @@ - type: Tag id: RMCPackFlareCAS + +- type: Tag + id: RMCFlareBox diff --git a/Resources/Prototypes/_RMC14/Entities/Structures/Machines/Vending/Crew/requisitions.yml b/Resources/Prototypes/_RMC14/Entities/Structures/Machines/Vending/Crew/requisitions.yml index 3de5e092ba..a9c182a0ac 100644 --- a/Resources/Prototypes/_RMC14/Entities/Structures/Machines/Vending/Crew/requisitions.yml +++ b/Resources/Prototypes/_RMC14/Entities/Structures/Machines/Vending/Crew/requisitions.yml @@ -152,8 +152,8 @@ amount: 1 - id: RMCSatchelWelder amount: 5 - - id: RMCBackpackAmmo - amount: 2 + # - id: RMCBackpackAmmo Sich + # amount: 2 - id: RMCBackpackRTO amount: 2 - id: RMCParachute @@ -286,6 +286,8 @@ amount: 10 - id: RMCMagazineSMGNailgun amount: 4 + - id: SichRMCKitSherpa # Sich + amount: 2 - name: Pamphlets entries: - id: CMPamphletJTAC diff --git a/Resources/Prototypes/_Sich/Catalog/Fills/Crates/bullet_boxes.yml b/Resources/Prototypes/_Sich/Catalog/Fills/Crates/bullet_boxes.yml new file mode 100644 index 0000000000..3cef8d5805 --- /dev/null +++ b/Resources/Prototypes/_Sich/Catalog/Fills/Crates/bullet_boxes.yml @@ -0,0 +1,8 @@ +- type: entity + parent: RMCCrateAmmo + id: SichRMCCrateBoxBulletsSmartGun + name: Ящик з коробкою набоїв для смарт-гану 10х30мм (3000шт.) + components: + - type: StorageFill + contents: + - id: SichRMCBoxBulletsSmartGun diff --git a/Resources/Prototypes/_Sich/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_Sich/Entities/Clothing/Back/backpacks.yml new file mode 100644 index 0000000000..7a074edc03 --- /dev/null +++ b/Resources/Prototypes/_Sich/Entities/Clothing/Back/backpacks.yml @@ -0,0 +1,16 @@ +- type: entity + id: SichRMCBackpackAmmoFolded + parent: BaseItem + name: LCF загального призначення + description: Згорнута вантажна рама для спорядження. Розгорніть перед використанням. + suffix: folded + components: + - type: Item + size: Huge + - type: Sprite + sprite: _Sich/Objects/Clothing/Back/Backpacks/Marines/ammo_rack.rsi + state: ammo_pack-0 + - type: SpawnItemsOnUse + items: + - id: RMCBackpackAmmo + amount: 1 diff --git a/Resources/Prototypes/_Sich/Entities/Objects/Misc/pamphlets.yml b/Resources/Prototypes/_Sich/Entities/Objects/Misc/pamphlets.yml new file mode 100644 index 0000000000..ecbd94300f --- /dev/null +++ b/Resources/Prototypes/_Sich/Entities/Objects/Misc/pamphlets.yml @@ -0,0 +1,26 @@ +- type: entity + parent: CMPamphlet + id: SichCMPamphletSherpa + name: довідник шерпи + description: Він навчить вас переносити важкі речі. + components: + - type: Sprite + sprite: _Sich/Objects/Misc/pamphlets.rsi + state: pamphlet_sherpa + - type: SkillPamphlet + addComps: + - type: SichSherpaRifleman + addSkills: + RMCSkillFireman: 1 + giveJobTitle: sich-rmc-job-name-sherpa + givePrefix: sich-rmc-job-prefix-sherpa + isAppendPrefix: false + giveIcon: + sprite: _Sich/Interface/cm_job_icons.rsi + state: hudsquad_sherpa + giveMapBlip: + sprite: /Textures/_RMC14/Interface/map_blips.rsi + state: sherpa + jobWhitelists: + - popup: rmc-pamphlets-rifleman-warning + jobProto: CMRifleman diff --git a/Resources/Prototypes/_Sich/Entities/Objects/Weapons/Cases/sherpa.yml b/Resources/Prototypes/_Sich/Entities/Objects/Weapons/Cases/sherpa.yml new file mode 100644 index 0000000000..8ed2caada3 --- /dev/null +++ b/Resources/Prototypes/_Sich/Entities/Objects/Weapons/Cases/sherpa.yml @@ -0,0 +1,24 @@ +- type: entity + parent: RMCKitBase + id: SichRMCKitSherpa + name: набір шерпи + description: Набір всього необхідного для транспортування громіздких вантажів на полі бою. + components: + - type: Storage + maxItemSize: Huge + grid: + - 0,0,5,1 + - type: Sprite + sprite: _RMC14/Objects/Storage/procase_mini.rsi + - type: Icon + sprite: _RMC14/Objects/Storage/procase_mini.rsi + layers: + - state: closed + map: [ base ] + - state: loader + map: [ label ] + - type: StorageFill + contents: + - id: SichRMCBackpackAmmoFolded + - id: SichCMPamphletSherpa + - id: RMCRangefinder diff --git a/Resources/Prototypes/_Sich/Entities/Objects/Weapons/Guns/Ammunition/Boxes/bullet_boxes.yml b/Resources/Prototypes/_Sich/Entities/Objects/Weapons/Guns/Ammunition/Boxes/bullet_boxes.yml new file mode 100644 index 0000000000..42fd363d08 --- /dev/null +++ b/Resources/Prototypes/_Sich/Entities/Objects/Weapons/Guns/Ammunition/Boxes/bullet_boxes.yml @@ -0,0 +1,35 @@ +- type: entity + parent: RMCBoxBulletsBase + id: SichRMCBoxBulletsSmartGun + name: коробка з набоями смарт-гану (10x30мм) + description: Коробка з набоями 10х30мм. Використовується для поповнення магазинів смарт-гану. Має шкіряну лямку, що дозволяє носити її на спині. + components: + - type: Tag + tags: + - SichBulletBoxSmartGun + - type: Sprite + layers: + - state: rifle_box + color: "#7b8246" + - state: rifle_box_marking + color: "#ffcb26" + - state: rifle_box_generic + color: "#ffcb26" + - state: rifle_ammo_full_rounds_base + map: [ "enum.BulletBoxLayers.Fill" ] + - state: rifle_ammo_full_rounds_color + map: [ "enum.BulletBoxLayers2.Fill" ] + color: "#ffc000" + - type: BulletBox + max: 3000 + amount: 3000 + bulletType: RMCBoxBulletsSmartGun + - type: ClothingSpeedModifier + walkModifier: 0.700 + sprintModifier: 0.700 + - type: HeldSpeedModifier + walkModifier: 0.700 + sprintModifier: 0.700 + +- type: Tag + id: SichBulletBoxSmartGun diff --git a/Resources/Textures/_RMC14/Interface/map_blips.rsi/meta.json b/Resources/Textures/_RMC14/Interface/map_blips.rsi/meta.json index 8e6959bca2..6a5fd9dcdb 100644 --- a/Resources/Textures/_RMC14/Interface/map_blips.rsi/meta.json +++ b/Resources/Textures/_RMC14/Interface/map_blips.rsi/meta.json @@ -1,876 +1,879 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/5368c7a5342a52d204eac3d6cc45228f3b976893/icons/ui_icons/map_blips.dmi, background_free and pmc tl by github noctyrnal, lesser_carrier by Vermidia, aegiscrate, aegisob, and forecon_synth by Sigma Draconis, edited runner to create lurker, and edited supply to create pylon by github DummeHytteOst", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/5368c7a5342a52d204eac3d6cc45228f3b976893/icons/ui_icons/map_blips.dmi, background_free and pmc tl by github noctyrnal, lesser_carrier by Vermidia, aegiscrate, aegisob, and forecon_synth by Sigma Draconis, edited runner to create lurker, and edited supply to create pylon by github DummeHytteOst, sherpa sprite by github HorvatBG-gif", "size": { "x": 7, "y": 7 }, - "states": [ - { - "name": "background" - }, - { - "name": "background_charlie" - }, - { - "name": "background_delta" - }, - { - "name": "background_bravo" - }, - { - "name": "background_alpha" - }, - { - "name": "background_echo" - }, - { - "name": "background_foxtrot" - }, - { - "name": "background_intel" - }, - { - "name": "background_cbrn" - }, - { - "name": "background_forecon" - }, - { - "name": "unknown" - }, - { - "name": "defibbable", - "delays": [ - [ - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135 - ] - ] - }, - { - "name": "defibbable2", - "delays": [ - [ - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135 - ] - ] - }, - { - "name": "defibbable3", - "delays": [ - [ - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135 - ] - ] - }, - { - "name": "defibbable4", - "delays": [ - [ - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135 - ] - ] - }, - { - "name": "undefibbable", - "delays": [ - [ - 0.135, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13 - ] - ] - }, - { - "name": "vc" - }, - { - "name": "io" - }, - { - "name": "engi" - }, - { - "name": "private" - }, - { - "name": "leader" - }, - { - "name": "tl" - }, - { - "name": "spec" - }, - { - "name": "spotter" - }, - { - "name": "loader" - }, - { - "name": "smartgunner" - }, - { - "name": "medic" - }, - { - "name": "medic_k9" - }, - { - "name": "synth" - }, - { - "name": "synth_k9" - }, - { - "name": "forecon_synth" - }, - { - "name": "joe" - }, - { - "name": "background_civillian" - }, - { - "name": "correspondent" - }, - { - "name": "surv" - }, - { - "name": "background_xeno" - }, - { - "name": "xeno_ruler" - }, - { - "name": "xenoleader" - }, - { - "name": "xeno" - }, - { - "name": "larva" - }, - { - "name": "parasite" - }, - { - "name": "lesser_drone" - }, - { - "name": "drone" - }, - { - "name": "runner" - }, - { - "name": "defender" - }, - { - "name": "sentinel" - }, - { - "name": "hivelord" - }, - { - "name": "burrower" - }, - { - "name": "carrier" - }, - { - "name": "warrior" - }, - { - "name": "lurker" - }, - { - "name": "spitter" - }, - { - "name": "ravager" - }, - { - "name": "crusher" - }, - { - "name": "praetorian" - }, - { - "name": "boiler" - }, - { - "name": "predalien_larva" - }, - { - "name": "predalien" - }, - { - "name": "xenoqueen" - }, - { - "name": "border", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "sentry_passive" - }, - { - "name": "sentry_firing", - "delays": [ - [ - 0.3, - 0.3 - ] - ] - }, - { - "name": "supply", - "delays": [ - [ - 0.25, - 0.25 - ] - ] - }, - { - "name": "sensor_tower", - "delays": [ - [ - 0.4, - 0.4, - 0.4, - 0.4 - ] - ] - }, - { - "name": "asrs", - "delays": [ - [ - 0.2, - 0.2 - ] - ] - }, - { - "name": "uav" - }, - { - "name": "xenotunnel" - }, - { - "name": "cluster", - "delays": [ - [ - 4, - 0.15, - 0.15 - ] - ] - }, - { - "name": "core", - "delays": [ - [ - 0.7, - 0.125, - 0.125, - 0.125 - ] - ] - }, - { - "name": "background_command" - }, - { - "name": "pilot" - }, - { - "name": "so" - }, - { - "name": "aso" - }, - { - "name": "xo" - }, - { - "name": "co" - }, - { - "name": "ce" - }, - { - "name": "co_wo" - }, - { - "name": "xo_wo" - }, - { - "name": "gp" - }, - { - "name": "background_mp" - }, - { - "name": "pve" - }, - { - "name": "pve_leader" - }, - { - "name": "pve_inspector" - }, - { - "name": "pve_advisor" - }, - { - "name": "mp" - }, - { - "name": "cmp" - }, - { - "name": "warden" - }, - { - "name": "rmp" - }, - { - "name": "crmp" - }, - { - "name": "hgsl" - }, - { - "name": "vhg" - }, - { - "name": "hgspec" - }, - { - "name": "hg" - }, - { - "name": "background_medical" - }, - { - "name": "sea" - }, - { - "name": "recruiter" - }, - { - "name": "doctor" - }, - { - "name": "researcher" - }, - { - "name": "background_medical_WO" - }, - { - "name": "cmo_wo" - }, - { - "name": "chemist_wo" - }, - { - "name": "background_shipside" - }, - { - "name": "ot" - }, - { - "name": "mt" - }, - { - "name": "dcc" - }, - { - "name": "mst" - }, - { - "name": "nurse" - }, - { - "name": "cargo" - }, - { - "name": "wo_mcrew" - }, - { - "name": "background_sof" - }, - { - "name": "sof_officer" - }, - { - "name": "sof_sg" - }, - { - "name": "sof_sl" - }, - { - "name": "pve_chief_inspector" - }, - { - "name": "background_cmb" - }, - { - "name": "deputy" - }, - { - "name": "icc" - }, - { - "name": "cmb_syn" - }, - { - "name": "obs" - }, - { - "name": "cmb_spc" - }, - { - "name": "background_nspa" - }, - { - "name": "background_twe" - }, - { - "name": "rmc_teamleader" - }, - { - "name": "rmc_lieutenant" - }, - { - "name": "rmc_commander" - }, - { - "name": "rmc_major" - }, - { - "name": "rmc_rifleman" - }, - { - "name": "rmc_medic" - }, - { - "name": "rmc_sg" - }, - { - "name": "rmc_marksman" - }, - { - "name": "rmc_breacher" - }, - { - "name": "background_pmc" - }, - { - "name": "pmc_sd" - }, - { - "name": "pmc_ld" - }, - { - "name": "pmc_md" - }, - { - "name": "pmc_mi" - }, - { - "name": "pmc_td" - }, - { - "name": "pmc_spec" - }, - { - "name": "pmc_gun" - }, - { - "name": "pmc_vc" - }, - { - "name": "pmc_mp" - }, - { - "name": "pmc_handler" - }, - { - "name": "pmc_sg" - }, - { - "name": "pmc_syn" - }, - { - "name": "pmc_tl" - }, - { - "name": "whiteout" - }, - { - "name": "background_goon" - }, - { - "name": "goon_standard" - }, - { - "name": "goon_leader" - }, - { - "name": "goon_med" - }, - { - "name": "goon_engi" - }, - { - "name": "goon_sci" - }, - { - "name": "trainee" - }, - { - "name": "cl" - }, - { - "name": "junior_exec" - }, - { - "name": "senior_exec" - }, - { - "name": "exec_spec" - }, - { - "name": "exec_super" - }, - { - "name": "background_wy_management" - }, - { - "name": "ass_man" - }, - { - "name": "div_man" - }, - { - "name": "chief_man" - }, - { - "name": "director" - }, - { - "name": "background_spp" - }, - { - "name": "background_spp_alpha" - }, - { - "name": "background_spp_bravo" - }, - { - "name": "background_spp_charlie" - }, - { - "name": "background_spp_delta" - }, - { - "name": "spp_slt" - }, - { - "name": "spp_lt" - }, - { - "name": "spp_co" - }, - { - "name": "spp_xo" - }, - { - "name": "spp_synth" - }, - { - "name": "spp_comsl" - }, - { - "name": "spp_com" - }, - { - "name": "spp_commed" - }, - { - "name": "spp_med" - }, - { - "name": "spp_sapper" - }, - { - "name": "spp_spec" - }, - { - "name": "spp_sl" - }, - { - "name": "spp_sl_a" - }, - { - "name": "spp_pvt" - }, - { - "name": "spp_cont" - }, - { - "name": "spp_cargo" - }, - { - "name": "spp_sci" - }, - { - "name": "spp_sec" - }, - { - "name": "spp_doc" - }, - { - "name": "spp_mp" - }, - { - "name": "spp_vc" - }, - { - "name": "spp_plt" - }, - { - "name": "background_clf" - }, - { - "name": "clf_synth" - }, - { - "name": "clf_sl" - }, - { - "name": "clf_sl_a" - }, - { - "name": "clf_mil" - }, - { - "name": "clf_med" - }, - { - "name": "clf_engi" - }, - { - "name": "clf_spec" - }, - { - "name": "background_ua" - }, - { - "name": "tissa" - }, - { - "name": "peacekeeper" - }, - { - "name": "hefa" - }, - { - "name": "background_cultist" - }, - { - "name": "cultist" - }, - { - "name": "cult_leader" - }, - { - "name": "cult_synth" - }, - { - "name": "predator" - }, - { - "name": "thrall" - }, - { - "name": "bracer_stolen" - }, - { - "name": "predator_ancient" - }, - { - "name": "predator_leader" - }, - { - "name": "predator_elder" - }, - { - "name": "predator_elite" - }, - { - "name": "predator_young" - }, - { - "name": "hellhound" - }, - { - "name": "mortar" - }, - { - "name": "background_visit_command" - }, - { - "name": "dep_director" - }, - { - "name": "goon_sci_lead" - }, - { - "name": "field_doctor" - }, - { - "name": "lesser_carrier" - }, - { - "name": "background_free" - }, - { - "name": "recovery_node" - }, - { - "name": "morpher", - "delays": [ - [ - 4.0, - 0.05, - 0.1, - 0.2, - 0.5 - ] - ] - }, - { - "name": "spec_demo" - }, - { - "name": "spec_grenadier" - }, - { - "name": "spec_sniper" - }, - { - "name": "spec_anti_materiel_sniper" - }, - { - "name": "aegis_ob_2" - }, - { - "name": "aegiscrate", - "delays": [ - [ - 2.0, - 2.0 - ] - ] - }, - { - "name": "aegisob", - "delays": [ - [ - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08 - ] - ] - }, - { - "name": "pylon", - "delays": [ - [ - 0.25, - 0.25 - ] - ] - } - ] + "states": [ + { + "name": "sherpa" + }, + { + "name": "background" + }, + { + "name": "background_charlie" + }, + { + "name": "background_delta" + }, + { + "name": "background_bravo" + }, + { + "name": "background_alpha" + }, + { + "name": "background_echo" + }, + { + "name": "background_foxtrot" + }, + { + "name": "background_intel" + }, + { + "name": "background_cbrn" + }, + { + "name": "background_forecon" + }, + { + "name": "unknown" + }, + { + "name": "defibbable", + "delays": [ + [ + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135 + ] + ] + }, + { + "name": "defibbable2", + "delays": [ + [ + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135 + ] + ] + }, + { + "name": "defibbable3", + "delays": [ + [ + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135 + ] + ] + }, + { + "name": "defibbable4", + "delays": [ + [ + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135 + ] + ] + }, + { + "name": "undefibbable", + "delays": [ + [ + 0.135, + 0.13, + 0.13, + 0.13, + 0.13, + 0.13, + 0.13 + ] + ] + }, + { + "name": "vc" + }, + { + "name": "io" + }, + { + "name": "engi" + }, + { + "name": "private" + }, + { + "name": "leader" + }, + { + "name": "tl" + }, + { + "name": "spec" + }, + { + "name": "spotter" + }, + { + "name": "loader" + }, + { + "name": "smartgunner" + }, + { + "name": "medic" + }, + { + "name": "medic_k9" + }, + { + "name": "synth" + }, + { + "name": "synth_k9" + }, + { + "name": "forecon_synth" + }, + { + "name": "joe" + }, + { + "name": "background_civillian" + }, + { + "name": "correspondent" + }, + { + "name": "surv" + }, + { + "name": "background_xeno" + }, + { + "name": "xeno_ruler" + }, + { + "name": "xenoleader" + }, + { + "name": "xeno" + }, + { + "name": "larva" + }, + { + "name": "parasite" + }, + { + "name": "lesser_drone" + }, + { + "name": "drone" + }, + { + "name": "runner" + }, + { + "name": "defender" + }, + { + "name": "sentinel" + }, + { + "name": "hivelord" + }, + { + "name": "burrower" + }, + { + "name": "carrier" + }, + { + "name": "warrior" + }, + { + "name": "lurker" + }, + { + "name": "spitter" + }, + { + "name": "ravager" + }, + { + "name": "crusher" + }, + { + "name": "praetorian" + }, + { + "name": "boiler" + }, + { + "name": "predalien_larva" + }, + { + "name": "predalien" + }, + { + "name": "xenoqueen" + }, + { + "name": "border", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sentry_passive" + }, + { + "name": "sentry_firing", + "delays": [ + [ + 0.3, + 0.3 + ] + ] + }, + { + "name": "supply", + "delays": [ + [ + 0.25, + 0.25 + ] + ] + }, + { + "name": "sensor_tower", + "delays": [ + [ + 0.4, + 0.4, + 0.4, + 0.4 + ] + ] + }, + { + "name": "asrs", + "delays": [ + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "uav" + }, + { + "name": "xenotunnel" + }, + { + "name": "cluster", + "delays": [ + [ + 4, + 0.15, + 0.15 + ] + ] + }, + { + "name": "core", + "delays": [ + [ + 0.7, + 0.125, + 0.125, + 0.125 + ] + ] + }, + { + "name": "background_command" + }, + { + "name": "pilot" + }, + { + "name": "so" + }, + { + "name": "aso" + }, + { + "name": "xo" + }, + { + "name": "co" + }, + { + "name": "ce" + }, + { + "name": "co_wo" + }, + { + "name": "xo_wo" + }, + { + "name": "gp" + }, + { + "name": "background_mp" + }, + { + "name": "pve" + }, + { + "name": "pve_leader" + }, + { + "name": "pve_inspector" + }, + { + "name": "pve_advisor" + }, + { + "name": "mp" + }, + { + "name": "cmp" + }, + { + "name": "warden" + }, + { + "name": "rmp" + }, + { + "name": "crmp" + }, + { + "name": "hgsl" + }, + { + "name": "vhg" + }, + { + "name": "hgspec" + }, + { + "name": "hg" + }, + { + "name": "background_medical" + }, + { + "name": "sea" + }, + { + "name": "recruiter" + }, + { + "name": "doctor" + }, + { + "name": "researcher" + }, + { + "name": "background_medical_WO" + }, + { + "name": "cmo_wo" + }, + { + "name": "chemist_wo" + }, + { + "name": "background_shipside" + }, + { + "name": "ot" + }, + { + "name": "mt" + }, + { + "name": "dcc" + }, + { + "name": "mst" + }, + { + "name": "nurse" + }, + { + "name": "cargo" + }, + { + "name": "wo_mcrew" + }, + { + "name": "background_sof" + }, + { + "name": "sof_officer" + }, + { + "name": "sof_sg" + }, + { + "name": "sof_sl" + }, + { + "name": "pve_chief_inspector" + }, + { + "name": "background_cmb" + }, + { + "name": "deputy" + }, + { + "name": "icc" + }, + { + "name": "cmb_syn" + }, + { + "name": "obs" + }, + { + "name": "cmb_spc" + }, + { + "name": "background_nspa" + }, + { + "name": "background_twe" + }, + { + "name": "rmc_teamleader" + }, + { + "name": "rmc_lieutenant" + }, + { + "name": "rmc_commander" + }, + { + "name": "rmc_major" + }, + { + "name": "rmc_rifleman" + }, + { + "name": "rmc_medic" + }, + { + "name": "rmc_sg" + }, + { + "name": "rmc_marksman" + }, + { + "name": "rmc_breacher" + }, + { + "name": "background_pmc" + }, + { + "name": "pmc_sd" + }, + { + "name": "pmc_ld" + }, + { + "name": "pmc_md" + }, + { + "name": "pmc_mi" + }, + { + "name": "pmc_td" + }, + { + "name": "pmc_spec" + }, + { + "name": "pmc_gun" + }, + { + "name": "pmc_vc" + }, + { + "name": "pmc_mp" + }, + { + "name": "pmc_handler" + }, + { + "name": "pmc_sg" + }, + { + "name": "pmc_syn" + }, + { + "name": "pmc_tl" + }, + { + "name": "whiteout" + }, + { + "name": "background_goon" + }, + { + "name": "goon_standard" + }, + { + "name": "goon_leader" + }, + { + "name": "goon_med" + }, + { + "name": "goon_engi" + }, + { + "name": "goon_sci" + }, + { + "name": "trainee" + }, + { + "name": "cl" + }, + { + "name": "junior_exec" + }, + { + "name": "senior_exec" + }, + { + "name": "exec_spec" + }, + { + "name": "exec_super" + }, + { + "name": "background_wy_management" + }, + { + "name": "ass_man" + }, + { + "name": "div_man" + }, + { + "name": "chief_man" + }, + { + "name": "director" + }, + { + "name": "background_spp" + }, + { + "name": "background_spp_alpha" + }, + { + "name": "background_spp_bravo" + }, + { + "name": "background_spp_charlie" + }, + { + "name": "background_spp_delta" + }, + { + "name": "spp_slt" + }, + { + "name": "spp_lt" + }, + { + "name": "spp_co" + }, + { + "name": "spp_xo" + }, + { + "name": "spp_synth" + }, + { + "name": "spp_comsl" + }, + { + "name": "spp_com" + }, + { + "name": "spp_commed" + }, + { + "name": "spp_med" + }, + { + "name": "spp_sapper" + }, + { + "name": "spp_spec" + }, + { + "name": "spp_sl" + }, + { + "name": "spp_sl_a" + }, + { + "name": "spp_pvt" + }, + { + "name": "spp_cont" + }, + { + "name": "spp_cargo" + }, + { + "name": "spp_sci" + }, + { + "name": "spp_sec" + }, + { + "name": "spp_doc" + }, + { + "name": "spp_mp" + }, + { + "name": "spp_vc" + }, + { + "name": "spp_plt" + }, + { + "name": "background_clf" + }, + { + "name": "clf_synth" + }, + { + "name": "clf_sl" + }, + { + "name": "clf_sl_a" + }, + { + "name": "clf_mil" + }, + { + "name": "clf_med" + }, + { + "name": "clf_engi" + }, + { + "name": "clf_spec" + }, + { + "name": "background_ua" + }, + { + "name": "tissa" + }, + { + "name": "peacekeeper" + }, + { + "name": "hefa" + }, + { + "name": "background_cultist" + }, + { + "name": "cultist" + }, + { + "name": "cult_leader" + }, + { + "name": "cult_synth" + }, + { + "name": "predator" + }, + { + "name": "thrall" + }, + { + "name": "bracer_stolen" + }, + { + "name": "predator_ancient" + }, + { + "name": "predator_leader" + }, + { + "name": "predator_elder" + }, + { + "name": "predator_elite" + }, + { + "name": "predator_young" + }, + { + "name": "hellhound" + }, + { + "name": "mortar" + }, + { + "name": "background_visit_command" + }, + { + "name": "dep_director" + }, + { + "name": "goon_sci_lead" + }, + { + "name": "field_doctor" + }, + { + "name": "lesser_carrier" + }, + { + "name": "background_free" + }, + { + "name": "recovery_node" + }, + { + "name": "morpher", + "delays": [ + [ + 4.0, + 0.05, + 0.1, + 0.2, + 0.5 + ] + ] + }, + { + "name": "spec_demo" + }, + { + "name": "spec_grenadier" + }, + { + "name": "spec_sniper" + }, + { + "name": "spec_anti_materiel_sniper" + }, + { + "name": "aegis_ob_2" + }, + { + "name": "aegiscrate", + "delays": [ + [ + 2.0, + 2.0 + ] + ] + }, + { + "name": "aegisob", + "delays": [ + [ + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08 + ] + ] + }, + { + "name": "pylon", + "delays": [ + [ + 0.25, + 0.25 + ] + ] + } + ] } diff --git a/Resources/Textures/_RMC14/Interface/map_blips.rsi/sherpa.png b/Resources/Textures/_RMC14/Interface/map_blips.rsi/sherpa.png new file mode 100644 index 0000000000000000000000000000000000000000..d14c724c15fc78713c9f406354cb9f54793ce711 GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+1|*LJgVz1S3=}~3^tH?%nXMm#Q8%fJ9+{|7(8A5T-G@yGywpBw=Dnw literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sich/Interface/cm_job_icons.rsi/hudsquad_sherpa.png b/Resources/Textures/_Sich/Interface/cm_job_icons.rsi/hudsquad_sherpa.png new file mode 100644 index 0000000000000000000000000000000000000000..7bbcd5b523c5bb24b1a5e3feb5da96e0113150cb GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`DV{ElAr*{oCSK%ZP~>rb?E65- z@8KW4Vqwg0^c!~eGj?q2sR)3Ic17Bn!PV0erx_kSuQ zFV93vbq>>3ofTWBUAyJ{elN>?v(Jly~Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sich/Interface/cm_job_icons.rsi/meta.json b/Resources/Textures/_Sich/Interface/cm_job_icons.rsi/meta.json new file mode 100644 index 0000000000..67a32ea6ab --- /dev/null +++ b/Resources/Textures/_Sich/Interface/cm_job_icons.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By github HorvatBG-gif", + "size": { + "x": 16, + "y": 16 + }, + "states": [ + { + "name": "hudsquad_sherpa" + } + ] +} diff --git a/Resources/Textures/_Sich/Objects/Clothing/Back/Backpacks/Marines/ammo_rack.rsi/ammo_pack-0.png b/Resources/Textures/_Sich/Objects/Clothing/Back/Backpacks/Marines/ammo_rack.rsi/ammo_pack-0.png new file mode 100644 index 0000000000000000000000000000000000000000..2a2c0a60ace4b2969ddce9137aabbdc57ab8a604 GIT binary patch literal 548 zcmV+<0^9wGP)CPP~(K~hKIUmnC_w?NNo$<*pf4l`e1v~{j1v~}*jsnx;qwdtq zoV&HNs&IK>+9d~;=E+s^_hO|0L!aXrxdcz-V)6v=;N#nv)dCC}8Jm<`p-yV*o27qX(8W*y#K=>J z2jAApF3{82;xa52jYvm#pE3@aU0f1v#JUC#zV5>}nQ;MzaK8+=JwK6HB&6(cZ&x$CCT8Y8&Ec+#zAE)>losH@r;q;9+E>1Df!B0a zc)e&uS}ik@YxzN9U4sXoKKk)ZW?bMtns8F-q7?FZL0T;{lAEpoK7I6?4yR^Z074}C z=xDsUJa@E_KfAthK%E1LH6JWzWfx!ozi^Jg!1mzp@Vo^)1^&MR<=%`B00030 m|Dy0EfB*mh21!IgR09BwDGX3q6J{R(0000C# zKzwH}UpF|=|6>y>13lec<(Xip{POxP#Fj*ZiR8e(b}A|Zo$YB^TAVi;lj9>|p$6=m zO~plJfOBsPMagDHNkgasCbW}K8$dOGd@i}IdGr{i zSP-EGnmBIMx?&GeKvAVWtgn0{oeSVlc>Y_40XLMK# z_U|8_jpoJGb)88fE-C{YYDEyL#&&*scIhOJH Date: Mon, 17 Nov 2025 09:14:24 +0100 Subject: [PATCH 2/7] fixes --- Resources/Prototypes/_RMC14/Entities/Objects/Tools/flares.yml | 4 ++-- .../Prototypes/_Sich/Entities/Clothing/Back/backpacks.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Tools/flares.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Tools/flares.yml index 489a9abacb..82e1ffc8af 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Tools/flares.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Tools/flares.yml @@ -161,7 +161,7 @@ name: box of M94 flare packs (x10) description: A box of M94 marking flare packs, to brighten up your day. components: - - type: Tag + - type: Tag #Sich tags: - RMCFlareBox - type: Construction @@ -420,5 +420,5 @@ - type: Tag id: RMCPackFlareCAS -- type: Tag +- type: Tag #Sich id: RMCFlareBox diff --git a/Resources/Prototypes/_Sich/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_Sich/Entities/Clothing/Back/backpacks.yml index 7a074edc03..28fd210720 100644 --- a/Resources/Prototypes/_Sich/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/_Sich/Entities/Clothing/Back/backpacks.yml @@ -1,6 +1,6 @@ - type: entity - id: SichRMCBackpackAmmoFolded parent: BaseItem + id: SichRMCBackpackAmmoFolded name: LCF загального призначення description: Згорнута вантажна рама для спорядження. Розгорніть перед використанням. suffix: folded From 7b311e15464629d7fd699c5ed72e0b283a18a101 Mon Sep 17 00:00:00 2001 From: HorvatBG-gif Date: Mon, 17 Nov 2025 14:25:29 +0100 Subject: [PATCH 3/7] VRS --- .../Prototypes/_RMC14/Entities/Clothing/Back/backpacks.yml | 2 +- .../Prototypes/_Sich/Entities/Clothing/Back/backpacks.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_RMC14/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_RMC14/Entities/Clothing/Back/backpacks.yml index e2c26e93c1..717c8d3b83 100644 --- a/Resources/Prototypes/_RMC14/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/_RMC14/Entities/Clothing/Back/backpacks.yml @@ -247,7 +247,7 @@ - type: entity parent: CMBackpack id: RMCBackpackAmmo - name: LCF загального призначення + name: ВРС загального призначення description: Поєднання ременів та пласталевого каркасу що дозволяє переносити громіздкі коробки. Незважаючи на скромність конструкції, далеко не кожен зможе нести цей тягар. components: - type: SichSherpaItem # Sich diff --git a/Resources/Prototypes/_Sich/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_Sich/Entities/Clothing/Back/backpacks.yml index 28fd210720..6892dce4af 100644 --- a/Resources/Prototypes/_Sich/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/_Sich/Entities/Clothing/Back/backpacks.yml @@ -1,9 +1,9 @@ - type: entity parent: BaseItem id: SichRMCBackpackAmmoFolded - name: LCF загального призначення + name: ВРС загального призначення description: Згорнута вантажна рама для спорядження. Розгорніть перед використанням. - suffix: folded + suffix: згонута components: - type: Item size: Huge From ac4dfe794b8a2d528805fc85a678be8cc3c1cd43 Mon Sep 17 00:00:00 2001 From: HorvatBG-gif Date: Fri, 5 Dec 2025 19:19:23 +0100 Subject: [PATCH 4/7] SmartGun --- .../Objects/Weapons/Guns/Ammunition/Boxes/bullet_boxes.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Sich/Entities/Objects/Weapons/Guns/Ammunition/Boxes/bullet_boxes.yml b/Resources/Prototypes/_Sich/Entities/Objects/Weapons/Guns/Ammunition/Boxes/bullet_boxes.yml index 42fd363d08..a3dfb1b93a 100644 --- a/Resources/Prototypes/_Sich/Entities/Objects/Weapons/Guns/Ammunition/Boxes/bullet_boxes.yml +++ b/Resources/Prototypes/_Sich/Entities/Objects/Weapons/Guns/Ammunition/Boxes/bullet_boxes.yml @@ -1,8 +1,8 @@ - type: entity parent: RMCBoxBulletsBase id: SichRMCBoxBulletsSmartGun - name: коробка з набоями смарт-гану (10x30мм) - description: Коробка з набоями 10х30мм. Використовується для поповнення магазинів смарт-гану. Має шкіряну лямку, що дозволяє носити її на спині. + name: коробка з набоями СмартГану (10x30мм) + description: Коробка з набоями 10х30мм. Використовується для поповнення магазинів СмартГану. Має шкіряну лямку, що дозволяє носити її на спині. components: - type: Tag tags: From 0850bf84da88105d8b38dc9d939779a774d39487 Mon Sep 17 00:00:00 2001 From: HorvatBG-gif Date: Sat, 6 Dec 2025 22:43:26 +0100 Subject: [PATCH 5/7] fixes --- Resources/Locale/en-US/_Sich/storage/storage.ftl | 2 +- .../Prototypes/_Sich/Catalog/Fills/Crates/bullet_boxes.yml | 2 +- Resources/Textures/_RMC14/Interface/map_blips.rsi/meta.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/en-US/_Sich/storage/storage.ftl b/Resources/Locale/en-US/_Sich/storage/storage.ftl index ce93583eb6..c4e921b23d 100644 --- a/Resources/Locale/en-US/_Sich/storage/storage.ftl +++ b/Resources/Locale/en-US/_Sich/storage/storage.ftl @@ -1,2 +1,2 @@ rmc-storage-limit-not-flarebox = Це кріплення підтримує тільки коробку упаковок фаєрів М94! -rmc-storage-limit-one-bulletbox-smartgun = Кріплення замале щоб вмістити дві коробки з набоями для смарт-гану! +rmc-storage-limit-one-bulletbox-smartgun = Кріплення замале щоб вмістити дві коробки з набоями для СмартГану! diff --git a/Resources/Prototypes/_Sich/Catalog/Fills/Crates/bullet_boxes.yml b/Resources/Prototypes/_Sich/Catalog/Fills/Crates/bullet_boxes.yml index 3cef8d5805..da3965eff4 100644 --- a/Resources/Prototypes/_Sich/Catalog/Fills/Crates/bullet_boxes.yml +++ b/Resources/Prototypes/_Sich/Catalog/Fills/Crates/bullet_boxes.yml @@ -1,7 +1,7 @@ - type: entity parent: RMCCrateAmmo id: SichRMCCrateBoxBulletsSmartGun - name: Ящик з коробкою набоїв для смарт-гану 10х30мм (3000шт.) + name: Ящик з коробкою набоїв для СмартГану 10х30мм (3000шт.) components: - type: StorageFill contents: diff --git a/Resources/Textures/_RMC14/Interface/map_blips.rsi/meta.json b/Resources/Textures/_RMC14/Interface/map_blips.rsi/meta.json index 6a5fd9dcdb..df13a00e5e 100644 --- a/Resources/Textures/_RMC14/Interface/map_blips.rsi/meta.json +++ b/Resources/Textures/_RMC14/Interface/map_blips.rsi/meta.json @@ -8,7 +8,7 @@ }, "states": [ { - "name": "sherpa" + "name": "sherpa" //Sich }, { "name": "background" From dedd9927c91312a638f39297336e8ee0a64d8755 Mon Sep 17 00:00:00 2001 From: HorvatBG-gif Date: Wed, 10 Dec 2025 11:08:22 +0100 Subject: [PATCH 6/7] map blip separated --- .../_Sich/Entities/Objects/Misc/pamphlets.yml | 2 +- .../_RMC14/Interface/map_blips.rsi/meta.json | 5 +---- .../_Sich/Interface/map_blips.rsi/meta.json | 14 ++++++++++++++ .../Interface/map_blips.rsi/sherpa.png | Bin 4 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 Resources/Textures/_Sich/Interface/map_blips.rsi/meta.json rename Resources/Textures/{_RMC14 => _Sich}/Interface/map_blips.rsi/sherpa.png (100%) diff --git a/Resources/Prototypes/_Sich/Entities/Objects/Misc/pamphlets.yml b/Resources/Prototypes/_Sich/Entities/Objects/Misc/pamphlets.yml index ecbd94300f..47e4a42cdb 100644 --- a/Resources/Prototypes/_Sich/Entities/Objects/Misc/pamphlets.yml +++ b/Resources/Prototypes/_Sich/Entities/Objects/Misc/pamphlets.yml @@ -19,7 +19,7 @@ sprite: _Sich/Interface/cm_job_icons.rsi state: hudsquad_sherpa giveMapBlip: - sprite: /Textures/_RMC14/Interface/map_blips.rsi + sprite: /Textures/_Sich/Interface/map_blips.rsi state: sherpa jobWhitelists: - popup: rmc-pamphlets-rifleman-warning diff --git a/Resources/Textures/_RMC14/Interface/map_blips.rsi/meta.json b/Resources/Textures/_RMC14/Interface/map_blips.rsi/meta.json index df13a00e5e..5893a6972a 100644 --- a/Resources/Textures/_RMC14/Interface/map_blips.rsi/meta.json +++ b/Resources/Textures/_RMC14/Interface/map_blips.rsi/meta.json @@ -1,15 +1,12 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/5368c7a5342a52d204eac3d6cc45228f3b976893/icons/ui_icons/map_blips.dmi, background_free and pmc tl by github noctyrnal, lesser_carrier by Vermidia, aegiscrate, aegisob, and forecon_synth by Sigma Draconis, edited runner to create lurker, and edited supply to create pylon by github DummeHytteOst, sherpa sprite by github HorvatBG-gif", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/5368c7a5342a52d204eac3d6cc45228f3b976893/icons/ui_icons/map_blips.dmi, background_free and pmc tl by github noctyrnal, lesser_carrier by Vermidia, aegiscrate, aegisob, and forecon_synth by Sigma Draconis, edited runner to create lurker, and edited supply to create pylon by github DummeHytteOst", "size": { "x": 7, "y": 7 }, "states": [ - { - "name": "sherpa" //Sich - }, { "name": "background" }, diff --git a/Resources/Textures/_Sich/Interface/map_blips.rsi/meta.json b/Resources/Textures/_Sich/Interface/map_blips.rsi/meta.json new file mode 100644 index 0000000000..5dc036cec1 --- /dev/null +++ b/Resources/Textures/_Sich/Interface/map_blips.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "by github HorvatBG-gif", + "size": { + "x": 7, + "y": 7 + }, + "states": [ + { + "name": "sherpa" + } + ] +} diff --git a/Resources/Textures/_RMC14/Interface/map_blips.rsi/sherpa.png b/Resources/Textures/_Sich/Interface/map_blips.rsi/sherpa.png similarity index 100% rename from Resources/Textures/_RMC14/Interface/map_blips.rsi/sherpa.png rename to Resources/Textures/_Sich/Interface/map_blips.rsi/sherpa.png From 272e17f5f5f9b59262cd88252c3bf46d856a7a03 Mon Sep 17 00:00:00 2001 From: HorvatBG-gif Date: Wed, 10 Dec 2025 11:28:48 +0100 Subject: [PATCH 7/7] watafaku --- .../_RMC14/Interface/map_blips.rsi/meta.json | 1734 ++++++++--------- .../_Sich/Interface/map_blips.rsi/meta.json | 4 +- 2 files changed, 869 insertions(+), 869 deletions(-) diff --git a/Resources/Textures/_RMC14/Interface/map_blips.rsi/meta.json b/Resources/Textures/_RMC14/Interface/map_blips.rsi/meta.json index 5893a6972a..8e6959bca2 100644 --- a/Resources/Textures/_RMC14/Interface/map_blips.rsi/meta.json +++ b/Resources/Textures/_RMC14/Interface/map_blips.rsi/meta.json @@ -6,871 +6,871 @@ "x": 7, "y": 7 }, - "states": [ - { - "name": "background" - }, - { - "name": "background_charlie" - }, - { - "name": "background_delta" - }, - { - "name": "background_bravo" - }, - { - "name": "background_alpha" - }, - { - "name": "background_echo" - }, - { - "name": "background_foxtrot" - }, - { - "name": "background_intel" - }, - { - "name": "background_cbrn" - }, - { - "name": "background_forecon" - }, - { - "name": "unknown" - }, - { - "name": "defibbable", - "delays": [ - [ - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135 - ] - ] - }, - { - "name": "defibbable2", - "delays": [ - [ - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135 - ] - ] - }, - { - "name": "defibbable3", - "delays": [ - [ - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135 - ] - ] - }, - { - "name": "defibbable4", - "delays": [ - [ - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135, - 0.135 - ] - ] - }, - { - "name": "undefibbable", - "delays": [ - [ - 0.135, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13, - 0.13 - ] - ] - }, - { - "name": "vc" - }, - { - "name": "io" - }, - { - "name": "engi" - }, - { - "name": "private" - }, - { - "name": "leader" - }, - { - "name": "tl" - }, - { - "name": "spec" - }, - { - "name": "spotter" - }, - { - "name": "loader" - }, - { - "name": "smartgunner" - }, - { - "name": "medic" - }, - { - "name": "medic_k9" - }, - { - "name": "synth" - }, - { - "name": "synth_k9" - }, - { - "name": "forecon_synth" - }, - { - "name": "joe" - }, - { - "name": "background_civillian" - }, - { - "name": "correspondent" - }, - { - "name": "surv" - }, - { - "name": "background_xeno" - }, - { - "name": "xeno_ruler" - }, - { - "name": "xenoleader" - }, - { - "name": "xeno" - }, - { - "name": "larva" - }, - { - "name": "parasite" - }, - { - "name": "lesser_drone" - }, - { - "name": "drone" - }, - { - "name": "runner" - }, - { - "name": "defender" - }, - { - "name": "sentinel" - }, - { - "name": "hivelord" - }, - { - "name": "burrower" - }, - { - "name": "carrier" - }, - { - "name": "warrior" - }, - { - "name": "lurker" - }, - { - "name": "spitter" - }, - { - "name": "ravager" - }, - { - "name": "crusher" - }, - { - "name": "praetorian" - }, - { - "name": "boiler" - }, - { - "name": "predalien_larva" - }, - { - "name": "predalien" - }, - { - "name": "xenoqueen" - }, - { - "name": "border", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "sentry_passive" - }, - { - "name": "sentry_firing", - "delays": [ - [ - 0.3, - 0.3 - ] - ] - }, - { - "name": "supply", - "delays": [ - [ - 0.25, - 0.25 - ] - ] - }, - { - "name": "sensor_tower", - "delays": [ - [ - 0.4, - 0.4, - 0.4, - 0.4 - ] - ] - }, - { - "name": "asrs", - "delays": [ - [ - 0.2, - 0.2 - ] - ] - }, - { - "name": "uav" - }, - { - "name": "xenotunnel" - }, - { - "name": "cluster", - "delays": [ - [ - 4, - 0.15, - 0.15 - ] - ] - }, - { - "name": "core", - "delays": [ - [ - 0.7, - 0.125, - 0.125, - 0.125 - ] - ] - }, - { - "name": "background_command" - }, - { - "name": "pilot" - }, - { - "name": "so" - }, - { - "name": "aso" - }, - { - "name": "xo" - }, - { - "name": "co" - }, - { - "name": "ce" - }, - { - "name": "co_wo" - }, - { - "name": "xo_wo" - }, - { - "name": "gp" - }, - { - "name": "background_mp" - }, - { - "name": "pve" - }, - { - "name": "pve_leader" - }, - { - "name": "pve_inspector" - }, - { - "name": "pve_advisor" - }, - { - "name": "mp" - }, - { - "name": "cmp" - }, - { - "name": "warden" - }, - { - "name": "rmp" - }, - { - "name": "crmp" - }, - { - "name": "hgsl" - }, - { - "name": "vhg" - }, - { - "name": "hgspec" - }, - { - "name": "hg" - }, - { - "name": "background_medical" - }, - { - "name": "sea" - }, - { - "name": "recruiter" - }, - { - "name": "doctor" - }, - { - "name": "researcher" - }, - { - "name": "background_medical_WO" - }, - { - "name": "cmo_wo" - }, - { - "name": "chemist_wo" - }, - { - "name": "background_shipside" - }, - { - "name": "ot" - }, - { - "name": "mt" - }, - { - "name": "dcc" - }, - { - "name": "mst" - }, - { - "name": "nurse" - }, - { - "name": "cargo" - }, - { - "name": "wo_mcrew" - }, - { - "name": "background_sof" - }, - { - "name": "sof_officer" - }, - { - "name": "sof_sg" - }, - { - "name": "sof_sl" - }, - { - "name": "pve_chief_inspector" - }, - { - "name": "background_cmb" - }, - { - "name": "deputy" - }, - { - "name": "icc" - }, - { - "name": "cmb_syn" - }, - { - "name": "obs" - }, - { - "name": "cmb_spc" - }, - { - "name": "background_nspa" - }, - { - "name": "background_twe" - }, - { - "name": "rmc_teamleader" - }, - { - "name": "rmc_lieutenant" - }, - { - "name": "rmc_commander" - }, - { - "name": "rmc_major" - }, - { - "name": "rmc_rifleman" - }, - { - "name": "rmc_medic" - }, - { - "name": "rmc_sg" - }, - { - "name": "rmc_marksman" - }, - { - "name": "rmc_breacher" - }, - { - "name": "background_pmc" - }, - { - "name": "pmc_sd" - }, - { - "name": "pmc_ld" - }, - { - "name": "pmc_md" - }, - { - "name": "pmc_mi" - }, - { - "name": "pmc_td" - }, - { - "name": "pmc_spec" - }, - { - "name": "pmc_gun" - }, - { - "name": "pmc_vc" - }, - { - "name": "pmc_mp" - }, - { - "name": "pmc_handler" - }, - { - "name": "pmc_sg" - }, - { - "name": "pmc_syn" - }, - { - "name": "pmc_tl" - }, - { - "name": "whiteout" - }, - { - "name": "background_goon" - }, - { - "name": "goon_standard" - }, - { - "name": "goon_leader" - }, - { - "name": "goon_med" - }, - { - "name": "goon_engi" - }, - { - "name": "goon_sci" - }, - { - "name": "trainee" - }, - { - "name": "cl" - }, - { - "name": "junior_exec" - }, - { - "name": "senior_exec" - }, - { - "name": "exec_spec" - }, - { - "name": "exec_super" - }, - { - "name": "background_wy_management" - }, - { - "name": "ass_man" - }, - { - "name": "div_man" - }, - { - "name": "chief_man" - }, - { - "name": "director" - }, - { - "name": "background_spp" - }, - { - "name": "background_spp_alpha" - }, - { - "name": "background_spp_bravo" - }, - { - "name": "background_spp_charlie" - }, - { - "name": "background_spp_delta" - }, - { - "name": "spp_slt" - }, - { - "name": "spp_lt" - }, - { - "name": "spp_co" - }, - { - "name": "spp_xo" - }, - { - "name": "spp_synth" - }, - { - "name": "spp_comsl" - }, - { - "name": "spp_com" - }, - { - "name": "spp_commed" - }, - { - "name": "spp_med" - }, - { - "name": "spp_sapper" - }, - { - "name": "spp_spec" - }, - { - "name": "spp_sl" - }, - { - "name": "spp_sl_a" - }, - { - "name": "spp_pvt" - }, - { - "name": "spp_cont" - }, - { - "name": "spp_cargo" - }, - { - "name": "spp_sci" - }, - { - "name": "spp_sec" - }, - { - "name": "spp_doc" - }, - { - "name": "spp_mp" - }, - { - "name": "spp_vc" - }, - { - "name": "spp_plt" - }, - { - "name": "background_clf" - }, - { - "name": "clf_synth" - }, - { - "name": "clf_sl" - }, - { - "name": "clf_sl_a" - }, - { - "name": "clf_mil" - }, - { - "name": "clf_med" - }, - { - "name": "clf_engi" - }, - { - "name": "clf_spec" - }, - { - "name": "background_ua" - }, - { - "name": "tissa" - }, - { - "name": "peacekeeper" - }, - { - "name": "hefa" - }, - { - "name": "background_cultist" - }, - { - "name": "cultist" - }, - { - "name": "cult_leader" - }, - { - "name": "cult_synth" - }, - { - "name": "predator" - }, - { - "name": "thrall" - }, - { - "name": "bracer_stolen" - }, - { - "name": "predator_ancient" - }, - { - "name": "predator_leader" - }, - { - "name": "predator_elder" - }, - { - "name": "predator_elite" - }, - { - "name": "predator_young" - }, - { - "name": "hellhound" - }, - { - "name": "mortar" - }, - { - "name": "background_visit_command" - }, - { - "name": "dep_director" - }, - { - "name": "goon_sci_lead" - }, - { - "name": "field_doctor" - }, - { - "name": "lesser_carrier" - }, - { - "name": "background_free" - }, - { - "name": "recovery_node" - }, - { - "name": "morpher", - "delays": [ - [ - 4.0, - 0.05, - 0.1, - 0.2, - 0.5 - ] - ] - }, - { - "name": "spec_demo" - }, - { - "name": "spec_grenadier" - }, - { - "name": "spec_sniper" - }, - { - "name": "spec_anti_materiel_sniper" - }, - { - "name": "aegis_ob_2" - }, - { - "name": "aegiscrate", - "delays": [ - [ - 2.0, - 2.0 - ] - ] - }, - { - "name": "aegisob", - "delays": [ - [ - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08, - 0.08 - ] - ] - }, - { - "name": "pylon", - "delays": [ - [ - 0.25, - 0.25 - ] - ] - } - ] + "states": [ + { + "name": "background" + }, + { + "name": "background_charlie" + }, + { + "name": "background_delta" + }, + { + "name": "background_bravo" + }, + { + "name": "background_alpha" + }, + { + "name": "background_echo" + }, + { + "name": "background_foxtrot" + }, + { + "name": "background_intel" + }, + { + "name": "background_cbrn" + }, + { + "name": "background_forecon" + }, + { + "name": "unknown" + }, + { + "name": "defibbable", + "delays": [ + [ + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135 + ] + ] + }, + { + "name": "defibbable2", + "delays": [ + [ + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135 + ] + ] + }, + { + "name": "defibbable3", + "delays": [ + [ + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135 + ] + ] + }, + { + "name": "defibbable4", + "delays": [ + [ + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135, + 0.135 + ] + ] + }, + { + "name": "undefibbable", + "delays": [ + [ + 0.135, + 0.13, + 0.13, + 0.13, + 0.13, + 0.13, + 0.13 + ] + ] + }, + { + "name": "vc" + }, + { + "name": "io" + }, + { + "name": "engi" + }, + { + "name": "private" + }, + { + "name": "leader" + }, + { + "name": "tl" + }, + { + "name": "spec" + }, + { + "name": "spotter" + }, + { + "name": "loader" + }, + { + "name": "smartgunner" + }, + { + "name": "medic" + }, + { + "name": "medic_k9" + }, + { + "name": "synth" + }, + { + "name": "synth_k9" + }, + { + "name": "forecon_synth" + }, + { + "name": "joe" + }, + { + "name": "background_civillian" + }, + { + "name": "correspondent" + }, + { + "name": "surv" + }, + { + "name": "background_xeno" + }, + { + "name": "xeno_ruler" + }, + { + "name": "xenoleader" + }, + { + "name": "xeno" + }, + { + "name": "larva" + }, + { + "name": "parasite" + }, + { + "name": "lesser_drone" + }, + { + "name": "drone" + }, + { + "name": "runner" + }, + { + "name": "defender" + }, + { + "name": "sentinel" + }, + { + "name": "hivelord" + }, + { + "name": "burrower" + }, + { + "name": "carrier" + }, + { + "name": "warrior" + }, + { + "name": "lurker" + }, + { + "name": "spitter" + }, + { + "name": "ravager" + }, + { + "name": "crusher" + }, + { + "name": "praetorian" + }, + { + "name": "boiler" + }, + { + "name": "predalien_larva" + }, + { + "name": "predalien" + }, + { + "name": "xenoqueen" + }, + { + "name": "border", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sentry_passive" + }, + { + "name": "sentry_firing", + "delays": [ + [ + 0.3, + 0.3 + ] + ] + }, + { + "name": "supply", + "delays": [ + [ + 0.25, + 0.25 + ] + ] + }, + { + "name": "sensor_tower", + "delays": [ + [ + 0.4, + 0.4, + 0.4, + 0.4 + ] + ] + }, + { + "name": "asrs", + "delays": [ + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "uav" + }, + { + "name": "xenotunnel" + }, + { + "name": "cluster", + "delays": [ + [ + 4, + 0.15, + 0.15 + ] + ] + }, + { + "name": "core", + "delays": [ + [ + 0.7, + 0.125, + 0.125, + 0.125 + ] + ] + }, + { + "name": "background_command" + }, + { + "name": "pilot" + }, + { + "name": "so" + }, + { + "name": "aso" + }, + { + "name": "xo" + }, + { + "name": "co" + }, + { + "name": "ce" + }, + { + "name": "co_wo" + }, + { + "name": "xo_wo" + }, + { + "name": "gp" + }, + { + "name": "background_mp" + }, + { + "name": "pve" + }, + { + "name": "pve_leader" + }, + { + "name": "pve_inspector" + }, + { + "name": "pve_advisor" + }, + { + "name": "mp" + }, + { + "name": "cmp" + }, + { + "name": "warden" + }, + { + "name": "rmp" + }, + { + "name": "crmp" + }, + { + "name": "hgsl" + }, + { + "name": "vhg" + }, + { + "name": "hgspec" + }, + { + "name": "hg" + }, + { + "name": "background_medical" + }, + { + "name": "sea" + }, + { + "name": "recruiter" + }, + { + "name": "doctor" + }, + { + "name": "researcher" + }, + { + "name": "background_medical_WO" + }, + { + "name": "cmo_wo" + }, + { + "name": "chemist_wo" + }, + { + "name": "background_shipside" + }, + { + "name": "ot" + }, + { + "name": "mt" + }, + { + "name": "dcc" + }, + { + "name": "mst" + }, + { + "name": "nurse" + }, + { + "name": "cargo" + }, + { + "name": "wo_mcrew" + }, + { + "name": "background_sof" + }, + { + "name": "sof_officer" + }, + { + "name": "sof_sg" + }, + { + "name": "sof_sl" + }, + { + "name": "pve_chief_inspector" + }, + { + "name": "background_cmb" + }, + { + "name": "deputy" + }, + { + "name": "icc" + }, + { + "name": "cmb_syn" + }, + { + "name": "obs" + }, + { + "name": "cmb_spc" + }, + { + "name": "background_nspa" + }, + { + "name": "background_twe" + }, + { + "name": "rmc_teamleader" + }, + { + "name": "rmc_lieutenant" + }, + { + "name": "rmc_commander" + }, + { + "name": "rmc_major" + }, + { + "name": "rmc_rifleman" + }, + { + "name": "rmc_medic" + }, + { + "name": "rmc_sg" + }, + { + "name": "rmc_marksman" + }, + { + "name": "rmc_breacher" + }, + { + "name": "background_pmc" + }, + { + "name": "pmc_sd" + }, + { + "name": "pmc_ld" + }, + { + "name": "pmc_md" + }, + { + "name": "pmc_mi" + }, + { + "name": "pmc_td" + }, + { + "name": "pmc_spec" + }, + { + "name": "pmc_gun" + }, + { + "name": "pmc_vc" + }, + { + "name": "pmc_mp" + }, + { + "name": "pmc_handler" + }, + { + "name": "pmc_sg" + }, + { + "name": "pmc_syn" + }, + { + "name": "pmc_tl" + }, + { + "name": "whiteout" + }, + { + "name": "background_goon" + }, + { + "name": "goon_standard" + }, + { + "name": "goon_leader" + }, + { + "name": "goon_med" + }, + { + "name": "goon_engi" + }, + { + "name": "goon_sci" + }, + { + "name": "trainee" + }, + { + "name": "cl" + }, + { + "name": "junior_exec" + }, + { + "name": "senior_exec" + }, + { + "name": "exec_spec" + }, + { + "name": "exec_super" + }, + { + "name": "background_wy_management" + }, + { + "name": "ass_man" + }, + { + "name": "div_man" + }, + { + "name": "chief_man" + }, + { + "name": "director" + }, + { + "name": "background_spp" + }, + { + "name": "background_spp_alpha" + }, + { + "name": "background_spp_bravo" + }, + { + "name": "background_spp_charlie" + }, + { + "name": "background_spp_delta" + }, + { + "name": "spp_slt" + }, + { + "name": "spp_lt" + }, + { + "name": "spp_co" + }, + { + "name": "spp_xo" + }, + { + "name": "spp_synth" + }, + { + "name": "spp_comsl" + }, + { + "name": "spp_com" + }, + { + "name": "spp_commed" + }, + { + "name": "spp_med" + }, + { + "name": "spp_sapper" + }, + { + "name": "spp_spec" + }, + { + "name": "spp_sl" + }, + { + "name": "spp_sl_a" + }, + { + "name": "spp_pvt" + }, + { + "name": "spp_cont" + }, + { + "name": "spp_cargo" + }, + { + "name": "spp_sci" + }, + { + "name": "spp_sec" + }, + { + "name": "spp_doc" + }, + { + "name": "spp_mp" + }, + { + "name": "spp_vc" + }, + { + "name": "spp_plt" + }, + { + "name": "background_clf" + }, + { + "name": "clf_synth" + }, + { + "name": "clf_sl" + }, + { + "name": "clf_sl_a" + }, + { + "name": "clf_mil" + }, + { + "name": "clf_med" + }, + { + "name": "clf_engi" + }, + { + "name": "clf_spec" + }, + { + "name": "background_ua" + }, + { + "name": "tissa" + }, + { + "name": "peacekeeper" + }, + { + "name": "hefa" + }, + { + "name": "background_cultist" + }, + { + "name": "cultist" + }, + { + "name": "cult_leader" + }, + { + "name": "cult_synth" + }, + { + "name": "predator" + }, + { + "name": "thrall" + }, + { + "name": "bracer_stolen" + }, + { + "name": "predator_ancient" + }, + { + "name": "predator_leader" + }, + { + "name": "predator_elder" + }, + { + "name": "predator_elite" + }, + { + "name": "predator_young" + }, + { + "name": "hellhound" + }, + { + "name": "mortar" + }, + { + "name": "background_visit_command" + }, + { + "name": "dep_director" + }, + { + "name": "goon_sci_lead" + }, + { + "name": "field_doctor" + }, + { + "name": "lesser_carrier" + }, + { + "name": "background_free" + }, + { + "name": "recovery_node" + }, + { + "name": "morpher", + "delays": [ + [ + 4.0, + 0.05, + 0.1, + 0.2, + 0.5 + ] + ] + }, + { + "name": "spec_demo" + }, + { + "name": "spec_grenadier" + }, + { + "name": "spec_sniper" + }, + { + "name": "spec_anti_materiel_sniper" + }, + { + "name": "aegis_ob_2" + }, + { + "name": "aegiscrate", + "delays": [ + [ + 2.0, + 2.0 + ] + ] + }, + { + "name": "aegisob", + "delays": [ + [ + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08 + ] + ] + }, + { + "name": "pylon", + "delays": [ + [ + 0.25, + 0.25 + ] + ] + } + ] } diff --git a/Resources/Textures/_Sich/Interface/map_blips.rsi/meta.json b/Resources/Textures/_Sich/Interface/map_blips.rsi/meta.json index 5dc036cec1..074870d345 100644 --- a/Resources/Textures/_Sich/Interface/map_blips.rsi/meta.json +++ b/Resources/Textures/_Sich/Interface/map_blips.rsi/meta.json @@ -3,8 +3,8 @@ "license": "CC-BY-SA-3.0", "copyright": "by github HorvatBG-gif", "size": { - "x": 7, - "y": 7 + "x": 7, + "y": 7 }, "states": [ {