From a8405853980b1ad2952690ec063afdf5992058cf Mon Sep 17 00:00:00 2001 From: keslik Date: Sun, 29 Dec 2024 18:32:02 +0300 Subject: [PATCH 1/6] Add: Mercenary ghost role --- Resources/Locale/ru-RU/_white/mercenary.ftl | 30 +++++++++++ .../Locale/ru-RU/paper/stamp-component.ftl | 1 + .../Fills/Backpacks/StarterGear/backpack.yml | 22 ++++++++ .../Entities/Mobs/Player/humanoid.yml | 47 +++++++++++++++++- .../Entities/Objects/Misc/books_author.yml | 29 +++++++++-- .../Entities/Objects/Misc/rubber_stamp.yml | 13 +++++ .../Roles/Jobs/Fun/misc_startinggear.yml | 18 +++++++ .../Objects/Misc/bureaucracy.rsi/meta.json | 7 ++- .../bureaucracy.rsi/paper_stamp-mercenary.png | Bin 0 -> 179 bytes .../Objects/Misc/stamps.rsi/meta.json | 5 +- .../Misc/stamps.rsi/stamp-mercenary.png | Bin 0 -> 284 bytes 11 files changed, 164 insertions(+), 8 deletions(-) create mode 100644 Resources/Locale/ru-RU/_white/mercenary.ftl create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-mercenary.png create mode 100644 Resources/Textures/Objects/Misc/stamps.rsi/stamp-mercenary.png diff --git a/Resources/Locale/ru-RU/_white/mercenary.ftl b/Resources/Locale/ru-RU/_white/mercenary.ftl new file mode 100644 index 0000000000..5cc4a02c9f --- /dev/null +++ b/Resources/Locale/ru-RU/_white/mercenary.ftl @@ -0,0 +1,30 @@ +ent-RubberStampMercenaries = печать наёмника + .desc = Используется разными группировками космических наёмников для оформления контрактов. Контракт без этой печати силы не имеет. + +ent-BookMercenary = история наёмничества с начала времён + .desc = Книга рассказывает о разных формах наёмничества в нескольких исторических промежутках. Автор на протяжении книги осуждает само явление, но читать всё равно интересно. + +book-text-merc = + Книга рассказывает о наёмниках, кондотьерах, солдатах удачи, ландскнехтах и других необычных авантюристах. + В главе с историей последних веков вы находите несколько интересных моментов. Среди них упоминание некой Н-Станции и копия Кредо наёмника: + 1. Не предавать: + Честный наёмник не возьмёт новый контракт до выполнения действующего. + 2. Не вмешиваться: + Честный наёмник строго следует контракту и не делает больше, чем требуется. + 3. Не подчиняться: + Честный наёмник продаёт конкретные услуги, не себя. + 4. Не навредить: + Честный наёмник знает цену жизни и не навредит за рамками контракта. + 5. Не судить: + Честный наёмник не обсуждает заказ и заказчика. + 6. Не сдаваться: + Честный наёмник знает о рисках и готов ко всему. + На следующих 48 страницах идёт перечисление случаев с нарушением этих правил. Однако отмечается, что соблюдащие Кредо наёмники пользуются доверием и цены на их услуги значительно выше. + Статус разных группировок в различных секторах отличается, как и отношение корпораций к ним. + +ghost-role-information-mercenary-standard-name = Свободный наёмник +ghost-role-information-mercenary-standard-description = Вы наёмник, который посетил сектор в поисках заказчика. +ghost-role-information-mercenary-standard-rules = Вы - опытный наёмник в поисках работы. Ваша задача заключать выгодные контракты и унести заработанное не подведя заказчика. + Вы не помните ничего из своей предыдущей жизни, если администратор не сказал вам обратное. + Вам разрешается помнить знания об игре в целом, например, как готовить, как использовать предметы и т.д. + Вам [color=red]НЕ[/color] разрешается помнить, имя, внешность и т.д. вашего предыдущего персонажа. diff --git a/Resources/Locale/ru-RU/paper/stamp-component.ftl b/Resources/Locale/ru-RU/paper/stamp-component.ftl index 6a2d4df451..ec53e89d69 100644 --- a/Resources/Locale/ru-RU/paper/stamp-component.ftl +++ b/Resources/Locale/ru-RU/paper/stamp-component.ftl @@ -18,3 +18,4 @@ stamp-component-stamped-name-syndicate = Синдикат stamp-component-stamped-name-ce = Старший инженер stamp-component-stamped-name-iaa = Агент внутренних дел stamp-component-stamped-name-geraldiy = Древние +stamp-component-stamped-name-mercenary = Контракт diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index d9c8850e1f..d7ab52280d 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -411,3 +411,25 @@ - id: Cutlass - id: WeaponRevolverPirate - id: ClothingEyesEyepatch + +# WD. Mercenary + +- type: entity + parent: ClothingBackpackMerc + id: ClothingBackpackMercFilledStandard + suffix: Filled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: RubberStampMercenaries + - id: TelescopicBaton + - id: Zipties + - id: BoxMRE + - id: ThrowingKnivesKit + - id: CrowbarRed + - id: Tourniquet + - id: Lighter + - id: CigPackBlack + - id: SpaceCash500 + - id: FlashlightLantern diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 38d805aa4d..3b3c25120c 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -20,7 +20,7 @@ - type: randomHumanoidSettings id: Nanotrasen - speciesBlacklist: + speciesBlacklist: - Arachnid - Diona - Moth @@ -911,3 +911,48 @@ nameSegments: - names_first - names_last + +# WD. Mercenary + +- type: entity + name: mercenary standard spawner + id: MercenaryStandardSpawner + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - sprite: Objects/Tools/appraisal-tool.rsi + state: icon + - type: RandomSpawner + prototypes: + - RandomHumanoidMercenaryStandard + chance: 1 + +- type: entity + id: RandomHumanoidMercenaryStandard + name: mercenary standard ghost role + components: + - type: Sprite + sprite: Objects/Tools/appraisal-tool.rsi + state: icon + - type: RandomHumanoidSpawner + settings: MercenaryStandard + +- type: randomHumanoidSettings + id: MercenaryStandard + randomizeName: false + components: + - type: GhostRole + name: ghost-role-information-mercenary-standard-name + description: ghost-role-information-mercenary-standard-description + rules: ghost-role-information-mercenary-standard-rules + raffle: + settings: short + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ MercenaryStandardGear ] + - type: RandomMetadata + nameSegments: + - names_first + - names_last diff --git a/Resources/Prototypes/Entities/Objects/Misc/books_author.yml b/Resources/Prototypes/Entities/Objects/Misc/books_author.yml index 9adb14f4eb..37a9a90426 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/books_author.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/books_author.yml @@ -17,7 +17,7 @@ - state: icon_pentagramm color: "#911129" - state: detail_bookmark - color: red + color: red - type: Paper content: book-text-narsielegend @@ -449,9 +449,9 @@ - state: cover_base color: "#0f204f" - state: decor_vertical_middle - color: "#3c6ab0" + color: "#3c6ab0" - state: decor_spine - color: "#3c6ab0" + color: "#3c6ab0" - state: icon_stars2 - state: icon_aurora - state: detail_bookmark @@ -641,7 +641,7 @@ parent: BookBase id: BookJanitorTale name: the tales of a tired janitor - description: A clean looking book, smelling vaguely of soap and bleach. + description: A clean looking book, smelling vaguely of soap and bleach. components: - type: Sprite sprite: Objects/Misc/books.rsi @@ -657,3 +657,24 @@ - type: Paper content: book-text-janitor +- type: entity # WD + parent: BookBase + id: BookMercenary + name: history of mercenaries from the beginning of time + description: The book tells about different forms of mercenary work in several historical periods. The author condemns the phenomenon itself, but it is still interesting to read. + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + layers: + - state: paper + - state: cover_old + color: "#65802d" + - state: decor_diagonal + color: "#737334" + - state: decor_wingette_circle + color: gold + - state: icon_question + - state: detail_bookmark + color: "#0a0a09" + - type: Paper + content: book-text-merc diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml index d093986b59..4be668480b 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml @@ -286,3 +286,16 @@ - type: Sprite sprite: Objects/Misc/bureaucracy.rsi state: stamp-inspector + +- type: entity # WD + name: mercenaries rubber stamp + parent: RubberStampBase + id: RubberStampMercenaries + suffix: DO NOT MAP + components: + - type: Stamp + stampedName: stamp-component-stamped-name-mercenary + stampedColor: "#36451b" + stampState: "paper_stamp-mercenary" + - type: Sprite + state: stamp-mercenary diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index a13d0e6a58..c472110f14 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -450,3 +450,21 @@ back: ClothingBackpackSatchelScience ears: ClothingHeadsetRD outerClothing: ClothingOuterCoatRD + +# WD. Mercenary + +- type: startingGear + id: MercenaryStandardGear + equipment: + jumpsuit: ClothingUniformJumpsuitMercenary + back: ClothingBackpackMercFilledStandard + head: ClothingHeadBandMerc + mask: ClothingMaskGasMerc + eyes: ClothingEyesGlassesMercenary + ears: ClothingHeadsetFreelance + gloves: ClothingHandsMercGlovesCombat + outerClothing: ClothingOuterVestWebMerc + shoes: ClothingShoesBootsMercFilled + pocket1: ClothingPouchMedical + pocket2: ClothingPouchGrenade + belt: WeaponLaserSvalinn diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 80ea7be0d9..8124183464 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser.", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser. paper_stamp-mercenary by DOOMMAX", "size": { "x": 32, "y": 32 @@ -265,6 +265,9 @@ }, { "name": "paper_stamp-transcript" - } + }, + { + "name": "paper_stamp-mercenary" + } ] } diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-mercenary.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-mercenary.png new file mode 100644 index 0000000000000000000000000000000000000000..a42f6e56b4e00e07fb847ac5792e1c66842a2051 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}xt=bLArY;~ z2@^U0~zPWjbN?K53d3oV|!s@i)n$u~?l zELqvsS>4)C)+t!k$y;vO%COL*%o~74NtOip1vC7|0StmY?*bJ?dAc};SoFRSRWmH&~~ZEE9=M8ZwGn#FER7%x;M80XbXd Date: Sat, 1 Feb 2025 09:37:22 +0300 Subject: [PATCH 2/6] Add: Merc access, ID and door --- .../entities/objects/devices/electronics/door.ftl | 2 ++ .../entities/structures/doors/airlocks/access.ftl | 3 +++ .../objects/misc/identification_cards.ftl | 3 +++ Resources/Prototypes/Access/nonfaction.yml | 3 +++ .../Objects/Devices/Electronics/door_access.yml | 8 ++++++++ .../Objects/Misc/identification_cards.yml | 13 +++++++++++++ .../Entities/Structures/Doors/Airlocks/access.yml | 13 +++++++++++++ .../Roles/Jobs/Fun/misc_startinggear.yml | 1 + .../Textures/Objects/Misc/id_cards.rsi/meta.json | 5 ++++- .../Objects/Misc/id_cards.rsi/non_faction.png | Bin 0 -> 433 bytes 10 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Access/nonfaction.yml create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/non_faction.png diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door.ftl index 3f4ad9693d..b43561b045 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door.ftl @@ -76,3 +76,5 @@ ent-DoorElectronicsTheatre = { ent-DoorElectronics } .desc = { ent-DoorElectronics.desc } ent-DoorElectronicsVault = { ent-DoorElectronics } .desc = { ent-DoorElectronics.desc } +ent-DoorElectronicsMercenary = { ent-DoorElectronics } + .desc = { ent-DoorElectronics.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl index dbd1984b7b..055d1af2b4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl @@ -311,3 +311,6 @@ ent-AirlockSecurityLawyerLocked = { ent-Airlock } .desc = { ent-Airlock.desc } ent-AirlockSyndicateLocked = { ent-Airlock } .desc = { ent-Airlock.desc } +ent-AirlockMercenaryLocked = { ent-Airlock } + .suffix = Наёмник, Закрыт + .desc = { ent-Airlock.desc } В углу имеется небольшой символ Администрации сектора. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/misc/identification_cards.ftl index 658ed8ff0c..da1b875c47 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/misc/identification_cards.ftl @@ -1,2 +1,5 @@ ent-IAAIDCard = ID карта агента внутренних дел .desc = { ent-IDCardStandard.desc } + +ent-MercenaryIDCard = ID карта резидента + .desc = Карта резидента выдаётся Администрацией сектора. Позволяет записывать данные для временного оформления и имеет доступ к личному судну владельца. diff --git a/Resources/Prototypes/Access/nonfaction.yml b/Resources/Prototypes/Access/nonfaction.yml new file mode 100644 index 0000000000..d81cfcb02b --- /dev/null +++ b/Resources/Prototypes/Access/nonfaction.yml @@ -0,0 +1,3 @@ +- type: accessLevel # WD + id: Mercenary + name: id-card-access-level-mercenary diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml index f75fa2584e..5b1f33cf5c 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml @@ -310,3 +310,11 @@ components: - type: AccessReader access: [["Security"], ["Command"]] + +- type: entity # WD + parent: DoorElectronics + id: DoorElectronicsMercenary + suffix: Mercenary, Locked + components: + - type: AccessReader + access: [["Mercenary"]] diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 1b767f5765..0ea10a2cf6 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -950,3 +950,16 @@ - state: idseniorofficer - type: PresetIdCard job: SeniorOfficer + +- type: entity # WD + parent: IDCardStandard + id: MercenaryIDCard + name: mercenary ID card + suffix: Merc + components: + - type: Sprite + layers: + - state: non_faction + - type: Access + tags: + - Mercenary diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml index a10b5b5adb..4007307c18 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -1227,3 +1227,16 @@ - type: ContainerFill containers: board: [ DoorElectronicsSyndicateAgent ] + +# WD + +- type: entity + parent: Airlock + id: AirlockMercenaryLocked + suffix: Mercenary, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsMercenary ] + - type: Wires + layoutId: AirlockArmory diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index c472110f14..0257b5d1ce 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -456,6 +456,7 @@ - type: startingGear id: MercenaryStandardGear equipment: + id: MercenaryIDCard jumpsuit: ClothingUniformJumpsuitMercenary back: ClothingBackpackMercFilledStandard head: ClothingHeadBandMerc diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index 404d79385d..708be9dfce 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), non_faction made by keslik", "size": { "x": 32, "y": 32 @@ -226,6 +226,9 @@ { "name": "idmaid" }, + { + "name": "non_faction" + }, { "name": "gold-inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/non_faction.png b/Resources/Textures/Objects/Misc/id_cards.rsi/non_faction.png new file mode 100644 index 0000000000000000000000000000000000000000..698018375c2bd77770cdba67c452008636885421 GIT binary patch literal 433 zcmV;i0Z#sjP)&PU=hA{T|pHz@2ey_D=!G)usSK zh@{x&0QQ6|odUOyucT98kJ((@ZJz`1`>p~A4UpQtq+d-!t@R}Kql+jc|Mt^bqwo9t z=NMSdf!H@Oa{wqpf5n6l)3z(8V6*7+k Date: Sat, 8 Mar 2025 18:20:07 +0300 Subject: [PATCH 3/6] ghost animation --- .../Ghosts/diggler2009-ghost.rsi/animated.png | Bin 3928 -> 33257 bytes .../Ghosts/diggler2009-ghost.rsi/meta.json | 51 +++++++++++++----- 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/Resources/Textures/White/Ghosts/diggler2009-ghost.rsi/animated.png b/Resources/Textures/White/Ghosts/diggler2009-ghost.rsi/animated.png index b7cfe288331bc354f604b78573108461769637c3..4873aa86836d51ccc658624fbd9724280aaee337 100644 GIT binary patch literal 33257 zcmZ6z1yodF*EW0z>F$#57LgVZ0cjABPAR2J8itaT?s5)MlOp!bNBh=~XQ08&j2RYL&4ioE$Iz=N*5 z8)`;CKM1`w%>4j>nEK`$3n(mR0D!0>P1Og+LB;!B_iMO@a-`6w@#J&Ly`rRl2?8}H zuJDS)SBU}@zT=VLn?>TX5UlPcCx6fLT2*GhH5~P($ALu5bJb2d&-(#67Czo3c1QZ{ zrJi2m2?_}uUa|llU%bMeMN%4>4`S@__1!;zoU`&ApJbf@xL~23K&AnGV zX(US!%vV0L<1ulJg(5(As6k70uE9+4R>7sg5f+Na9ZM!YEE|`X76=&@GU5z5rWElK zy~ouvG%BM0%($2(&Z9%RM?rtZVZ? z{N&^$s*rv&k0J`z3f*Y%_}I3QhJw9M9F>30+dwjX5kU}hm;&t&TC|TCqyK^|^4mMQ zDE9jVpyz*fF0*4>@)?VtNLJ$w(NmZI?6&x%UT+TIPT0ENFNDf(^``tw)3L7fsyBcD zc}Qn-gb>0pXnAQzxbED<7&-W7)1o%+`?J`E1K zXt9z+alE28>1g^jB|D+NhTugMl^XCXWNP%!&PII>6RehMNEm){Pxb*0yH1=(suhOA zx7b%9y%!Po_b(d?KPwHle($2yntXT_Y=G_YHyB;Vgr@e^aYh<40kTD+iQ5hfZW1K@ zz7&+Av78zLr3x6`t*k+qc#jD;O{_7K;hN(yd5quYQCd&%*LobLSV9-FV!!;=s(|c?=eR9L-ATD)i7q?KwPi9AGct!b$r=p!}ZzxKOf5 z$Pk&$H!zf`Q=WafUF7vcdL=B20k|$amQ^&>dYR15EMT9vJXv=^?vSqHd|x*B7Y|6# zxsc9)WBF$e9~0;VblMQI4BfG)rHdTgEZe{4Pb&Rli*u-?(|Mle0wWItd0WF@G+S&v zyahMeX^+9C>-25>U{PCUQTvBbEb;0{sc6EW*5ulfahJ?ht^~Tw>sTTo==fx#8_AX) z&5G0aMc#)59cq0`bxVK1rzX#IjPc+5a0Ob%!^&xaifI9gP7d0k zJJ3HYYI9A{R2`e}Nt|`mVao^1B>DfU_1nbb9U;9$bciyZV?qOA#RDYU^DEf1)axOFS z8NiE)I*VCAuDCY))0Aeb(5O{1y%bnDa*_e~gLdZH`8Kl@~aacN>C zZJ6Hnt|N&=#nUEAc14uUxb9-vO_v9BbX`UVdQqJNr*;%&%y3p2VEM&wd2!zyrH0ko zh5hwEe~5ZKFA!~Q-|B6xtxG;o8c0k$j}bX*A;wgNg&C;e$L4r3nK2K8b!YlrHjk=j zd=J7tivwExR=`NHADufrc0&SoSc-L zC^3*2)XzSyHF;b=tN)#VznsRo$-EAm)7{T*Ol&?0q)v%^8_-e9fHkxC0{Ay*-ZZb{ zH}GsG?&>#NPuI!rQ!@54{N=;*7c#Dv_wc!CmGH;^bsG}-u<#vhUG+_4HE8i2UvCAo z7%3VjveciMsG_w0W`ZGIsV66X*Yal}w_96V(Tf7c?^TUSj4>6N8CnE$A|Mr?6g|aR z$bBm-t5r1G>QT4kK+`;lsi`Rg3Es12i$pg&HgrdTqIG%X=@+8L_?Auz8U9AWvL#PG zUSsa@ktN||5uXb`ARJ^Fvv9h*)GrPC6BbH6~_B;QZ)e*PWg_-(&Bh1NE9e#hsi?KX?7co4h$XDv6|+E2bH=G zA0F$IXMdlgRC^j3&Z>@8z1ZZ2S=g7lyjFB#%{{qK$G`p8vNl)L)q4V5TDraZfokjl zZaPx=317k{PxrBWWhZ<(ETtgmAh8Vy+CJJko7D~KXYfGRM}|!kVOQ{-o;JYh z*h^6JViNWfGXVwE4tn2NB8^`! zJq2`#h4Fh>o}I`9chY#0MYBZi`WG@u26wCB4{$lAVu3}^Y3$me)x{>MBmCemQcd(W z8S?QMH{sIB_(?dUh%Kd@TZB9Djh+v+P@$aQOYnWXAMm}=_hGBKUETCwo_;mucH4ie z95#puQXuGf{pIU7_*1eWPIq)3)9|>yZ~FF3Qk*pnOWAAV%jK$T^PjNtWvTS`i5gj8 zTe-=%yY51Ia>a;$R0clA2f64dVLgtC{Bd&xB5fJGo*aAt?!j>2VQa6z#!&?hx4ntM zS2YuCBzSFYZDzv@e6|312Cq8w;Ro@z!e_I3C;_KTMWz)0Lt<3n>mW*;o(e50c*LcE zO=nP)OsbEcUsk^O#|$x!s}~e0>JOsW0K+VQo}yRAn-BFq;b?sF&*gbjA>OeK zZ~X4s+-a&>QMS{5!rNZXDPAAbYZvL+nruUZ#THIx1?z0%#U&d-D9mO)@afB0T%fzF z$D8#D3GR#0E%tYz*(|otmx=nM7$U#VpR^)0B7R>D0-Zs}Du~nFO8ENrHeOy{-fw?7 z=#7*)50XOiANK2gU(ua1L?{{)!#xhBLS`Nne+8!tc1xXz0O#G_BTHDE0G z-|XeOIu;fdRF&9T$n$l0p$uoiaeQ}sblS7kEw5R>yJur4?QHttv6maxx&YN~Zq;`^ zW-~Os@7QaTvykv|bW|*I)*CWgpp5hcV*#5qd}pSlsQr1u;@uqp;O4cKD@hHxzHIJ( zAy+amkW~BmWw5NDFQvxp+P3a;0{Zo#hPV4quxLiPQ4m`Ke>9k32wmi+YL(&oz_qNf zar|j~O*ForsCp{l`{99mJ$rq(K%R`N@ehLK#${!b#TPF#&W9esL(5@A*TLl5fU!v% z=gIHLaI)3)^}b&*+^G(#DSV&tq*EOrdtu)kVC3M3t~KxXXW`Dmn^=W}bc6d(YlhZND zv{UtzGqUGm{)uB_V=*VTnFpmI!oct0Uk^np^iL@0A_H_i?S;$g5nvH6q zB9bP3m{t(@uyW`i&R{03S2}eV(82sNpQPi)vxd^xpweQ`*EMl&%BGN60;+}Y%luhl z?sAy)l?}jV6)d$fK#j2==1)n@%46J7n$)Qmrp*?l`vLM6tb57QA1<#WRF20`oXD{s z=I`6lQ^A2lM;}EN z>}2g{GNJU)nh~QC*Tu<_wMO;u4r4&UbEc-h+TD2s^(oBE%2k10Q#+0V*K%`_?(qXb zb8W3Jd(EHAz%S^f+3dDUjGX#)&hpc?UU1Bo^khbByyIIuIb=3Ok9}$^c%8MYhvb?r z$qX&{5~GCl;_G!H(x~u!Ht{=n>cqZntWkL3%eqm^_4RK*Ys{BzP2S(N%S%f<7LCq1 z7T?!h`(&EHYi8(39fl9v)bkCr$JV*nrVtiBTQFTs2@3H$imbK ze8Tzjx(l@qFSXkW=&%JVqA~c?xoZ$_&*1mkSh7NeQ$sIWCeE>sz~DlY4rZj1yKpR> zZ+fpa0vG6n3!fC~RVET190w}>KF1vNK16TNDv4za`rwAJ0O>b%8Ji_R@j93#Mm1xm zcucO;^?0zW90fXkp0L80U-EZd*uWWy?!xs(1HZ2Hu0Fyq^&3w z)@lbI5dmhx3b6>NOPSr3ZUN}}miNy5xrD<`gZr3C(Jm?lECoC*jbGU`1QVQ$2?4?_ zI0G>*YEtkEwC^vJ(c3ExaD_MI&2V7oyB^M`0;Sb(^RSQ>ss5lXD5C> zEO1HCGB3(k`>vn-BXgohZq9c})P&qOx5ark-4(io7fK-~NsRh7nelZdpu@WBF>e3I zFZhRRhr&gQ^6I$2et@MwxnbOsxDMw_QnOpU=&hQvJIL`J$FU@;V`MRi{I6dfj0jh8^ zJ;Ti89!~lz?5~rPXKf?0(LLb5Rk~#D*KaLqD=s<>t5)ZmT!2jKgiW|Q*O4uOajcel z_oks>c(4Lja}Ri*6u2^h0;x&946ol#R!FSlkLH$_P*o;J2BBraZF~V6DbIDCZq1+{ zK~HNt?YO5eR_~*S#$f$72OkZecUO1VNuhTnww`!4?yh4}Wh@T0O5jzL4)Jqg+Kg0+ zNOrIzPFVE~r46S~-2;s2TmX-^quYkvm=eyn<~Co^Qp2j>9zc0?re)pt(MEf!JMhUS zkvc3Xk14)xmUI|6f%r4)+*IJnGKgoraTuYI?MUf7EyMQBv-P`YYx9v7hx2{O^iE}L zFf?8?Pl^?X0DVZ2NQT=mm#E?0yY>`XC|F`(U_#W+un8L=Har z0%cT|Hp+Ap&a(qzd#?A|>FMdKZt+01hU?OO8jQv!E_J($N%^p7OvTU*I?@Ar+G(Gd zu~t%CtUQ$eJ>vNEOqKCgzCf~8d1l)@du_ed{OB#3zaQUZYyD`owY9|oBF=}D-mV-% zUmG0=j7ay@-iih6(LdkG=$gqh++Smkt`nUumk-`?NMeKW{l0Ls6X;B?DHvN*y#JsN zT_5IaY%5Gm38>?o?|xK*Pf}N#ZvBes>^>H=?H(Ur`_6wHW=;$FsNwbR`z5&Ay~arO z8D&Q!6*YEL9yZg3Se!>NU%n|BdWHM}CTngtH(l9qZ8)H|7}q)Y32VOX*xu*7dn@c5 z^l?XKnu7f@p4ZNzOHyg)->&Z1pG2OzK>MJJx_E!xz_+tgQ%t^VXlb%5S();2tDu6F}JN+?1BK()&sjS~R%O$Q^E zf$!u9utE7peS6tFu~etX*<%D*6nM3ky$OR`s;C>I!@76r(^>9en0j2>KY38-G;Xqs zpBdMh++iR&ViN;JW($3(uKxTHqzsvN-WtQL3Tn(wS7ilxvB3g^sa^9*G*9D2t3X^2 z7=nw^cbF~eE7A}M|N6ct&Ex%yYhf65i}#!)(dQ+}%==2ngzPSJCbrJXw25kbQDTN) zbd(Y7a2R`6H~SGhT9E2kYfG$pdl>d3$nZVNbXAG%0cLux6|3Rt67Y^GrwhJ>9}{D@ zy?$|<1=li-to!`(Y;OQ>vEHVuPam_(2E42FPwZkJyd`eF8p;cr6KOE5by~gu>n7&2 ziLT5>2%K*&oT89N=&o;xX(8WZ5SwVX>gs=_iPr;znCP?Bl)(s}_;h-biJP5NpcM+j>v z7S#17LXR~nG9x#$7i%_@_O5m*()oRp`|^a$k4OS1hP4%cE>B*O>!-kG+@;P0 zjchg>ck?%UVn>wHm(g5lVD>q}T}gNdHH^w5KqBz2QUNIwj4ykF@!nG`Kl?ek$w!{) zPgxfZ&#B{751t#Sa8FT~@8XX{O^gk1uxcR9xG&`lG0kyO9U2k{A^EyrGNUI)NCo9A z7(2)$V~Ft}K-vOVkbxg#q@|^+CLML#h9@6A&X$kyV&?xRupXL;zImI#VV7dcvPgL0 zRgGjU3LKGbMeDd5*Z?%oe8nj52j%~s{hHeam1h$7%$zauC1lIp;Y9|R9IabvY)X2J zSSq9KBaEoLqH93&aJoi$WF4Nql|1wX5ycMP`Y48Dpn+OhT5=MEW%5fqiei&RF8(Np zi)=cR(w%+1|ksf_B0?ZOPrRe9X}H_ zt#A;9Jn<5QB`TrU$bqSoCx(xQ{Q-J?LsU_*rV}q4{Th6zfL|WOet?ngQ6y1TLG3i_ zP8eZoigK<3f7xwg-tza|0CX1^2>q(JMYPm)a{W1z^YrvQ+F%3C;FBL%s;wGw=128v zTawweFJ^tnYhtC6IQ`{rD}{8&-TOrV{3BGBRWz>--(nb!OHif6=(6B|+PJ6{3i*0$ ziCQn4d$EK@sGVStHxYRSt#Az8ehqc96C&OSVb6Yk;fSjZxS!G?v->i6mjNKKc6ff3 zupz^P4$iU-Uc}MFD4~xYLJ6<7Q-=o+KwQq$OMv?37fSN-WA671s*IsmR5N9IwTiCB zme<(z3B%nS)kA6xb_olCzcY2=G}dHl_@z1fi24>g$+oLjHWWhL)|c*1z= zNMz%;^P_0=K|QSK{opMFxkDEPRtFgt-fi0p*1!jXnTL`e3C{t;#hoXgvrAx%SmNN~ zGs#bAZ7#co*kU3V>;2ZSlns7b#DKSqu)pre3BM2s1r}`p6P9ChQ2Gpo6jy^DYC)l_ zv+GuV4Ad&nRg3E+ds?hRtDTkY^!aRAB~PH z$v-kgX?v4A!~LByMUfvIV!2?K_<}f%^?pb!xe{8u=?}jf$>=yjH62`^%fZqxv!!MM znwX+>3y@bD}KUuD^*+*r9dUGlyGVOHqKOv~bqkLY7V z4A=57;uXO&3K_f#4&d*VmMY`cx>6_C8 zjslzC)28K6TISiXV#{i|l;~x+Z2SHnY-($xg)?1?5^bewFK&Quwyqp9N z?H<1UKD_8GK6%2|*a=I8dxRzNH#MF>tKa=Q3UI5e3ctzQY&snw>3s*d5PqDf&gj$K zE6M{~*Z9Cw@{8Tch(tK%Z{EuQ(G!Y9$=HGU`2s!dVW0Hi-w^C|UNWIVIf&eEU8(Cz zcTY#ZjU64ruI7MZP5^qk8uVO1IwxX}rmZs|-&v$E1W1hr*+J%~ww5Xu_*e~DlTv$&OSf&Vrv3)OIb|kAPH8#)`qi{;BR= zj^h{;BnFLM{M~gL&4E?V^tnrE?`PN}!(-9-D6z=!)|js;xZ|z_UrB2^D3G5Iba|<}lIm6tD?>cS zuBer9-w7GJ&&38VNQ9^$Cntxm0HCk`?Ro|M=uqY~r`-hNIqrM(M6+~p*4^{pW{OI= z1j5506U)g?LmYnNk*QtRE$?gLq`kTxPMwA{>Wq z1l$a|8f&e=MnxfJk7A$6un0D3CC3#IJu_O4IwRVPm7RPj$wEfk;3}Z2;gFs;?Tla^ zQF==_P4H>KqxJ|go!<8gJQTgm-0PnHHF4}x#}THNp;-x$^-jIQQCZa~JaZDch*r;z zQLcynfq|7dsklS2^cs(soxm4@Oj&*>W%7@2ImV>oxqD@{3RhNqfA)+q7b(_yn?wT& zE2<2S)~iKwM|Y`@Sf9>v@RTd!F6NBKxwX5UZD`Dy#k5~~#dwIP3bPfyj6HvzO2}4J zg`E{>1DK;1=yr<5cZyW7givg0Lnie$2lZI)Ul5X|V zm7HJPw)e}A+*BwYApA-Q@QH%)b2Q6w8oADz`9kNBj)T!OLD4+M+>63h5OLVT^fwaM zKe5bQ?vVzDXK2Ft?hIyb6J`ykV_!0qWhX2`PhaKDPVgedipu9LOp7V>3^CTKfU5o2 z*m-lV9& zC7=ozvw{N^$jJn|r3xv&=&VebDP^Rp=Sp@>oP~MrlvIc9j}L`I_rotgecMT8d0aWI z$?z--=9d9ir2}<3N=iz26xp)Bh0JZjXD7oqm3ori=EB%WfDGp7W1rTA<_MWdU*uhL zp{%HPJY*VAWmwerE+%7Az{r$0fIO&ebC+J8c1_9c;Z@{DE({L+KeH|ubv%;ZBm&{I zH5a7wdO6SbPPBC47dcG1{XLXz-ZrroKRspo2+T3m9Z9Y%Z-Okm{8L@;n0lE#Rl>Y6 zx4H5N$4-R_7ZA$a`l_Tx={s)OKZ;1~yrtc84%I@*_1%|RrXja@KC$9~Mc%ZG(j`rC zJ}I}}d1oUJeW`-@(qEILVDY_@7TM2cg=I9>0>D!qAvlf!qxRw%HcQXv7$XDajt7$P z$=Xo=qM_UCj;So=x!@EtKrqGKj++xwZfIT<<3ON3cHr>!t5JS*_1;e&kk9P#7E2Tu zQ~C*M8%OhvSED@n%f`puiON1ZPX}4}fmx zaC>?ClXpoh)D5@)m-HtVyI7g2IAUf7W)sRZup$iw2|nTc-)&YIDnF(X@cclbmhsDx zBGqHniv2&ERL5vL0l+E}Np-`>Cy`_0A0Uyw8&Sj>H)g(h3@Hrs7#f(fvwM-~2cI-Cv$b%KdoGdSl0%rrKcxA&JMH#0f!pcbHO6*@w^F;r4Cn$c6ouKn^qW|B&)5 zLSXqFK&vVt#xAR7S0YDj7fM?TcaVo@T&dfU zGO5&?bT8|13@R*Fm5yMetqz+jD8j{fG(?oN36xW%1uGne-;R}7gr23H9Nobd(29546ijtDbRXNKtR=>YACHZ;Y0e<#hX^Xm=lZQ9t7v1>U!leNIry0IvH1*kA`B zE3bZSl%#2wX;N!~RijZm;|c&!8~k{Ka9zem=hG{MO_(RDkVS^gWqmAK0TV^L5+;%c zLv^tb+nQ>BjyA?9-@zolK;x$-M`aou;@42ESTJC z_%8Cpj3C7KmGNuE8biB^0IycW@cvxK8yqeJhe|){zjHmc78UVl88Xm%?k4P|hbbK@ z#W&7|ogGYAV0JaJl0TM0x$8&Sy%O8mqzPm-7TM1LwxX*AbH2>o|ZuP9o#vHTMisW6wptE>}Nmd*Cq=b zQEIUG#9dN~bKN|p{1bDS3A#3aNQrbi(7uD8{*ph54%Kqb#%lu(H6if3VKMwkzO?f9 zAr7aIfo4lP;;Wzg7~&Q1{^HSFN{d<(h8Uh7zFSp>g3~gdV;~9@{FJ24Kw!ML#_p@U zGfNXK2ocN>Wi0n+t4xCa=ogTm`&f{eiuvAaVHL5Hrl%^eILvBI9>X+SI#P1XM-3AHqjpa@;TdA2onwEgeL!A21xT=)LqJ zG{3%EH1W-~IbalYl;|BCd^v-Ktx#huD?a|)Z5C-;KRdB9R`Y5>y7M03O92u2-}lZw z#dA{LH`7)8GbxH6C9eJPeIyW?@QBN_OH_p?uwc{Qzq zIE)?w{+gAYd57A=M^Fg9nQ^rjXIO=#50KDc1@dADDD{bmNKH;o&U%bdZaH4M2SU93 zi&u;VYLER-JDaFtiOOy2p-n!2sQEQuLJ7E*m-=KO;#T#k6J(kgU=+j%&vs@ zU_=la)%N-GRGc_@5pr@zIIW2>s%Ch@%)Vlg{~V$c#gJmbc><47!RC+*=wtW1R%Kc* z0d(JW89h~7NVMRl)LM(l*neBT(Z9F9zK#vicJ&_bx^%Iy8shYOMpd+UGGB=Cd1wgd z7_bZ_URs%_4tgwJ$XA*asMznHg;bpfj3BI-mC1?Cj$uUY&ngz*Q9>-C$wAZ-QjDWs z8aeqp@_E_3dj%=Z+fNSp^%<{k!oV|lTNG9412xwID88YqPP|S@;FK3)@BiG_Qy+cu zqNvQU3i8R{Pckwu{)bSFS@TX98`FkZm;28H{-T~CAyo&2+LC`kbbjLoXJ=>InZ4P@ z%)XsC4rp#2;($7o-zmgJ1b2MQZX1~xplq$I05gw^^+GUD%obatVm(0g&?@e5jC4$q zX~Nm)UXkt-NI@Vi9O^dwn)h#Wuj1XtCqikxjpX=BLxm@1`}(2qU{kHC2*e>N*f=OUIfm|TJkei9DWTwDt8kB39_a}4?Y&5F z8m**wGjhvwUm6HsbcmrX6a~@aH+l;aB_~DR%BU z!>V_9QT18=(}hT9GP9q626Ey-dbA#wT?ha8O2EXLRPl*Y1~c2mj;v;WamThN{bG^t zHZf?pyoEZJmtl3fhh34y$EC}5k*AR5X0+mnuIyt8x`*Fm*v6kE&OibY?f=WQpE&?f ze*&cEJKA@9DzNSyZup?}%1o+xLV~>S#FP5=CCjR?x92-(b}Dw)v_Che`W+3kynlv5 z$wI}il57i|&-%Ps#%D8MHdcQTEeJC_X{bNaos5tj58@kb~m&!CdFZzHg~_*Dl<%%g40~AWMAw z5WnNlv-~A;h(E{Ebz3OgFhdyhY__oI4e3Q_;C%n)-78p+6YP<2`b}LgRhlx=VtXSp z=N8^n3`gpu6+a%g>BbAW+d$9OmQxa%Ud%?AHO$LwHBHf$Axgjdn>xFV=yqwVm>8Kl zj`@;m_&>!ce++z18ic@4n_v(ddM{R0I7znn4oZnxNaPKL!o(Xf^AL6%BNoN@3W99m-EFoZ@Z-j+0{?(Hjf^CXmQ%Zs zI(PNR+omNa@DuAPf+OBZnCq@dgC|R;CRPCyGe3(+$5`rHhLL5N^xfQro2?5T?~i8_ znDi-z?p$7D`Yy4PlcSQJ2S3pGh7FzaZ)aa)8LRv4lZvbzeG->iodNuqS~I~n5Gf~H zK4tINbDFM$pAi~2nl*w8CG^XuXFkF~_N^AR1HtX-Fw%Yoqxn_~k?Ssr^&G!Pij|Ap zj;)sLyJt8Dr)i|cp)4eLiC=PXjY?avVaI!QV-sOseS@`fo+v!&ZC^ zZ9OsqB+9M&=|h0fLqNDJdh5%w&8u4rN}nuh-fO!JvirG&Kq`QEp=5#Z={u0`?n|(A1Q}@~pv~vTGuTUjc zi9-%A#-bqKT71LN`l9rz(K0KvUBU=rP8$_|2-7wnAC56N z9`71r?wyy>WTUlZTXVQZS48^z8U|qhVqxKmovbo+8lpr^KJ`Dez$3Zzjf{J|dOJWF zzaav3HhCQQ^j|1?iClnq?AwTy!UM;9PES3j+|?F6Th9hw4Sa6tXgP$$LvmujpgPkF zd!&0Akm!*A98HeiJMH)Ft6n)23%dO6xB7OHx_DmD;PX=5@_p^xf#dV@nMc>%24iLT zv*@wIZzven!Ap+7Scd~!J-jjFZxyrO-}L^jUh?dx$Dl&WST0);--ss&f=P#sskv-( z|02&`_}S{G z`e$1DAW?XWylqXX9G%Aw8fFxQ;twCxNPhEIM-^#R4OhU5)d2HN$Z@$9h)&k|etL8Z zk4V>+q9GYV3)FgHXXY-%wg(Ma@teFe?4b=?U%|Ug$gsjg&*9_q`ZQtl5DJIe;V3-# zMe8VdHdH8ow=73~dxT0$F?WC3rKuo~_JQIt+yFDnR>^q>WxXBu#CK2Y53?U4PJv|+ z*bG(#4C(!9O)Sk;4oQj8*UWqDb9h3j4ho_FNB{{JBoF_^-xn$z>CEZ|8mhF9RMt+g z*H9O}SlLl9lx#b5fmJY}@RuPPU!&tInqaK0b=!ZJ9OHl37;kyw*Lt>g1Q^kp@>7FA z4f^g`Khh7y+VDZy(N)fir!$Kna#MRfYV+x9s2P|`6>(M2B#DhkefM(9u4ZA>qr~p# z-ivA%?!YVi!gzXIwxS#gMFI96Bh1So!a0 z-|zlG5Vjq0u!l}gL%Z~vl&fxxNw}!@Hd>i}CEqM>C3gkdPV`uh-4G8c#Coj*xFJl5 z>O6LFAHw+G&hGJaM%X=Iy3byRyYF{mG&hSqY^uGEQebuW zfzs;Q@kGbnku1N0sMX^dtv_cWiFE&@SjK_jFQzov)zw0f-iJJeeECLCP~#MF9ie0` z(8#UmssIfgd>8to<11TgzGem`mv-5{miD_14M(w(xIKdRu-={g=q~+>rq()r#Thns zvS1K^5z0yWYCA^5Z~t2UYUV1s@kDH=Isd6tCTY};oR&9S?X%8cfsDsH22Q*8h8@s__a&R$v06rcM(h(K?NxzVQ7TPvqU z!Aj>CE)pD8;ePkFiy67>zAlJc|8c;u@$=mrt@QRrah|*S$Su29G)d}%_$4@Y@16QT zcdiA(t}TITs)?2BV_IMp8mb_tB9x#nr|?am-&s(7-D->5P0&dSk!5KSr(91=xFFM& z8%pokybs#6D)5?BnMb)S!$)mix3=5sJeDcIb*>e+j}sH#DS~8B;hH=V=nb~L+le~) z?HYtXPrcs$9;*rCwn9z{#$Pe~YD{}ruw^S4Xt}qRg7|@Dbu{_uYxu>^`NzfF9U)@F zi_Z7Q_uH_*ldhJ><-4vg@Z2_>sya0*)Fpka7n2#$311V<-ZI z#PeCGWGSD>BY6XVT)4R%k}>mN45in}aD!6(<#a-Vq?p~PEj4T^No+UrQ<4V|y7&$4 zQXZ9bBt}{nHjdo6l2gV{0UDiGZ>ZAVL(GLsS21|JF%$#|Gr#tlcN`Zi%n=Uj_Ihjz zHP3xBPeJ^wKbEQcIi_NMUw^d$?ecQQTs$pHdwnZN!z=qR$4Ma?8kP}7;g{wh+Mk*t z;fWAlVnVfJ&3ELJw7&Z5^uhOn-F4_JCiVMkHgI=Nuo7vs(9$w=p~JRFpcl8>9#V-+X;La_(O4)e>SY z+u-YW>n?pbl^%=%9q48F_0e}5yPA-uuGi9Fv)e&QPLwbEJG<9#cx8Y$XF)KLO4)lpSI;K( z;pE8W^iB%LAtf^7c~NY;b9B*e{0sB~&D7_W4A$J5Sv)!+q35_^%Sq`s<3m@gE1h_a z7t-yM5}oFA<&-k-u?)1-x@`0(J8`PKP9~1R4$^&_JT&R;wPMrV<7;=eov7=_+n?7z>sic$NX_5q}aCc-ZsVetxt92t0h=v)lrI7MEfho7SUR+1j;BPrN4Un34~ zJLXqqn+ersPfZNIi_Z9>9Ki;=B8OeXoUsgT+=0k~4qCo=RVZ5KOfdHG}DnS|qh-+4XX47cYUh+L1 zPl^obs*`5EV_(6hlkF2VUV+vYhZPJWV#7R*L>D{z7A?}GLwX^YI>c++ran*BJRl&z zBps{u#{6m*($J*Y5v1RVT?;?`P1%jwX09Dh-qhxoedZ;X1i_TUBf0`;g;uTdXh@h$tH;<` z>VcY6fhZl?c?B5tjO!Dz_*MaWCM*bQC8mj-rBuE#LpG>Tzq|=sIu2f(Cdl`r+MDtk zn6A`sU0*S0*lmf8x$u9E?wZz1(;pg*H-6fB*Zl zccGp;XU$Tyx4KxLS}S^HDU_VX%jS%EoZ8O$SLm7+v(kR zyy;DyuwBLxBEr{?x@=knLG`z9XuEYDT(DpP4=~maMwljX#9Fn5&pSL>Np1!bei0veBG}GI{ffTf(ak>|+ zK3|Sb`^lB8#$YxJR?`ok3MM46MZV@*_0+03g3Qb8clC-L^n4r(W8QJ6<(SS1MthBR zNn%TFd6^(I-R0;v#sU6vPRz)NW0}`pk5;yao##_s#~D>^a$`LO=M49Q>)pF8TWlI) zOl6epawTMO{q}-H4TK05{Dtlc!(;6Or^0wvXc}heYoX&l^Gyz+#vJy`W|SW_wdDg%Hbv9l3#yYNaeBpF6yaXYZe#{Ev~I7bI2twhM)M;Y9@r3M!l-rTy<=R9DAV^DWU7S5 z2u}{M-uc3Njs+qTp`(A$Jp#5AQ}4A+Zj=zM)I^LKVHS{w3b!0pw!;!%OyoqOr(_qj zj28k6&N`fJ8RI@fG=C-A=wH;F9R%4LazK-v%wK= z*y}$6NjJARNcI-Z7(|!@k7ENZ&x(vO5~P8)n6A5knjLeoX}t{(UhlYkQOZaodrm5; zbNR?e0)(NUL|3?Cp6sKlqj_dELD<5t$QL)-#lY={6a4FDLCd$I(QK?zU)hu*YP216 zF+5UhB`bW@EC1F|)XVQ8-RB11W$wOlj(Y8qTYg_&UOven(8y5$7Oa2pvpH?pP}um? zYo%MQ)?_*>rE<6x%D-SQp<@%yensb)f)e1?URxYG|73Hk8H;_K(RYD+!&_!??j(Cf zgpbi9%c_ze4QWE9i(RFPp0zH7lo^Cvk6R<3uDYDiueL7LUo+ zTGX~sf<^oh%vuN@M@oald=7)3eS~BKa$8yVdUJR#lnvBXf4;OwPCjW@Snf2t5!1Cl zmG|WH!^vH68ycTMh1JPUY}g`2 zg*q5SjE=Q8-0lwaM3jkpktoxsB{|Mzr^Q+!N#->1GU-gaU+>($)!P~mmwNN**ej&k zd?oM$+L>b*p_E>w&-{CJ?gGCtSQ_S#)qVfUH^1`(c4lqZ>=|>0tZb8i9fXDVW*vs3 zw(s}64X`ZI9J3ZE|D@egj$m1krE(whwma`Rk;6|^CvG*G=|2&4{BiVvlxQ0P{j<P3RAv1I>ZZB=DN<|LQX>*aHh;%BBAK!v>~c+^U1IB!!Xe0BO+1@h>R zRU~62Q#zRN0>5KdvdCC*HFl8(V|8buDDI-e`BYN=INex3ML2$WBMy`_adrormdU4iS#VZJ z8}jh%ZYO>Hf&Ul(e<C&pafVIKaQaf0*k#$F_nv>?iPr*j^6zZnpoD;}D&Ur~FibmEOj_u=SIoo&0}^ z`97EcY2@E&Yg~n|kBF`QkE~z-x(qZF+;eK%etSz)=)cRXK|+Q|A)Z7?sBZ2yR=fm_ ze?p}Nc|hvWtN*unVKpGIsOIN_q$BaL`u|($ppkA?L|btdetBBuxnS`xQ)K18v^)-2 zZb85sT0Z>xc5v>KfM$}m|IgMV`KLAoCHsE;pNs2ChND-0i-a-^-7oDbqyP8jeWn;~ zdMx*cj!^tDKZkg(Fy>f^|4Jd`Fgb?h?N|mrEY*6IZ|N#+{@#U#N_8uZXoq~(CSO{v zuC(5e^N2mmT}}Xi^aXeg%S_Wq}q6V5E|#tGiqMe<)mljxGRFNuNUq!1@VPJwl1NfKHyB?LTMs7(1Jcw}m z3~{>`5_r&46=7+NR}hz>pm#Azzf3|mN%W+25%%cDim{?O8Xw1frx2aar6O1?42k$o zF31<@*|Kyu5&U5HFihY^QBt+*p9D>TyLmF&sHN~3Xsw+i!23s-o1uBS^Rd~oFVxrf zA@#;%8fao(9>wN_v-cXB&0m)h9Z-TcS#MH(DNP1Wq6eW7zHXTjN&sq&ns1skqA?|U z?%V%XP-*;0*`0$vB<05TD6vrli)9`}MGrrKM2&^weji^N62UH~;YX{zF#|iOUsFkY zlLF=6_RauyD_q9(KKK!ep+1Xip?X~6@NxUaV$KpSW&aRiUAReQ-V@m1++eNUVBH{I_TNDTR1@Rrb;cYGVt-BtVVX>D z>#1i$MN(p5HS`cTl(FxlU6@qc#JfEg#xM>bG?-rIV&!1{_E6Q9JA73~GYn^?1)||V z8{dHX7n`fUU0`lmCmbFs`pY<&;d{IlyB}QrAx1!l*rIomNn|G>bcKRoz5iQ*iTj%6 zI`TCot-)}_gZ<@KqeyTufd~)?-(BOI@(gzDy?xAYS&jpo0V0{8{vR^ICq@f>6~u-6 zF@eRK9vS7fg9zM+*{X)bVlK#wp1b{K{6RTx%uQaV;I;@w2d>*(Q?v1C5>(P5vc=P& z!hZUxV}dD2mg>=3CVc^<;FE}X4~92c=jWpqAcK?Ea^Yp9rT4dh5F+A1-XEDgOm>Kk z28ILF+7l*Kmb&A&F%2=e9c#k(tze+UZ;ozu(nD@Yc|3C+RiSO9C9%9o1GFcxI&7QZ zTtX}E_Z5dl?KWeQ#ib=cMp(h&A~tah6lCDZ<`s9pZyjXHlMWG{&3R{owd*|h#oB9x z@{1%Du4?W&nn37_jtpR%)POwv^m4DzW{Zd<2;CJ2`<|N&t$^L&|Gm-kysmiE`P}Wu zY|nvktj0B-#s_5zo2O?{gm)iIN?(mMvzp)mG6G>&vj#{51Y;056G~G@EXuBkWDinx z43b=dzcAP8@WtjRm+4EEnS&!D273X%fCoEq0h~kt3;>RWk||H2>X^vgogdhT8KkC8 z&gZNwgk;FiKd*f5z*9Y9**{<#TAWx>Q4z=9TrefmM(LSUJ^Y)=%2o)o*Ac7ME(8B2 zjV%V5_B8A4d^tmnbL%P^tuG1#@A0&c8wa^g97`T2|iKTTv zxOo6j0BzFo-{i&=xW3TjbA2zV9h5K~Iz$|P(f4f-24eT` zM6478<9r~uw;iv*rLwGhXyndOYHY{=qBY&GENfJHmvGX7pj~3%B>8rV08X!^)ZrQc zJc!;(4L+;nge8M`1qRCvN;5fjdJ_6xMt(Dgs`K?0;_&Y(AKTl2@E$nfnqWQp(NH+^ zrZm*+5@h!YOyzQjp+uakpkkgOlZsn0QDx_^|M9L;ww}J=2&CI}*O8IS$a9Z8A?Pk! zhlU4Q;zIP95g*@m5%+?i3~BU1&!Nn8{IX5UqE4CV^*7@kkJYF9Ui3L%<)jCXvzLF) zUYV;5F*-H8D#laxA>a}tcE?N$>o8zD9OQasl)GrKet{14AEtR2X zRQm<+49{=GwKVDt+|1n{V5i}YtiBpcmASsb@2l&68NF6wq*PKqIB8G zS8@t#PjD^Ek(**At^PBT$%EoCWNBV89&zdMX(x z2Djq}_g`|82~r zF{XvOfmWt66ojd4>_wd*((uNNr@~11>M8f`j??v}QM%|s>W~pTx%=c^44G-#juY0u^x(W${%3XbdmE~RP8oGB{Z>tip;N=OF>vCXSUbr|nuR{G+h zBOrjmne8YmAFXK)g@{dqUpHrF%Hu zmq&#R5f3X;^UJUiC&j1&!w;B#e`+)Cj&A~d zhFI!;8g3{^iunuLHqg&zxW8ZN6%KZqbneJshLD(zZTlQsOHbkO@DR5xlfioubp;}0 z*ZNH+^5j?fm!>8nT?7hwelgk`1u2?*9c&H0HC2Sq%rdJO|l}58`{qawTrJELPi2YhX!%yI}e@ zLocH0+|yLq`Im-L+n)f0N8$4ykGnN9nI62aa0=XmgifB(Q$xOv+}h~e^}+nObP3;s z^_f7Xi<(XoWs|?&&D7X$*#LXBVP$T^8u?g!->$qHkMGhtJ;L3dS+=EFYRn`EPzx}K z{;A{$+tiqXry;|LCY>GyM236Ne_{)!XNLloodd;cNbK09k2g1MF}5y}g6l!Xb@Ree z%yPGvu1!D_*8{d#(!3Sl(j^J~4{*U+F9q!o=Yn#|9vDIq;JiWDDh?C6Uuk3`C@WRD z29FF`tVa6OrEWwNPhMbZ&`}FsCcElvzSu z4O8v&sJxBzrFZvtAbi{L(gC5Nq5k-xZ#?E4ne8uHhxH!GkG!88)zsPm-je9D$!ZiK zZC3nTkF2HNi&naBU}FP!_~12i@iU;3nmiq--RezZ2Y!JotICbi<=M*Q zq-%|S3f-`?nkl%8srl|n-Dt&?1iUdyE$Js*BRA!&kv$WCKjd|&(j?T$HrfDh8&sr3 zA=le&UhqHY1sHAo(a5HS7++rVD}^_kdSi(z(nEFLTuJpC7r{(7gq&3$Aa9#$X=%A> zFkNXXVSQg~><^4UVY2q@{F+OZ9|Cy`6wUWBgs3B(;@cb(npRQ`B!XRzfgVQPk^4;w za{j%9+pt4}zHblN!S73Sil3Dn@nf(hTp`Rr2K&7%ysR;YQq2V^dcS zD>NTm6PBlVUI_wMd32U3Osnih{Z?ZFgb`-DJ5I3_ zdR<1^l1Tadp@Fg7;I@t~^dKfD=_cgy_A^pFBDCQCIWexvJT4mut>ex?STj3~#)<-i(a(21HEY{A?)( zrACIgxn0G$tMW!i72Ryq_>B6bVvjL2s$v18b859Y(r75H?Ok4E>_} zNy&v28t&=A474N@Y^wja4v{(f9@|Tj~Lfad;^!jJJW5P za&t53={li0AW3Mx%`6_|KG| zE$=^4N>;Y-Xx|+xx<-~(peabW${9mANMp=>5iw8(3W|H0%e-I8NgR+gL8dyfj*2+2pIJ4 z*`-N6Y-m`_Zu0Q8U_3@%GZeb9A9hW&>^1M%&s!%4AlHAH*5pB4%tNei8iBRZntIq& zlDQEl53x;>*dztZnI(!l;-Yi%`4-vqnNLB*$tQrm)`Pi|1bc+URYdtH=KuO?;{8nl z|2Ofb9-E_LGKOUP5f?yG(AKaxP2V6JpcULj*!Kr|U~>VWfWnQE)Q;9l^*I$zrZ$+| zf#&LfyK0OF@8pNUPvn%B8NfEEIrw*k#>_$8GYxUC-F$n(eP#mqm%Br}<`JM%S>KV% zAE}&PR9bQ0cOAM`FRuNFdj?>e_AUuF|ptNKFw?sCPJYZR-)Pb@cDR0WZ0jvO-#@4yG@6DHGViy zWRwqjd{tlFzNxTmE_JC-PnPT5AME`NS|b#KT99CRhm6o$E44$80c3&G%l$AWwM8Z- zU2$#|m0>-H?0cvfY(r~xxD|$;DbSHB6<#X$Vr|-QW5NgX7}?6ptmvoPe)xv>O!xoF zCwSB@kZX?jE}Y*w0Q2iZjs?}8fEOSjIaJ|dncb8G-@^iM!GKGKYW9Bv6d)g!syA7|HSg_XN5UL+|bnBIqY)`8#wF`8fdm1cM*kd0#jU(mH!T=_?g zo&$CM#O8};>}&!s2M#DX(k2?cDVaACn8OI9>dxht?RAEq%(jLt*G0ebVO*g^V<{)L zXh{irxr0zzQ|!rtYZz)WQG4@O^H?lP3;a z3d}5D!uwJ7%gmLA8m}aZRK2&*;`Pr^U-xyzI-W} zi2LXAD8+D%&!pZzt^4s~qqEX^L)$UzPI(v9blBWmf{)FDiM`fjv`Weu=0-yv>k=~XXsBuL`(s#6X>d)P|c{~zz*rBhfv;t!; zASKjQjwPt82q}Ts+ev%yOo!Mm13A_{vCW8-d5a>tRtyGd7I)(DCIh81w#B2HG|wtB zv5Shc6#HNcJP%K^>R*ilF6iGBX2(ta@wEXx{xdIH*PXY|S_!+Q$EmM%fdi;*FpIs( zTUA&^))C~4;Zgl-P}G^sJi}0ch8r=~UejkM5bcwN;HKiAYPRgSf3a~Clg?F|3%1B- zahKD>IkV{9IQb>c_*7~`If%jWOG!8F`}z@velKkW^N?_!dp_K#(8r;dN&pH0M$auk zP$b97B(!lv+k%i}e*Sm&I^p~4V5c!y*!h{B<&~ zjHorPt%m}2PBTXM=ou(l$d1<(N`-qhaJqQb4&y>pd0Hb+6<^^b;53(@Q3Z0Oaalo` z^5b3I%}uFQq(VtBt!$Y~Ttv`AlCum&$vZTnrDez*FKFW1f1jKi()3=Qp2U62C%dRk zRXI(NKpaDasEjk-2(l)>tDMSeY6e-aP@yIF;j=qO@<)uz0ZebT1dcT2U?AUkCkoI< zW%d%GI1;S%heC2}bb%wj@BdJ>exB_nkyope#|bRl^pKJR5Aut-25?;SNHd zK;>}q*YfzATM!Feke1P3YNMS*KturIf(02do)6{)0FywwOP`7ix63k_VsqDWdZB%b zJsN+5_oaZrprLMGyu>z<(m`p{!{hk(dvc4Z%4XJ5|!lLWTef^q9se9XO1c zC+YDZh?c)~y2wi?I1NQQV4{A;lj>5#z)}=ooL0v2af3uS24N+U*GaX|6Xhy?1#&!9 z69vb@2D=D=FX2`Z1565_4x1c(pVd=K9A@*kxG(p;U|6wc2JBL1BJiF8>5Su%8>B9~ zEl3m0A5|e$gW_|NrhoI`H{>yX9Zr0Joj@DOAk$Br0G?Ujhm>KWzOG#XT9FezekXvv zlpkx%obS)T*Bfb9W-y1%VT54D0AX(kah0^usQDT89Q< zc(p%QN&7wb_$n@Y>o^pmKZo874X2f*q?DAFv~bL2Tl~~RWE9YE$;ikslbNvf4}`pr zgZ#XD(_{si74FcB7)cs5Sb^uk9;K9`bCxfDqx!~Gc3Bp)-`Lp6w8aKM1^ZOIQOAyM zQzp|Fv+`g-67K!TOy*$y|41s(!8dKzn2PfgUBultw(Cs-ygFFro#CR*vKp*uihOT~Nofi@wrr97z zMg@gXFx0Q(KX;GPL8|=f=e{dZ>uDrwW~0aIJJ49gYs%9x>wa}qJtF=l)bLbuEpSyl zP|R0lH|kg4Z-%Fyu7goy&xUf29f#1z(1S2(P=2TSSaClZuM*X`C-!=Ha1@qC7^$tl z7K6<-sP(bPUGEF1G$=Nd@TRG)G6$--+uu)Qm6d*Wcw|B`ZW6j&4m}lu2wMDvp9@q{ ze9saczbh|wx$pYMt1`L458Ps}Er}n$fjxshgCHl)%N(d4J*Cho=fMRPKC%+K%(Z^; zWjvcUf6PCe1aS5)=W@pd>vU8m^oyU~pK*4!&6`)Pl{xZ%s%2wwa=y$ws~6fCz}L9K zGg}lMXxt9c+qo)|Z_oozJg7m@T}RvM+G>4AD|Aw`z@}adHlW0sx_&x)%z(D13-_V);UuAM9EK-E z2a#<_$Egpg=NaycH-lR1?*^%zRGvCjAwS9JPjYoJt@GLA%o(sKoh9H6RTuXS+l`P^ zks_VO`E#K(49y36!u&aPg%MwZFmF`9O;XF_Qn|d$%f^3+k3f?)zv(6pv+1tuY*kbl|BO4eX` z-P4)6@dauJ9=YnpoU4B;*13zeRCK3~pvsy&&=fje_?on?vp`Vs`chrNOW+xDwH!n& zJd!19=Mun748hi8{b*IVB$uok6TzxVb67~wx8+FDv{ zY!pcNUPY|$g|c#x(7K?ORCFdB(`}`GO%c&Ng9KH)$4%pN*YWJYg$H>Kf4~U11fO2M zg*R{j<3Q1S90^qNqXbLSg{SIE*eEu_+MaR_|Wq$Cv*~#r*e&Ko{RS`2_iuJxHPl;{QvCR$s+**qr3Zbn~jY{|7W|mnwR;2aP@hAv+)f zd=Jm~1ggK+>PKgauZ2^TJiaI_kZOj}86kLXl= zx4p#)FQ}${JcDSI6|f;pB)XMb`59ApB!*0XxE&=~-^F|>zg^6BvT)^w7%QNC#>FUN zmDsU*E_-92=E2=#6?2`sD$xiZdbV&2Pd1_a2pi%Hc^Z8AB5z2G?baqnQUsdWAjhF= zy&5fO*B-%9wFYHS#FHtKT{Gb#fB|uG@-g6k9Kq}*WQnCuk}ztjX(h@T%gQ(lTpGY1 zamHaoB`kFXVjJ0$CdmiV%?90`Xus*Ed{H@*M;~O(z%43tq@UV36V_23*M9O_qVSDI z*~3jmWku|fFlm46{lSqL-MR&Axu{l3s2b2T`TaUGw%b1YAy+GE+9%+4#G_w_F;@>y zQ+0Tb4!3?K%}}<$9!ZnVvP`^rb!9nj?`>J(ges-qr;Ec(+8Upw0+dn}Bm`nff6(`1 zRIv;ZNM6?*BAsB~j-1K-H(cM<=X{DIk5o&liW;vYO*PBI0mA#c=Gf>C0^Y<8d!%vh z6SeoR*MQ%;yW!&~`}t!5@ErUDCrBKCbvS}FJS`F{<4RsTG%#1PtaK}v`yZ4(H#6ZD zD~T?!qs@`>XEpHp6}c5N2)yc?d^d`!t?uT>i<5+y#U_8Ne0jdK+ga*maq%!;f-Um z_XV)qkLFu0RQ@NI0Zy2>2$^0sE}#4!9+CXyhQT}#J;Q-x;OW}z|MCCyG^)fP{c_Wu z4bSJiDIByPS6PrreNJWj@}Do44J$ME@P)7tJ-w{gx%*D!tH(gjpaZr{$npbw2MqJ< zLkI{1r`fQypV!RujUjXp#E>cJuuTzvUUd1S$LiZGef5pK)}!DHgZ{L*78D>@N71E# za}rFZ;Es&Z)~L3qaJ$B9{V4ON0m>rg343@^6q@rID$J}7> zN^6d$m=Lm@m~u)?1$Fu zqh$KJW~MT#`QXqyFJMkQgqSs_<#oR*3pL}jHC1vkrZAv9C)`#o1!>*mtts*$^v7+5 z1Xs(1fC%182`(B-Wgb^--6mZ8W!-3cSQ_CC!TAscuS*AZYhw?L_Kd<~G zVMW=uh1X}p!c04yyv1I~#WSY8h)CKUvth&*8<$T%knBjY{ap-9BJ?|DvJeQ^GL&TL zSN53cuXH}4Jf1AZXDMgbNJ)LME9e|+0BOBuQ+<0nl1HGxQi%53(5|;rbN#lP(QS)n zsAQAU6ZxqLtGb%jKmgjXb(N>U^2<}xVG@_i&tGe|Z=WSTn<4D|*@@Xf@;!fjzt{LS zSVIX@Xk#;qG2HWL83Bkm9vD_EDpB?qGAe!7Ks>tc9LiZa=LG1 zPM&V}a0a>p!>6(ozu@H^cx+ArpFhGAtGRU439V$tQ!PL;a@)cvBKc*ihJqN^M2$&O%Wgvof&z&Q4tK@RSwKq=sB$e7MgZH$o;Cz>Cj|9qRU0oXp%WfBm!+U7n-NnfwW- zw{Q8*Cr=5dmi7^tG!BJ8yi z?5iwj!2?96LCp^!4^9C6gUBWTUI3t-6}&)G)+O&$V}VoRz4LIt%)WPccC*jm5D{1=O*z)jL7|&+5%#{8hvQ%`^Fss6!f zq~CFl)T2J<%pksPn>kA4YEz3(;^7h9$Xz8(3Wapk}1*2@CI)?|aO04JI z&p#1fgR*XPRH#6*yR=Q>06AahO$>N|9SbiRK=@Hc_XyHrfP1$#x(6$!qkQ6MThCr@?)f&4}D_Q7V^4)175_E6*P@{N> za>ioTt@EPX_zBw1+Jvt#N#2i1t|m|Q?;=+unN;ml(z?J`a)L|uo<7oDDmw~&fM;$^ zqKd{5OMXf&r&5`xl{1med)z2o20L12)If*S?WE5z{L4m=+28utGUYhfeyBK2n$ok= zx7uw<5Xgg?Cu~ZzZeG*s{Y;XhpI|^7PC_C{d+U|s1-_PZ^oYheFaX%KK zgj>s$VWX680%n^Z7|=`xd@%4an-i0<;pehKzW+CSdun8b-b zzf&>w?bk!ob&(Xf*i$54E77UJ+90(YE;-aVZ`?R(Y7eFuF>r${{MqA&ZC zPQK0{a1HK`aW$ppa24t@^tr#0bhQIjRCMayYwEmYhl&*HI`1Ev$=komdhUV^shFCe znWn{Sb3RQ-ptT6)>G!%(ny45U*!m3eU5=NsQc^bU5?w&VhSn9nCeE74Ul0hWIGL>@ z9`8BrEr)lL!uGLUR1xTSMbf>%E0k@Kp#id-{lA5O*B?=rVhBC$SQzejZ}60z$m3Cv zdh-!3(HJ^j7w{72b4g%^Npfs4|6^LZKdkWi zSq$z$%wm@l;;NM*X36j40(J2UKhKhaK$j5eb3G5!49^YF&Ui2N6{&W3PF46hU$(LH z-^($>5`JQO&n8Y^V)_3bXH@{g|MmZVeDo^_7%kKh0!A^!wv{ESE%;0lu@Y=Ew zO@9x-UM_iCZai+#&SrXgah5XRIkuL#v>KFSjg`>ecZ2m&3f57uFnPb+1+n=8`s?^#zN0_|ZkH z4*=Qx?%I3QIu)h`;2FxEHhuQE^m0UaRrxFEMxlTO;jUiel*}&DjjtO80%?P~z5$kh z5*MzE>)Zpm%~rYg=%u(D8>%tA=f3JWLYgCE)hR4FNF5kiC6x{jog`=R;1&oBmLoRU zO}~LFX=gDmE_{8ZlC@&S#m6F`rxeKR`(AL5O(qjt%M!sO44aN#u?)5TI(K2H?j1l* zT6qewztzmD9*DQDYfVCq?X2soU#hSJb<1-7SekTHcQdP4$>8%kws~V-3GbM- z_;O(go|oaSk%M~W_WoTm%>FB1((N2{O%r=r$-4buQx&%f-j{vVA#kHnZJX6s&XdRxufGWYO}lMa%?{ zoc~(Y38o+rH5$K<;;q@Pec7;&N*pE7`peKY32+Ay0_7~<#wxa@oTt~Z2TC9iVP}|8 z-w33X_`cKB8+}1YstOtmbe2Wnqm#C}q9R6&SMo6T=D@;n{xt zI}H+x3R|Q8HaQpV3vgz$;`V^sAf(bkPY^>P$gw%k7Z%hsAA!8la(B3~Sn_1>xadwGFM0{BY9hWoClnPu-4V=_aaY zNtn`Gf-rD7Z2cTkI_^Q-#n(Wm7xEaZ7OvdRzJvbgU96Em(ppJ{enyBxBk;%kZdMn@YY-QXo$b1x`Wz>y3Mxk31u7lUZN+xDceg-pX zfIWnC*H-{~Q-CME?Un}>#~}Mn`-pWYZKJplr+v1HJWV#LIWUS(rY-UgSw~?A`l;@KsM*~K^(rU5R z?I-@=ehj@8zxHNz4-OkdD3T5Z10-mEnuO`xTL+{KhcB5uws>swWl*O30OCdCx_&5i z9tDbKRb4rsEUk3X+U-1fj$ZyySub#frhvJFd@j&HiOGlS9U#Mi0AQ7pUM90jAfpLL z3@n)fW*YnR{Wu5|e!)Z$59(hD`em;t)%K-BO->*9V*m-kuw_7(y+7muvG3ESH^w^h zi61U#n*?I(<7zBuaJ#5rh>kqf{jMoke159^yy8Hiso4IygxI+YsIL!zrvSJ{9HcN? zN2kB^(}nf`01sH*>`dGOjEQWz5-FH(9LV)34uudw{^oa<)so!9Ox zD>g;QggT5pU?$+L-)d507UpV}*a5UzrKT5vkh`Bc1ZO-i|2=hCD(K21&h@CRQ+ZUjeaU-JwlW#yc=r_8Mkdk_X5M3Tc9+%Y4p zq4CDMn#yc=S3Mhx(ELD*}SpHm*~bOk!Hi6&LPUswW424+?9AYz*| zj1EWE`?cd1c+rB2E1Sa?NrILVewp%O2%0LyueSLL?`EruyuLKVx%AFeagCqcz_QIX zjiN_@CJ3aK@CW$6sWlK{tTQZ4H?2uDKJCe{22vQ^dd9!2z3c;y9Jc?4_kA5FsQJsl zn^lgqdIdHIBU;#iP>8{sAEH}F=$)T;4G7A5#Z${iII18Ysv7+<5Z@yL%y)EMx`ws& zYv01SwC&wc0xKCX3zdbwZ`qODgOUW(rg>}NT`D`j91D9J4D!;5R8*t7y;WM*rgrj9 zCw;UB=!BwVPwZM1rlu2A>)j^njieL|aCIProA40OofMkzu=g_d^L4QXOB0XX+YFL2Olc*ImfM$WH*`4D`5^hfg8!dGKWUm9Nl`}e&Gqn@~i zsN}wY20OOF-=U<5D5yl`Xl!V~eI}W{8)0uEY9!Z)S@lN)P)HSSgtaAuVAx8K{g|P= zqdMpQJy@2kqqg@`ZqjwDEK5|ngV*KCul54g=QCIijdEUN>T#FyS4k`k8iyV;{>g;R zbzS$>`8e|YLFkpe@cHdS>#@nBJ>myw*{~11or^~NRr}m4-4rrS3pR1T?szNa3whea z#IsVAa9#F!61+b7Btz|_--yM#>8G4MIq>=0i~G#$T(sgNC=A65rXQTT&DrH$ARg@q zq6%hui4b_}%IgQu_NAMk$J~&R2Bq|}tEC}%eEVmKpfDAD$*A33BC>vJYcK|$FOl2y z6U=otf4rLW{(Yy(Tji(iE^ptSRwxx76~eNDydNWtRq8}$8?8q7_71%K4Zx4jKmK#< z>!6U88L096kkol9fBT>nTVorvQ%RRacKI9zhf{BO!aOi+c7aLznn_T;f|ecme!_Y@ zpBg@(WbhFqq-7In2(4U0zD=7xOWCh=X;ZAVw9*q;##qGtlh3ClY$&AlA_gL}S4O&| zlRK`{14b+$xrA--SSmbNE#ACIS4$QAbJ4%Vx@x+MOhM}%s6Rb;)=Zt<@agGm?VCcB zKUyz52J{eBZ|NkFhrD=do1^OvozNqlG<{u-vFD_Mgx0-S`93Xi0%(^d(&fq-^V+ES zd@@MTeiS3zEV?yDHEg~r?0tT0WF$H2&mfg@5`^fbyH~?@c6EJF5h5lb3A%A!)f<13 z7-oh-Z7_?iC;;kln;lTWPqb=za^O**lNu;Ul{Ha4^*ILJpyIJgBHe~%J=Pv&S-#T3 ztS_!opihtIVaMIPm7B^SX?VCjU!|-fNaRd3qH9#n@J6w)%v1hvT-{s=_c&u(R}*b7 zl9Wrtz|gk|C6pwVSJj%Enm&eI*KFQYK1TqqgU5g*036Y;Ma9(_oh`^g_@r&_DYg8W z!|NBcE{Z7oSnQA_UT8fiKX7G(bz?fLb(~fM3Y`g;KMHFb9;mCYuaBksLWGHkb|IdD zcCx_0EJC;Q=2q(Nh!XOFwlT{}QOcOAKw5B14WsfGA~1r0n}l`3l6x| znoW0$p|F(AvEnr}S}vecie>co_gno*n#R8RE1ONApAjg5RQV4spYs`lvDF>Bf9T)9 z<^#%Cm`bZr(>JO+*iG9KNNWm&cpBc~HbW19D3vm{R;1HWkZG9{B~YXh+00599n>WG z8TCUE_xm0~U%mXOJ6!r3IN!&A>c@5gh+a5FDd<%rYOmu1GO-}tT^ER*fWd7DbqOs7 z#0YZJzOrE$200E2qsjzu* zduH>K^kGL7fZ19zb(L*e)lZ9p}0dBr&dTt1RJAJWsTVY zf++Nj=`AaKa1{)LCWO%G>l)f8LhIUm-GSn~4hkG*ir!s_Wch@0U_V#^1k)cIFE25f zT{p);_PI$y%;e&WbvhPu=iNaxHHjZ&^W7_`@~Vf|U}k^I7=fdy{=~>>vgx8bg{Bzm z-fd%H=13b#i`U*{LCjwK6~fkGC4s9~l3apzZWn))B4~zk0s;hRV6IIGm^o)Ca!>c z!?i<@55PLk06&5NvRyaZGSnt~9gO-mC z4GI;;U<(?p-MsSWkEFtQ|Ne~?<|C^4UB5=|w_SEK>Pf{zoV@Zc)25{5rn)iGXhOs- za6!H^7hf**XT%SvVD>;)+Sk#Qk+Jn(Z$_1K-$LI;$@F#hG|t4aQ$Q?jLF?`W6|jJ< zunmfKs}99qDYy4Pmy!@# zv=RO@s=%@@^3sm^vD<-75gM5d+Z5wtmfJL_^r|Lb&l#Pwc>SY&s1m7gIw<>{2Xsa` zyW=+2N0ABB$e{t^j-z5e*cF$tD8r#cH!vTpz0+R#0~{^F=Ft4M3Gpog?c;(#419$2 zDSzwy2PE*xcziiU?-Y`VlFl!;h8>7sp>kWA^ES*r_x_=`tb|dD_A%Tv{ns|8X;?)+ zer!q96gxjnQF#N<1X|^JJ#`rSx-ilg)(N|{0r=xRXIoA$w9H599h`>MStG+(@viVW zmu_icxFLfA?Y?@wz)#r&q6Gr-xDi##ZF5uH6pob*Bu* zeEB>Nlu))CSQ5)2AJoE7HNOl># z_7>RH$y1_0K-{~VdM`@%D%7A zw2>ApSN{I?Tu%4;UDh;jR7*AT>F_{aSrDj&GZaPa0IPx_HNcsv!A-l>b@4vV9d2Hs zxZ=XXUn*qOTm%vca_kZB)_QTO&vSdU-t}%Hb~fuRaDf~~!jbT!Hie*`M(C*LA!hqIf>{r~ChZm4AigI0}bsB|~@ zQPMXW{fCG1N#=ySHyr#Sz$g%EN{TQ5CIgmO?j$*1_MgE1&yWh72*S#e8L?{tp}73M z9}Yov=L=&o;-sRaOrW@_gqMWMbDw{*yUDjh+P?-mB-Y(M-j#3nySOSJi`!waO3!IR zv-NL6CBm|C%++T8OB~U`(>Y7D-D05;YF;b71GC4Uj zD#5vku}9vTSG@TP!2Bi(=K)9_E?t?T?P{gY2#wp7rAuzwjS`PtAy3s^yYj;MR6M?p zk!ydlciH2uRU^kjxl7aG9zcMLONPDQM_oMjjc&UN*}C)at%d{iA6*=#B%3S*56+g` zyrPI7@_cOI0cpIxYXR5<0N77Bm@Q{Ig2ViTW0Xj${N9XHVcjYJmD8UQ<@7wlf-v2A zN6gv361o6UfM;6U`?5b~6|Nos^U!am3*URiIF0}J d^Dq+#&_1dQ!X>PeZV>RJr)_+*TFW8!e*w?A>fQhV literal 3928 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 m4rN$LW=%~1DgXcg2mk;800000(o>TF0000 Date: Sat, 8 Mar 2025 19:49:47 +0300 Subject: [PATCH 4/6] placement fix --- Resources/Locale/ru-RU/_white/mercenary.ftl | 9 + .../Locale/ru-RU/paper/stamp-component.ftl | 1 - .../objects/devices/electronics/door.ftl | 2 - .../structures/doors/airlocks/access.ftl | 3 - Resources/Prototypes/Access/nonfaction.yml | 3 - .../Fills/Backpacks/StarterGear/backpack.yml | 22 --- .../Entities/Mobs/Player/humanoid.yml | 45 ----- .../Devices/Electronics/door_access.yml | 8 - .../Entities/Objects/Misc/books_author.yml | 22 --- .../Objects/Misc/identification_cards.yml | 13 -- .../Entities/Objects/Misc/rubber_stamp.yml | 13 -- .../Structures/Doors/Airlocks/access.yml | 13 -- .../Roles/Jobs/Fun/misc_startinggear.yml | 19 --- Resources/Prototypes/_White/mercenary.yml | 156 ++++++++++++++++++ 14 files changed, 165 insertions(+), 164 deletions(-) delete mode 100644 Resources/Prototypes/Access/nonfaction.yml create mode 100644 Resources/Prototypes/_White/mercenary.yml diff --git a/Resources/Locale/ru-RU/_white/mercenary.ftl b/Resources/Locale/ru-RU/_white/mercenary.ftl index 5cc4a02c9f..6936d94a8f 100644 --- a/Resources/Locale/ru-RU/_white/mercenary.ftl +++ b/Resources/Locale/ru-RU/_white/mercenary.ftl @@ -28,3 +28,12 @@ ghost-role-information-mercenary-standard-rules = Вы - опытный наём Вы не помните ничего из своей предыдущей жизни, если администратор не сказал вам обратное. Вам разрешается помнить знания об игре в целом, например, как готовить, как использовать предметы и т.д. Вам [color=red]НЕ[/color] разрешается помнить, имя, внешность и т.д. вашего предыдущего персонажа. + +stamp-component-stamped-name-mercenary = Контракт + +ent-DoorElectronicsMercenary = { ent-DoorElectronics } + .desc = { ent-DoorElectronics.desc } + +ent-AirlockMercenaryLocked = { ent-Airlock } + .suffix = Наёмник, Закрыт + .desc = { ent-Airlock.desc } В углу имеется небольшой символ Администрации сектора. diff --git a/Resources/Locale/ru-RU/paper/stamp-component.ftl b/Resources/Locale/ru-RU/paper/stamp-component.ftl index ec53e89d69..6a2d4df451 100644 --- a/Resources/Locale/ru-RU/paper/stamp-component.ftl +++ b/Resources/Locale/ru-RU/paper/stamp-component.ftl @@ -18,4 +18,3 @@ stamp-component-stamped-name-syndicate = Синдикат stamp-component-stamped-name-ce = Старший инженер stamp-component-stamped-name-iaa = Агент внутренних дел stamp-component-stamped-name-geraldiy = Древние -stamp-component-stamped-name-mercenary = Контракт diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door.ftl index b43561b045..3f4ad9693d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door.ftl @@ -76,5 +76,3 @@ ent-DoorElectronicsTheatre = { ent-DoorElectronics } .desc = { ent-DoorElectronics.desc } ent-DoorElectronicsVault = { ent-DoorElectronics } .desc = { ent-DoorElectronics.desc } -ent-DoorElectronicsMercenary = { ent-DoorElectronics } - .desc = { ent-DoorElectronics.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl index 055d1af2b4..dbd1984b7b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl @@ -311,6 +311,3 @@ ent-AirlockSecurityLawyerLocked = { ent-Airlock } .desc = { ent-Airlock.desc } ent-AirlockSyndicateLocked = { ent-Airlock } .desc = { ent-Airlock.desc } -ent-AirlockMercenaryLocked = { ent-Airlock } - .suffix = Наёмник, Закрыт - .desc = { ent-Airlock.desc } В углу имеется небольшой символ Администрации сектора. diff --git a/Resources/Prototypes/Access/nonfaction.yml b/Resources/Prototypes/Access/nonfaction.yml deleted file mode 100644 index d81cfcb02b..0000000000 --- a/Resources/Prototypes/Access/nonfaction.yml +++ /dev/null @@ -1,3 +0,0 @@ -- type: accessLevel # WD - id: Mercenary - name: id-card-access-level-mercenary diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index d7ab52280d..d9c8850e1f 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -411,25 +411,3 @@ - id: Cutlass - id: WeaponRevolverPirate - id: ClothingEyesEyepatch - -# WD. Mercenary - -- type: entity - parent: ClothingBackpackMerc - id: ClothingBackpackMercFilledStandard - suffix: Filled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: RubberStampMercenaries - - id: TelescopicBaton - - id: Zipties - - id: BoxMRE - - id: ThrowingKnivesKit - - id: CrowbarRed - - id: Tourniquet - - id: Lighter - - id: CigPackBlack - - id: SpaceCash500 - - id: FlashlightLantern diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 3b3c25120c..5845b51000 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -911,48 +911,3 @@ nameSegments: - names_first - names_last - -# WD. Mercenary - -- type: entity - name: mercenary standard spawner - id: MercenaryStandardSpawner - parent: MarkerBase - components: - - type: Sprite - layers: - - state: red - - sprite: Objects/Tools/appraisal-tool.rsi - state: icon - - type: RandomSpawner - prototypes: - - RandomHumanoidMercenaryStandard - chance: 1 - -- type: entity - id: RandomHumanoidMercenaryStandard - name: mercenary standard ghost role - components: - - type: Sprite - sprite: Objects/Tools/appraisal-tool.rsi - state: icon - - type: RandomHumanoidSpawner - settings: MercenaryStandard - -- type: randomHumanoidSettings - id: MercenaryStandard - randomizeName: false - components: - - type: GhostRole - name: ghost-role-information-mercenary-standard-name - description: ghost-role-information-mercenary-standard-description - rules: ghost-role-information-mercenary-standard-rules - raffle: - settings: short - - type: GhostTakeoverAvailable - - type: Loadout - prototypes: [ MercenaryStandardGear ] - - type: RandomMetadata - nameSegments: - - names_first - - names_last diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml index 5b1f33cf5c..f75fa2584e 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml @@ -310,11 +310,3 @@ components: - type: AccessReader access: [["Security"], ["Command"]] - -- type: entity # WD - parent: DoorElectronics - id: DoorElectronicsMercenary - suffix: Mercenary, Locked - components: - - type: AccessReader - access: [["Mercenary"]] diff --git a/Resources/Prototypes/Entities/Objects/Misc/books_author.yml b/Resources/Prototypes/Entities/Objects/Misc/books_author.yml index 37a9a90426..cb185d6bcb 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/books_author.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/books_author.yml @@ -656,25 +656,3 @@ - state: overlay_dirt - type: Paper content: book-text-janitor - -- type: entity # WD - parent: BookBase - id: BookMercenary - name: history of mercenaries from the beginning of time - description: The book tells about different forms of mercenary work in several historical periods. The author condemns the phenomenon itself, but it is still interesting to read. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: paper - - state: cover_old - color: "#65802d" - - state: decor_diagonal - color: "#737334" - - state: decor_wingette_circle - color: gold - - state: icon_question - - state: detail_bookmark - color: "#0a0a09" - - type: Paper - content: book-text-merc diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 0ea10a2cf6..1b767f5765 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -950,16 +950,3 @@ - state: idseniorofficer - type: PresetIdCard job: SeniorOfficer - -- type: entity # WD - parent: IDCardStandard - id: MercenaryIDCard - name: mercenary ID card - suffix: Merc - components: - - type: Sprite - layers: - - state: non_faction - - type: Access - tags: - - Mercenary diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml index 4be668480b..d093986b59 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml @@ -286,16 +286,3 @@ - type: Sprite sprite: Objects/Misc/bureaucracy.rsi state: stamp-inspector - -- type: entity # WD - name: mercenaries rubber stamp - parent: RubberStampBase - id: RubberStampMercenaries - suffix: DO NOT MAP - components: - - type: Stamp - stampedName: stamp-component-stamped-name-mercenary - stampedColor: "#36451b" - stampState: "paper_stamp-mercenary" - - type: Sprite - state: stamp-mercenary diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml index 4007307c18..a10b5b5adb 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -1227,16 +1227,3 @@ - type: ContainerFill containers: board: [ DoorElectronicsSyndicateAgent ] - -# WD - -- type: entity - parent: Airlock - id: AirlockMercenaryLocked - suffix: Mercenary, Locked - components: - - type: ContainerFill - containers: - board: [ DoorElectronicsMercenary ] - - type: Wires - layoutId: AirlockArmory diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index 0257b5d1ce..a13d0e6a58 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -450,22 +450,3 @@ back: ClothingBackpackSatchelScience ears: ClothingHeadsetRD outerClothing: ClothingOuterCoatRD - -# WD. Mercenary - -- type: startingGear - id: MercenaryStandardGear - equipment: - id: MercenaryIDCard - jumpsuit: ClothingUniformJumpsuitMercenary - back: ClothingBackpackMercFilledStandard - head: ClothingHeadBandMerc - mask: ClothingMaskGasMerc - eyes: ClothingEyesGlassesMercenary - ears: ClothingHeadsetFreelance - gloves: ClothingHandsMercGlovesCombat - outerClothing: ClothingOuterVestWebMerc - shoes: ClothingShoesBootsMercFilled - pocket1: ClothingPouchMedical - pocket2: ClothingPouchGrenade - belt: WeaponLaserSvalinn diff --git a/Resources/Prototypes/_White/mercenary.yml b/Resources/Prototypes/_White/mercenary.yml new file mode 100644 index 0000000000..e63dfbe20b --- /dev/null +++ b/Resources/Prototypes/_White/mercenary.yml @@ -0,0 +1,156 @@ +# Equipment +- type: entity + parent: ClothingBackpackMerc + id: ClothingBackpackMercFilledStandard + suffix: Filled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: RubberStampMercenaries + - id: TelescopicBaton + - id: Zipties + - id: BoxMRE + - id: ThrowingKnivesKit + - id: CrowbarRed + - id: Tourniquet + - id: Lighter + - id: CigPackBlack + - id: SpaceCash500 + - id: FlashlightLantern + +- type: startingGear + id: MercenaryStandardGear + equipment: + id: MercenaryIDCard + jumpsuit: ClothingUniformJumpsuitMercenary + back: ClothingBackpackMercFilledStandard + head: ClothingHeadBandMerc + mask: ClothingMaskGasMerc + eyes: ClothingEyesGlassesMercenary + ears: ClothingHeadsetFreelance + gloves: ClothingHandsMercGlovesCombat + outerClothing: ClothingOuterVestWebMerc + shoes: ClothingShoesBootsMercFilled + pocket1: ClothingPouchMedical + pocket2: ClothingPouchGrenade + belt: WeaponLaserSvalinn + +# Role +- type: entity + name: mercenary standard spawner + id: MercenaryStandardSpawner + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - sprite: Clothing\Mask\merc.rsi + state: icon + - type: RandomSpawner + prototypes: + - RandomHumanoidMercenaryStandard + chance: 1 + +- type: entity + id: RandomHumanoidMercenaryStandard + name: mercenary standard ghost role + components: + - type: Sprite + sprite: Clothing\Mask\merc.rsi + state: icon + - type: RandomHumanoidSpawner + settings: MercenaryStandard + +- type: randomHumanoidSettings + id: MercenaryStandard + randomizeName: false + components: + - type: GhostRole + name: ghost-role-information-mercenary-standard-name + description: ghost-role-information-mercenary-standard-description + rules: ghost-role-information-mercenary-standard-rules + raffle: + settings: short + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ MercenaryStandardGear ] + - type: RandomMetadata + nameSegments: + - names_first + - names_last + +# Book +- type: entity + parent: BookBase + id: BookMercenary + name: history of mercenaries from the beginning of time + description: The book tells about different forms of mercenary work in several historical periods. The author condemns the phenomenon itself, but it is still interesting to read. + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + layers: + - state: paper + - state: cover_old + color: "#65802d" + - state: decor_diagonal + color: "#737334" + - state: decor_wingette_circle + color: gold + - state: icon_question + - state: detail_bookmark + color: "#0a0a09" + - type: Paper + content: book-text-merc + +# Stamp +- type: entity + name: mercenaries rubber stamp + parent: RubberStampBase + id: RubberStampMercenaries + suffix: DO NOT MAP + components: + - type: Stamp + stampedName: stamp-component-stamped-name-mercenary + stampedColor: "#36451b" + stampState: "paper_stamp-mercenary" + - type: Sprite + state: stamp-mercenary + +# Airlock +- type: accessLevel + id: Mercenary + name: id-card-access-level-mercenary + +- type: entity + parent: DoorElectronics + id: DoorElectronicsMercenary + suffix: Mercenary, Locked + components: + - type: AccessReader + access: [["Mercenary"]] + +- type: entity + parent: IDCardStandard + id: MercenaryIDCard + name: mercenary ID card + suffix: Merc + components: + - type: Sprite + layers: + - state: non_faction + - type: Access + tags: + - Mercenary + +- type: entity + parent: Airlock + id: AirlockMercenaryLocked + suffix: Mercenary, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsMercenary ] + - type: Wires + layoutId: AirlockArmory + From 2533b2c82f19a6e74a52e0d30d19af1bb420960e Mon Sep 17 00:00:00 2001 From: keslik Date: Sat, 8 Mar 2025 22:37:13 +0300 Subject: [PATCH 5/6] picture --- Resources/Prototypes/_White/paint.yml | 21 ++++++++++++++++++ .../Structures/pictures.rsi/frozenmoment.png | Bin 0 -> 8264 bytes .../White/Structures/pictures.rsi/meta.json | 11 +++++++++ 3 files changed, 32 insertions(+) create mode 100644 Resources/Prototypes/_White/paint.yml create mode 100644 Resources/Textures/White/Structures/pictures.rsi/frozenmoment.png create mode 100644 Resources/Textures/White/Structures/pictures.rsi/meta.json diff --git a/Resources/Prototypes/_White/paint.yml b/Resources/Prototypes/_White/paint.yml new file mode 100644 index 0000000000..59e55a583d --- /dev/null +++ b/Resources/Prototypes/_White/paint.yml @@ -0,0 +1,21 @@ +- type: entity + parent: BaseSign + id: PicturesBase + abstract: true + components: + - type: WallMount + arc: 360 + - type: Sprite + drawdepth: WallTops + sprite: White/Structures/pictures.rsi + scale: 0.3, 0.3 + +- type: entity + parent: PicturesBase + id: PictureFrozenMoment + name: замерзший момент + description: Он тянет руку с кольцом, она отворачивается. Между ними — тишина, в которой может скрываться как отказ, так и надежда. + suffix: DO NOT MAP + components: + - type: Sprite + state: frozenmoment diff --git a/Resources/Textures/White/Structures/pictures.rsi/frozenmoment.png b/Resources/Textures/White/Structures/pictures.rsi/frozenmoment.png new file mode 100644 index 0000000000000000000000000000000000000000..040bc9ee0ae5f63c33749aef653286f4c9e4f53f GIT binary patch literal 8264 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 Date: Mon, 10 Mar 2025 18:01:42 +0000 Subject: [PATCH 6/6] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 8612f0667d..dbd018dafe 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,17 +1,4 @@ Entries: -- author: ThereDrD - changes: - - message: "\u0423\u0434\u0430\u043B\u0435\u043D\u044B \u043B\u0438\u0448\u043D\u0438\ - \u0435 \u043F\u043E\u043F\u0430\u043F\u044B \u0432 \u0447\u0430\u0442\u0435" - type: Remove - - message: "\u0423\u0434\u0430\u043B\u0435\u043D\u0430 \u0441\u0438\u0441\u0442\u0435\ - \u043C\u0430 \u043F\u0440\u043E\u043C\u0430\u0445\u043E\u0432 \u0443 \u043C\u0443\ - \u0441\u043E\u0440\u043A\u0438 \u0432\u0432\u0438\u0434\u0443 \u0431\u0435\u0441\ - \u043F\u043E\u043B\u0435\u0437\u043D\u043E\u0441\u0442\u0438" - type: Remove - id: 167 - time: '2024-02-29T10:36:13.0000000+00:00' - url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/143 - author: martell-gh changes: - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043A\u0430\u0440\u0442\u0438\u043D\ @@ -9021,3 +9008,11 @@ id: 666 time: '2025-03-05T20:08:38.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/911 +- author: keslik1313 + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0440\u043E\u043B\ + \u044C \u043D\u0430\u0451\u043C\u043D\u0438\u043A\u0430" + type: Add + id: 667 + time: '2025-03-10T18:00:35.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/858