diff --git a/Resources/Locale/ru-RU/_white/mercenary.ftl b/Resources/Locale/ru-RU/_white/mercenary.ftl new file mode 100644 index 0000000000..6936d94a8f --- /dev/null +++ b/Resources/Locale/ru-RU/_white/mercenary.ftl @@ -0,0 +1,39 @@ +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] разрешается помнить, имя, внешность и т.д. вашего предыдущего персонажа. + +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/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/Entities/Objects/Misc/books_author.yml b/Resources/Prototypes/Entities/Objects/Misc/books_author.yml index 9adb14f4eb..cb185d6bcb 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 @@ -656,4 +656,3 @@ - state: overlay_dirt - type: Paper content: book-text-janitor - 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 + 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 0000000000..a42f6e56b4 Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-mercenary.png differ 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 0000000000..698018375c Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/non_faction.png differ diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/Objects/Misc/stamps.rsi/meta.json index 8ce4882a2f..b60f0816ed 100644 --- a/Resources/Textures/Objects/Misc/stamps.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/stamps.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. New stamp- icons taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. stamp-warden is a darker version of stamp-hos. stamp-lawyer is a darker version of stamp-cap.", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. New stamp- icons taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. stamp-warden is a darker version of stamp-hos. stamp-lawyer is a darker version of stamp-cap. stamp-mercenary by DOOMMAX", "size": { "x": 32, "y": 32 @@ -60,6 +60,9 @@ }, { "name": "stamp-warden" + }, + { + "name": "stamp-mercenary" } ] } diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/stamp-mercenary.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-mercenary.png new file mode 100644 index 0000000000..0da8c8b9ef Binary files /dev/null and b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-mercenary.png differ