diff --git a/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl b/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl index fd170432aa..03d33227fa 100644 --- a/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl @@ -186,7 +186,7 @@ ghost-role-information-cburn-agent-name = РХБЗЗ Оперативник ghost-role-information-cburn-agent-description = Высококвалифицированный специалист, способный справиться с любыми угрозами. ghost-role-information-centcom-official-name = Инспектор ЦК -ghost-role-information-centcom-official-description = Вы — обычный бумагомаратель на службе у корпорации. К вашему сожалению или к удовольствию — тут смотрите сами, вас отправили на объект с инспекцией. Возможно проверять как уборщик ставит знаки мокрого пола, а может и разбираться с Командованием — только разбираться, ведь прямых командных полномочий у вас нет. +ghost-role-information-centcom-official-description = Вы — обычный бумагомаратель, клерк на службе у корпорации. К вашему сожалению или к удовольствию — тут смотрите сами, офицер Центрального командования, как ваш непосредственный начальник, выдернул вас с рабочего места, переименовал карту и отправил на объект с инспекцией. Возможно проверять как уборщик ставит знаки мокрого пола, а может и разбираться с Командованием — только разбираться, ведь прямых командных полномочий у вас нет, но за точной целью обратитесь к администратору. ghost-role-information-nukeop-rules = Вы [color={ role-type-team-antagonist-color }][bold]{ role-type-team-antagonist-name }[/bold][/color], в команде с другими Ядерными оперативниками. Помощь агентов на станции не гарантируется. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/player/centcomm.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/player/centcomm.ftl index 9783863c29..91ac4e3361 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/player/centcomm.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/player/centcomm.ftl @@ -4,7 +4,7 @@ ent-RandomHumanoidSpawnerCentcomRepresentative = Представитель ЦК .desc = { "" } ent-RandomHumanoidSpawnerCentcomStaffChief = Начальник штаба ЦК .desc = { "" } -ent-RandomHumanoidSpawnerCentcomNanoTrasenDiplomat = Дипломат NanoTrasen +ent-RandomHumanoidSpawnerNanoTrasenDiplomat = Дипломат NanoTrasen .desc = { "" } ent-RandomHumanoidSpawnerBlueshieldOfficer = Офицер "Синий Щит" .desc = { "" } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/identification_cards.ftl index 19c8b93fc6..c83045ce6a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/identification_cards.ftl @@ -11,4 +11,6 @@ ent-CentcomRepresentativeIDCard = ID-карта представителя ЦК ent-CentcomStaffChiefIDCard = ID-карта начальника штаба ЦК .desc = { ent-IDCardStandard.desc } ent-NanoTrasenDiplomatIDCard = ID-карта дипломата NanoTrasen + .desc = { ent-IDCardStandard.desc } +ent-BlueshieldOfficerIDCard = ID-карта офицера "Синий Щит" .desc = { ent-IDCardStandard.desc } \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Eyes/glasses.yml index 3f4b831733..3cae568ad3 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Eyes/glasses.yml @@ -23,7 +23,7 @@ sprite: Corvax/Clothing/Eyes/Glasses/kim.rsi - type: entity - parent: [ ClothingEyesGlassesSecurity, ShowMedicalIcons ] + parent: [ ClothingEyesGlassesSecurity, ShowMedicalIcons, BaseToggleClothing ] id: ClothingEyesVisorTactical name: tactical visor description: NanoTrasen visor, that allow you to see a lot of tactical information. @@ -39,5 +39,10 @@ - Biological - Inorganic - Silicon - - type: NightVision - relayOverlay: true + - type: ToggleClothing + action: ActionToggleNightVision + mustEquip: true + - type: ComponentToggler + components: + - type: NightVision + relayOverlay: true diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Player/Centcomm.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Player/Centcomm.yml index 46dbed82e6..6cd939529d 100644 --- a/Resources/Prototypes/Corvax/Entities/Mobs/Player/Centcomm.yml +++ b/Resources/Prototypes/Corvax/Entities/Mobs/Player/Centcomm.yml @@ -4,8 +4,8 @@ suffix: Corvax components: - type: Sprite - sprite: Markers/jobs.rsi - state: centcom + sprite: Corvax/Markers/jobs.rsi + state: CCOfficer - type: RandomHumanoidSpawner settings: CentcomOfficer @@ -31,8 +31,8 @@ suffix: Corvax components: - type: Sprite - sprite: Markers/jobs.rsi - state: centcom + sprite: Corvax/Markers/jobs.rsi + state: CCRepresentative - type: RandomHumanoidSpawner settings: CentcomRepresentative @@ -58,8 +58,8 @@ suffix: Corvax components: - type: Sprite - sprite: Markers/jobs.rsi - state: centcom + sprite: Corvax/Markers/jobs.rsi + state: CCChief - type: RandomHumanoidSpawner settings: CentcomStaffChief @@ -91,8 +91,8 @@ suffix: Corvax components: - type: Sprite - sprite: Markers/jobs.rsi - state: centcom + sprite: Corvax/Markers/jobs.rsi + state: CCDiplomat - type: RandomHumanoidSpawner settings: NanoTrasenDiplomat @@ -118,8 +118,8 @@ suffix: Corvax components: - type: Sprite - sprite: Markers/jobs.rsi - state: centcom + sprite: Corvax/Markers/jobs.rsi + state: BlueshieldOfficer - type: RandomHumanoidSpawner settings: BlueshieldOfficer diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Corvax/Entities/Objects/Misc/identification_cards.yml index 25ac386b96..25f42e9fdb 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Misc/identification_cards.yml @@ -133,7 +133,7 @@ color: *color-centcomm-bottom - sprite: Interface/Misc/job_icons.rsi offset: *icon-offset - state: Nanotrasen + state: ERTSecurity - type: Item heldPrefix: blue - type: PresetIdCard diff --git a/Resources/Textures/Corvax/Markers/jobs.rsi/BlueshieldOfficer.png b/Resources/Textures/Corvax/Markers/jobs.rsi/BlueshieldOfficer.png new file mode 100644 index 0000000000..4c62e69ef4 Binary files /dev/null and b/Resources/Textures/Corvax/Markers/jobs.rsi/BlueshieldOfficer.png differ diff --git a/Resources/Textures/Corvax/Markers/jobs.rsi/CCChief.png b/Resources/Textures/Corvax/Markers/jobs.rsi/CCChief.png new file mode 100644 index 0000000000..34a5061521 Binary files /dev/null and b/Resources/Textures/Corvax/Markers/jobs.rsi/CCChief.png differ diff --git a/Resources/Textures/Corvax/Markers/jobs.rsi/CCDiplomat.png b/Resources/Textures/Corvax/Markers/jobs.rsi/CCDiplomat.png new file mode 100644 index 0000000000..ddc27547ff Binary files /dev/null and b/Resources/Textures/Corvax/Markers/jobs.rsi/CCDiplomat.png differ diff --git a/Resources/Textures/Corvax/Markers/jobs.rsi/CCOfficer.png b/Resources/Textures/Corvax/Markers/jobs.rsi/CCOfficer.png new file mode 100644 index 0000000000..3611471fbf Binary files /dev/null and b/Resources/Textures/Corvax/Markers/jobs.rsi/CCOfficer.png differ diff --git a/Resources/Textures/Corvax/Markers/jobs.rsi/CCRepresentative.png b/Resources/Textures/Corvax/Markers/jobs.rsi/CCRepresentative.png new file mode 100644 index 0000000000..1e520d6bb0 Binary files /dev/null and b/Resources/Textures/Corvax/Markers/jobs.rsi/CCRepresentative.png differ diff --git a/Resources/Textures/Corvax/Markers/jobs.rsi/meta.json b/Resources/Textures/Corvax/Markers/jobs.rsi/meta.json new file mode 100644 index 0000000000..c42b491e62 --- /dev/null +++ b/Resources/Textures/Corvax/Markers/jobs.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made with inbuild sprites", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "BlueshieldOfficer" + }, + { + "name": "CCOfficer" + }, + { + "name": "CCRepresentative" + }, + { + "name": "CCChief" + }, + { + "name": "CCDiplomat" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Markers/jobs.rsi/centcom.png b/Resources/Textures/Markers/jobs.rsi/centcom.png index dedc145648..f3712f4fe5 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/centcom.png and b/Resources/Textures/Markers/jobs.rsi/centcom.png differ