From a8405853980b1ad2952690ec063afdf5992058cf Mon Sep 17 00:00:00 2001 From: keslik Date: Sun, 29 Dec 2024 18:32:02 +0300 Subject: [PATCH 1/3] 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/3] 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 19:49:47 +0300 Subject: [PATCH 3/3] 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 +