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 +