diff --git a/Resources/Locale/ru-RU/prototypes/access/accesses.ftl b/Resources/Locale/ru-RU/prototypes/access/accesses.ftl index a19064bae6690a..38ed5bf9c281cb 100644 --- a/Resources/Locale/ru-RU/prototypes/access/accesses.ftl +++ b/Resources/Locale/ru-RU/prototypes/access/accesses.ftl @@ -27,7 +27,9 @@ id-card-access-level-service = Сервис id-card-access-level-janitor = Уборщик id-card-access-level-theatre = Театр id-card-access-level-chapel = Церковь -id-card-access-level-lawyer = Юридический +#SS220-InternalAffairs-Begin +id-card-access-level-lawyer = Внутренние дела +#SS220-InternalAffairs-End id-card-access-level-maintenance = Техобслуживание id-card-access-level-external = Внешний id-card-access-level-nuclear-operative = Ядерный оперативник diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door_access.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door_access.ftl index 4270c70866cf38..e6c81d8c40aa94 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door_access.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door_access.ftl @@ -22,9 +22,11 @@ ent-DoorElectronicsBar = { ent-DoorElectronics } ent-DoorElectronicsHydroponics = { ent-DoorElectronics } .suffix = Гидропоника, Закрыт .desc = { ent-DoorElectronics.desc } +#SS220-InternalAffairs-Begin ent-DoorElectronicsLawyer = { ent-DoorElectronics } - .suffix = Юридический, Закрыт + .suffix = Внутренние дела, Закрыт .desc = { ent-DoorElectronics.desc } +#SS220-InternalAffairs-End ent-DoorElectronicsKitchenHydroponics = { ent-DoorElectronics } .suffix = Кухня/Гидропоника, Закрыт .desc = { ent-DoorElectronics.desc } @@ -91,9 +93,11 @@ ent-DoorElectronicsQuartermaster = { ent-DoorElectronics } ent-DoorElectronicsSecurity = { ent-DoorElectronics } .suffix = Служба безопасности, Закрыт .desc = { ent-DoorElectronics.desc } +#SS220-InternalAffairs-Begin ent-DoorElectronicsSecurityLawyer = { ent-DoorElectronics } - .suffix = Служба безопасности/Юридический, Закрыт + .suffix = Служба безопасности/Внутренние дела, Закрыт .desc = { ent-DoorElectronics.desc } +#SS220-InternalAffairs-End ent-DoorElectronicsDetective = { ent-DoorElectronics } .suffix = Детектив, Закрыт .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 5d0eec1b8be391..ffd75c41f31e3b 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 @@ -1,9 +1,11 @@ ent-AirlockServiceLocked = { ent-Airlock } .suffix = Сервисный, Закрыт .desc = { ent-Airlock.desc } +#SS220-InternalAffairs-Begin ent-AirlockLawyerLocked = { ent-AirlockServiceLocked } - .suffix = Юридический, Закрыт + .suffix = Внутренние дела, Закрыт .desc = { ent-AirlockServiceLocked.desc } +#SS220-InternalAffairs-End ent-AirlockTheatreLocked = { ent-AirlockServiceLocked } .suffix = Театр, Закрыт .desc = { ent-AirlockServiceLocked.desc } @@ -121,9 +123,11 @@ ent-AirlockDetectiveLocked = { ent-AirlockSecurity } ent-AirlockBrigLocked = { ent-AirlockSecurity } .suffix = Бриг, Закрыт .desc = { ent-AirlockSecurity.desc } +#SS220-InternalAffairs-Begin ent-AirlockSecurityLawyerLocked = { ent-AirlockSecurity } - .suffix = Служба безопасности/Юридический, Закрыт + .suffix = Служба безопасности/Внутренние дела, Закрыт .desc = { ent-AirlockSecurity.desc } +#SS220-InternalAffairs-End ent-AirlockArmoryLocked = { ent-AirlockSecurity } .suffix = Оружейная, Закрыт .desc = { ent-AirlockSecurity.desc } @@ -136,9 +140,11 @@ ent-AirlockEVALocked = { ent-AirlockCommand } ent-AirlockServiceGlassLocked = { ent-AirlockGlass } .suffix = Сервисный, Закрыт .desc = { ent-AirlockGlass.desc } +#SS220-InternalAffairs-Begin ent-AirlockLawyerGlassLocked = { ent-AirlockServiceGlassLocked } - .suffix = Юридический, Закрыт + .suffix = Внутренние дела, Закрыт .desc = { ent-AirlockServiceGlassLocked.desc } +#SS220-InternalAffairs-End ent-AirlockTheatreGlassLocked = { ent-AirlockServiceGlassLocked } .suffix = Театр, Закрыт .desc = { ent-AirlockServiceGlassLocked.desc } @@ -246,9 +252,11 @@ ent-AirlockDetectiveGlassLocked = { ent-AirlockSecurityGlass } ent-AirlockBrigGlassLocked = { ent-AirlockSecurityGlass } .suffix = Бриг, Закрыт .desc = { ent-AirlockSecurityGlass.desc } +#SS220-InternalAffairs-Begin ent-AirlockSecurityLawyerGlassLocked = { ent-AirlockSecurityGlass } - .suffix = Служба безопасности/Юридический, Закрыт + .suffix = Служба безопасности/Внутренние дела, Закрыт .desc = { ent-AirlockSecurityGlass.desc } +#SS220-InternalAffairs-End ent-AirlockArmoryGlassLocked = { ent-AirlockSecurityGlass } .suffix = Оружейная, Закрыт .desc = { ent-AirlockSecurityGlass.desc } @@ -297,9 +305,11 @@ ent-AirlockMaintHydroLocked = { ent-AirlockMaintServiceLocked } ent-AirlockMaintJanitorLocked = { ent-AirlockMaintServiceLocked } .suffix = Уборщик, Закрыт .desc = { ent-AirlockMaintServiceLocked.desc } +#SS220-InternalAffairs-Begin ent-AirlockMaintLawyerLocked = { ent-AirlockMaintServiceLocked } - .suffix = Юридический, Закрыт + .suffix = Внутренние дела, Закрыт .desc = { ent-AirlockMaintServiceLocked.desc } +#SS220-InternalAffairs-End ent-AirlockMaintServiceLocked = { ent-AirlockMaint } .suffix = Сервисный, Закрыт .desc = { ent-AirlockMaint.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl index be6d4f4a3154e6..1405ad2a2f640e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl @@ -122,9 +122,11 @@ ent-WindoorSecureAtmosphericsLocked = { ent-WindoorSecure } ent-PlasmaWindoorSecureJanitorLocked = { ent-WindoorSecurePlasma } .suffix = Уборщик, Закрыт, Плазма .desc = { ent-WindoorSecurePlasma.desc } +#SS220-InternalAffairs-Begin ent-WindoorSecureSecurityLawyerLocked = { ent-WindoorSecureSecurityLocked } - .suffix = Служба Безопасности/Юридический, Закрыт + .suffix = Служба Безопасности/Внутренние дела, Закрыт .desc = { ent-WindoorSecureSecurityLocked.desc } +#SS220-InternalAffairs-End ent-WindoorSecureParamedicLocked = { ent-WindoorSecure } .suffix = Парамедик, Закрыт .desc = { ent-WindoorSecure.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/switch.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/switch.ftl index 9b09fd344401dd..5ac29d04b1ddeb 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/switch.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/switch.ftl @@ -53,9 +53,11 @@ ent-LockableButtonArmory = { ent-LockableButton } ent-LockableButtonBrig = { ent-LockableButton } .suffix = Бриг .desc = { ent-LockableButton.desc } +#SS220-InternalAffairs-Begin ent-LockableButtonLawyer = { ent-LockableButton } - .suffix = Юридический + .suffix = Внутренние дела .desc = { ent-LockableButton.desc } +#SS220-InternalAffairs-End ent-LockableButtonEngineering = { ent-LockableButton } .suffix = Инженерный .desc = { ent-LockableButton.desc } diff --git a/Resources/Locale/ru-RU/ss220/clothing/Ears/headset.ftl b/Resources/Locale/ru-RU/ss220/clothing/Ears/headset.ftl new file mode 100644 index 00000000000000..a9ae2db3ff243a --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/clothing/Ears/headset.ftl @@ -0,0 +1,4 @@ +ent-ClothingHeadsetAltCommandInternalAffairs = полноразмерная гарнитура департамента внутренних дел + .desc = Её используют представители закона. +ent-ClothingHeadsetLawyer = гарнитура департамента внутренних дел + .desc = Её используют представители закона. diff --git a/Resources/Locale/ru-RU/ss220/headset-component.ftl b/Resources/Locale/ru-RU/ss220/headset-component.ftl index 980cafc0307f09..91ca6147e25388 100644 --- a/Resources/Locale/ru-RU/ss220/headset-component.ftl +++ b/Resources/Locale/ru-RU/ss220/headset-component.ftl @@ -7,3 +7,5 @@ chat-radio-traders = Торговцы chat-radio-honk = Хонк-сквад chat-radio-hive = Улей + +chat-radio-internal-affairs = Внутренние дела diff --git a/Resources/Locale/ru-RU/ss220/job/department-desc.ftl b/Resources/Locale/ru-RU/ss220/job/department-desc.ftl new file mode 100644 index 00000000000000..cb8c2770089f55 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/job/department-desc.ftl @@ -0,0 +1 @@ +department-Internal-Affairs-description = Защищайте соблюдение норм и положений, расследуйте инциденты и возможные случаи нарушение КЗ и СРП. diff --git a/Resources/Locale/ru-RU/ss220/job/department.ftl b/Resources/Locale/ru-RU/ss220/job/department.ftl index 6a5db8986bd29d..2f6bf5438fcbcf 100644 --- a/Resources/Locale/ru-RU/ss220/job/department.ftl +++ b/Resources/Locale/ru-RU/ss220/job/department.ftl @@ -1 +1,2 @@ ghost-roles = Роли призрака +department-InternalAffairs = Департамент внутренних дел diff --git a/Resources/Locale/ru-RU/ss220/job/job-supervisors.ftl b/Resources/Locale/ru-RU/ss220/job/job-supervisors.ftl new file mode 100644 index 00000000000000..93392c52d4405b --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/job/job-supervisors.ftl @@ -0,0 +1,2 @@ +job-supervisors-magistrate = Магистрату и Центральному Командованию +job-supervisors-IAA = агенту внутренних дел diff --git a/Resources/Locale/ru-RU/ss220/paper.ftl b/Resources/Locale/ru-RU/ss220/paper.ftl index 79e5d46a443878..fca8656bad1276 100644 --- a/Resources/Locale/ru-RU/ss220/paper.ftl +++ b/Resources/Locale/ru-RU/ss220/paper.ftl @@ -3,7 +3,7 @@ ent-PaperNtForm = { ent-Paper } ent-PaperNtFormSec = { ent-Paper } .desc = Лист белой бумаги с логотипом NanoTrasen и надписью "Служба безопасности станции". ent-PaperNtFormLaw = { ent-Paper } - .desc = Лист белой бумаги с логотипом NanoTrasen и надписью "Юридический отдел станции". + .desc = Лист белой бумаги с логотипом NanoTrasen и надписью "Департамент внутренних дел станции". ent-PaperNtFormSci = { ent-Paper } .desc = Лист белой бумаги с логотипом NanoTrasen и надписью "Отдел исследований". ent-PaperNtFormCmd = { ent-Paper } @@ -21,4 +21,4 @@ ent-PaperNtFormCc = { ent-Paper } ent-PaperNtFormCcSecure = { ent-Paper } .desc = Лист белой бумаги с логотипом NanoTrasen и надписью "Центральное командование NanoTrasen". ent-PaperSyndieForm = { ent-Paper } - .desc = Лист белой бумаги. Логотип в верхней части бумаги выглядит очень подозрительным. \ No newline at end of file + .desc = Лист белой бумаги. Логотип в верхней части бумаги выглядит очень подозрительным. diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/devices/encryption.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/devices/encryption.ftl new file mode 100644 index 00000000000000..37f6c015ec850c --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/devices/encryption.ftl @@ -0,0 +1,2 @@ +ent-EncryptionKeyInternalAffairs = ключ шифрования внутренних дел + .desc = Ключ шифрования, использующаяся истинным законом. diff --git a/Resources/PhotocopierForms/FormIndex.yml b/Resources/PhotocopierForms/FormIndex.yml index 426dfd8c6c7d4c..e9f2ae85d246d7 100644 --- a/Resources/PhotocopierForms/FormIndex.yml +++ b/Resources/PhotocopierForms/FormIndex.yml @@ -59,8 +59,8 @@ - /PhotocopierForms/nanotrasen_station/hr/cmd_acr.xml - /PhotocopierForms/nanotrasen_station/hr/cmd_acwt.xml - Id: law - Name: Юридический отдел - Color: "#DD4040FF" + Name: Внутренние Дела #SS220-InternalAffairs + Color: "#323ba9FF" #SS220-InternalAffairs IconPath: /Textures/SS220/DepartmentIcons/Law_dep.png Forms: - /PhotocopierForms/nanotrasen_station/law/cmd_comp.xml @@ -71,6 +71,8 @@ - /PhotocopierForms/nanotrasen_station/law/sec_vdc.xml - /PhotocopierForms/nanotrasen_station/law/sec_vdc_gop.xml - /PhotocopierForms/nanotrasen_station/law/law_anonymousdenunciation.xml + - /PhotocopierForms/nanotrasen_station/law/law_req.xml #SS220-InternalAffairs + - /PhotocopierForms/nanotrasen_station/blank/blank_regular_law.xml #SS220-InternalAffairs - Id: security Name: Служба Безопасности Color: "#DD4040FF" diff --git a/Resources/PhotocopierForms/nanotrasen_station/blank/blank_regular_law.xml b/Resources/PhotocopierForms/nanotrasen_station/blank/blank_regular_law.xml new file mode 100644 index 00000000000000..df080577e98a1a --- /dev/null +++ b/Resources/PhotocopierForms/nanotrasen_station/blank/blank_regular_law.xml @@ -0,0 +1,8 @@ + +
+ blank_law + PaperNtFormLaw + бумага + Свободный бланк департамента внутренних дел + +
diff --git a/Resources/PhotocopierForms/nanotrasen_station/law/law_req.xml b/Resources/PhotocopierForms/nanotrasen_station/law/law_req.xml new file mode 100644 index 00000000000000..2f2ea835288c34 --- /dev/null +++ b/Resources/PhotocopierForms/nanotrasen_station/law/law_req.xml @@ -0,0 +1,17 @@ + +
+ law_req + PaperNtFormLaw + Форма НТ-КОМ-ЗАП + Отчёт Агента Внутренних Дел + +
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml index a8e3da83f3fee2..4c5dca988ad990 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml @@ -12,7 +12,8 @@ ClothingUniformJumpsuitLawyerGood: 1 ClothingUniformJumpskirtLawyerGood: 1 ClothingShoesBootsLaceup: 2 - ClothingHeadsetIAA: 2 # Corvax-IAA +# ClothingHeadsetIAA: 2 SS220-InternalAffairs + ClothingHeadsetLawyer: 4 #SS220-InternalAffairs ClothingNeckLawyerbadge: 2 # Corvax-LawyerDrip-Start ClothingHandsGlovesColorWhite: 1 diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Ears/headsets.yml index 160f5a4c172931..1e4e4a80ff797d 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Ears/headsets.yml @@ -8,5 +8,6 @@ containers: key_slots: - EncryptionKeyIAA + - EncryptionKeyInternalAffairs #SS220-InternalAffairs - type: Sprite sprite: Clothing/Ears/Headsets/servicesecurity.rsi diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Misc/stamps.yml b/Resources/Prototypes/Corvax/Entities/Objects/Misc/stamps.yml index 98337631585386..2a7c06f3ddd4b9 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Misc/stamps.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Misc/stamps.yml @@ -1,11 +1,12 @@ - type: entity name: law office's rubber stamp - parent: RubberStampMime + parent: RubberStampBase #SS220-InternalAffairs id: RubberStampIAA suffix: DO NOT MAP components: - type: Stamp stampedName: stamp-component-stamped-name-iaa + stampedColor: "#293289" #SS220-InternalAffairs stampState: "paper_stamp-iaa" - type: Sprite state: stamp-iaa diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml index edbcd1a40086de..9b81f842e20fbd 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml @@ -1,48 +1,52 @@ -- type: job - id: IAA - name: job-name-iaa - playTimeTracker: JobIAA - requirements: - - !type:DepartmentTimeRequirement - department: Command - time: 72000 # SS220-RoleTime - - !type:DepartmentTimeRequirement - department: Security - time: 72000 # SS220-RoleTime - - !type:SpeciesRequirement #SS220-jobbans begin - inverted: true - species: - - Felinid #SS220-jobbans end - startingGear: IAAGear - icon: "JobIconIAA" - supervisors: job-supervisors-centcom - canBeAntag: false - access: - - Service - - Brig - - Maintenance - - Command - - External - - Lawyer - special: - - !type:AddImplantSpecial - implants: [ MindShieldImplant ] +#SS220-InternalAffairs-Begin +# +# - type: job +# id: IAA +# name: job-name-iaa +# playTimeTracker: JobIAA +# requirements: +# - !type:DepartmentTimeRequirement +# department: Command +# time: 72000 # SS220-RoleTime +# - !type:DepartmentTimeRequirement +# department: Security +# time: 72000 # SS220-RoleTime +# - !type:SpeciesRequirement #SS220-jobbans begin +# inverted: true +# species: +# - Felinid #SS220-jobbans end +# startingGear: IAAGear +# icon: "JobIconIAA" +# supervisors: job-supervisors-centcom +# canBeAntag: false +# access: +# - Service +# - Brig +# - Maintenance +# - Command +# - External +# - Lawyer +# special: +# - !type:AddImplantSpecial +# implants: [ MindShieldImplant ] -- type: startingGear - id: IAAGear - equipment: - shoes: ClothingShoesBootsLaceup #SS220-IAA-Loadout - id: IAAPDA - eyes: ClothingEyesGlassesSunglasses - ears: ClothingHeadsetIAA - back: ClothingBackpackSatchelLeather #SS220-IAA-Loadout - inhand: - - BriefcaseIAAFilled -#SS220-IAA-Loadout-Begin - storage: - back: - - BoxSurvival - - Telescopichka - - Flash - - ExpensiveLighterNanotrasen -#SS220-IAA-Loadout-End +# - type: startingGear +# id: IAAGear +# equipment: +# shoes: ClothingShoesBootsLaceup #SS220-IAA-Loadout +# id: IAAPDA +# eyes: ClothingEyesGlassesSunglasses +# ears: ClothingHeadsetIAA +# back: ClothingBackpackSatchelLeather #SS220-IAA-Loadout +# inhand: +# - BriefcaseIAAFilled +# #SS220-IAA-Loadout-Begin +# storage: +# back: +# - BoxSurvival +# - Telescopichka +# - Flash +# - ExpensiveLighterNanotrasen +# #SS220-IAA-Loadout-End +# +#SS220-InternalAffairs-End diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/detective.yml b/Resources/Prototypes/Roles/Jobs/Civilian/detective.yml index 6601b1d04a13cf..329805d456dc1a 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/detective.yml @@ -1,33 +1,37 @@ -- type: job - id: Detective - name: job-name-detective - description: job-description-detective - playTimeTracker: JobDetective - requirements: - - !type:DepartmentTimeRequirement - department: Security - time: 72000 # SS220-RoleTime - startingGear: DetectiveGear - icon: "JobIconDetective" - supervisors: job-supervisors-hop - canBeAntag: true - access: - - Brig - - Maintenance - - Service - - Detective - extendedAccess: - - Security +#SS220-InternalAffairs-Begin +# +# - type: job +# id: Detective +# name: job-name-detective +# description: job-description-detective +# playTimeTracker: JobDetective +# requirements: +# - !type:DepartmentTimeRequirement +# department: Security +# time: 72000 # SS220-RoleTime +# startingGear: DetectiveGear +# icon: "JobIconDetective" +# supervisors: job-supervisors-hop +# canBeAntag: true +# access: +# - Brig +# - Maintenance +# - Service +# - Detective +# extendedAccess: +# - Security -- type: startingGear - id: DetectiveGear - equipment: - eyes: ClothingEyesGlassesSecurity - id: DetectivePDA - ears: ClothingHeadsetSecurity - neck: ClothingBeltHolsterFilled #SS220 holster to neck - storage: - back: - - Flash - - ForensicPad - - ForensicScanner +# - type: startingGear +# id: DetectiveGear +# equipment: +# eyes: ClothingEyesGlassesSecurity +# id: DetectivePDA +# ears: ClothingHeadsetSecurity +# neck: ClothingBeltHolsterFilled #SS220 holster to neck +# storage: +# back: +# - Flash +# - ForensicPad +# - ForensicScanner +# +#SS220-InternalAffairs-End diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 11013e52182d40..032d5ab76847e7 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -1,31 +1,35 @@ -- type: job - id: Lawyer - name: job-name-lawyer - description: job-description-lawyer - playTimeTracker: JobLawyer - requirements: - - !type:DepartmentTimeRequirement - department: Security - time: 36000 # SS220-RoleTime 2 - startingGear: LawyerGear - setPreference: true # SS220 return-of-the-lawyer - icon: "JobIconLawyer" - supervisors: job-supervisors-hop - access: - - Service - - Lawyer - - Brig - - Maintenance +#SS220-InternalAffairs-Begin +# +# - type: job +# id: Lawyer +# name: job-name-lawyer +# description: job-description-lawyer +# playTimeTracker: JobLawyer +# requirements: +# - !type:DepartmentTimeRequirement +# department: Security +# time: 36000 # SS220-RoleTime 2 +# startingGear: LawyerGear +# setPreference: true # SS220 return-of-the-lawyer +# icon: "JobIconLawyer" +# supervisors: job-supervisors-hop +# access: +# - Service +# - Lawyer +# - Brig +# - Maintenance -- type: startingGear - id: LawyerGear - equipment: - shoes: ClothingShoesBootsLaceup - id: LawyerPDA - ears: ClothingHeadsetSecurity - inhand: - - BriefcaseBrownFilled - storage: - back: - - RubberStampLawyer - - BookSpaceLaw +# - type: startingGear +# id: LawyerGear +# equipment: +# shoes: ClothingShoesBootsLaceup +# id: LawyerPDA +# ears: ClothingHeadsetSecurity +# inhand: +# - BriefcaseBrownFilled +# storage: +# back: +# - RubberStampLawyer +# - BookSpaceLaw +# +#SS220-InternalAffairs-End diff --git a/Resources/Prototypes/Roles/Jobs/Command/blue_shield.yml b/Resources/Prototypes/Roles/Jobs/Command/blue_shield.yml index 6d6fe1893016fb..a0e992c73581a8 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/blue_shield.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/blue_shield.yml @@ -43,6 +43,7 @@ - Cargo - Medical - Blueshield + - Lawyer #SS220-InternalAffairs special: - !type:AddImplantSpecial implants: [ MindShieldImplant ] @@ -65,7 +66,7 @@ head: ClothingHeadHatBeretNavyBlue # outerClothing: ClothingOuterArmorBulletproof #SS220-blueshield-loadouts id: BlueShieldPDA - ears: ClothingHeadsetAltCommand + ears: ClothingHeadsetAltInternalAffairs #SS220-InternalAffairs pocket1: WeaponAdvancedRevolver # belt: ClothingBeltSecurityFilled #SS220-blueshield-loadouts gloves: ClothingHandsGlovesCombat diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 8a28fe8ab60df3..523b5e15c615c2 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -44,7 +44,7 @@ - Salvage - Security - Brig - - Lawyer +# - Lawyer #SS220-Internal-Affairs - Cargo - Atmospherics - Medical diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index d897724daee62e..50e457cdb4a6c7 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -23,11 +23,11 @@ - Chaplain - Chef - Clown - - Detective +# - Detective #SS220-Internal-Affairs - HeadOfPersonnel - SeniorService #ss220-SEniorService - Janitor - - Lawyer +# - Lawyer #SS220-Internal-Affairs - Librarian - Mime - Musician diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Ears/headset.yml b/Resources/Prototypes/SS220/Entities/Clothing/Ears/headset.yml new file mode 100644 index 00000000000000..3d704cf769b68c --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Clothing/Ears/headset.yml @@ -0,0 +1,32 @@ +- type: entity + parent: ClothingHeadsetAlt + id: ClothingHeadsetAltInternalAffairs + name: full-size headset of the Department of Internal Affairs + description: It is used by representatives of the law. + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyInternalAffairs + - EncryptionKeyStationMaster + - type: Sprite + sprite: SS220/Clothing/Ears/Headsets/internal_affairs.rsi + - type: Clothing + sprite: SS220/Clothing/Ears/Headsets/internal_affairs.rsi + +- type: entity + parent: ClothingHeadset + id: ClothingHeadsetLawyer + name: headset of the Department of Internal Affairs + description: It is used by representatives of the law. + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyInternalAffairs + - EncryptionKeySecurity + - EncryptionKeyCommon + - type: Sprite + sprite: SS220/Clothing/Ears/Headsets/internal_affairs.rsi + - type: Clothing + sprite: SS220/Clothing/Ears/Headsets/internal_affairs.rsi diff --git a/Resources/Prototypes/SS220/Entities/Objects/Devices/encryption.yml b/Resources/Prototypes/SS220/Entities/Objects/Devices/encryption.yml new file mode 100644 index 00000000000000..2197567d3681ed --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Devices/encryption.yml @@ -0,0 +1,15 @@ +- type: entity + parent: EncryptionKey + id: EncryptionKeyInternalAffairs + name: internal affairs encryption key + description: The encryption key used by the true law. + components: + - type: EncryptionKey + channels: + - InternalAffairs + defaultChannel: InternalAffairs + - type: Sprite + sprite: SS220/Objects/Devices/encryption_keys.rsi + layers: + - state: crypt_silver + - state: lawyer_label diff --git a/Resources/Prototypes/SS220/Roles/Jobs/Internal-Affairs/detective.yml b/Resources/Prototypes/SS220/Roles/Jobs/Internal-Affairs/detective.yml new file mode 100644 index 00000000000000..724b5300540c58 --- /dev/null +++ b/Resources/Prototypes/SS220/Roles/Jobs/Internal-Affairs/detective.yml @@ -0,0 +1,34 @@ +- type: job + id: Detective + name: job-name-detective + description: job-description-detective + playTimeTracker: JobDetective + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 72000 # SS220-RoleTime + startingGear: DetectiveGear + icon: "JobIconDetective" + supervisors: job-supervisors-IAA #SS220-Internal-Affairs + canBeAntag: true + access: + - Brig + - Maintenance +# - Service SS220-Internal-Affairs + - Detective + - Lawyer #SS220-Internal-Affairs + extendedAccess: + - Security + +- type: startingGear + id: DetectiveGear + equipment: + eyes: ClothingEyesGlassesSecurity + id: DetectivePDA + ears: ClothingHeadsetLawyer #SS220-Internal-Affairs + neck: ClothingBeltHolsterFilled #SS220 holster to neck + storage: + back: + - Flash + - ForensicPad + - ForensicScanner diff --git a/Resources/Prototypes/SS220/Roles/Jobs/Internal-Affairs/iaa.yml b/Resources/Prototypes/SS220/Roles/Jobs/Internal-Affairs/iaa.yml new file mode 100644 index 00000000000000..824b81cb216580 --- /dev/null +++ b/Resources/Prototypes/SS220/Roles/Jobs/Internal-Affairs/iaa.yml @@ -0,0 +1,48 @@ +- type: job + id: IAA + name: job-name-iaa + playTimeTracker: JobIAA + requirements: + - !type:DepartmentTimeRequirement + department: Command + time: 72000 # SS220-RoleTime + - !type:DepartmentTimeRequirement + department: Security + time: 72000 # SS220-RoleTime + - !type:SpeciesRequirement #SS220-jobbans begin + inverted: true + species: + - Felinid #SS220-jobbans end + startingGear: IAAGear + icon: "JobIconIAA" + supervisors: job-supervisors-magistrate #SS220-Internal-Affairs + canBeAntag: false + access: + - Service + - Brig + - Maintenance + - Command + - External + - Lawyer + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + +- type: startingGear + id: IAAGear + equipment: + shoes: ClothingShoesBootsLaceup #SS220-IAA-Loadout + id: IAAPDA + eyes: ClothingEyesGlassesSunglasses + ears: ClothingHeadsetIAA + back: ClothingBackpackSatchelLeather #SS220-IAA-Loadout + inhand: + - BriefcaseIAAFilled +#SS220-IAA-Loadout-Begin + storage: + back: + - BoxSurvival + - Telescopichka + - Flash + - ExpensiveLighterNanotrasen +#SS220-IAA-Loadout-End diff --git a/Resources/Prototypes/SS220/Roles/Jobs/Internal-Affairs/lawyer.yml b/Resources/Prototypes/SS220/Roles/Jobs/Internal-Affairs/lawyer.yml new file mode 100644 index 00000000000000..24611a1dc9f7fc --- /dev/null +++ b/Resources/Prototypes/SS220/Roles/Jobs/Internal-Affairs/lawyer.yml @@ -0,0 +1,31 @@ +- type: job + id: Lawyer + name: job-name-lawyer + description: job-description-lawyer + playTimeTracker: JobLawyer + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 36000 # SS220-RoleTime 2 + startingGear: LawyerGear + setPreference: true # SS220 return-of-the-lawyer + icon: "JobIconLawyer" + supervisors: job-supervisors-IAA #SS220-InternalAffairs + access: +# - Service SS220-Internal-Affairs + - Lawyer + - Brig + - Maintenance + +- type: startingGear + id: LawyerGear + equipment: + shoes: ClothingShoesBootsLaceup + id: LawyerPDA + ears: ClothingHeadsetLawyer #SS220-Internal-Affair + inhand: + - BriefcaseBrownFilled + storage: + back: + - RubberStampLawyer + - BookSpaceLaw diff --git a/Resources/Prototypes/SS220/Roles/Jobs/departaments.yml b/Resources/Prototypes/SS220/Roles/Jobs/departaments.yml new file mode 100644 index 00000000000000..598ae3b696a19e --- /dev/null +++ b/Resources/Prototypes/SS220/Roles/Jobs/departaments.yml @@ -0,0 +1,13 @@ +- type: department + id: InternalAffairs + name: department-InternalAffairs + sort: 0 + description: department-Internal-Affairs-description + color: "#323ba9" + roles: + - IAA + - BlueShield + - Lawyer + - Detective + primary: false + weight: 80 diff --git a/Resources/Prototypes/SS220/radio_channels.yml b/Resources/Prototypes/SS220/radio_channels.yml index 6fae7c288bbdc4..31efc5e740ad05 100644 --- a/Resources/Prototypes/SS220/radio_channels.yml +++ b/Resources/Prototypes/SS220/radio_channels.yml @@ -196,7 +196,15 @@ - type: radioChannel #Connection id: HiveRadio name: chat-radio-hive - keycode: 'у' + keycode: 'у' frequency: 2885 color: "#cc80ff" - longRange: true + longRange: true + +#Department Internal Affairs +- type: radioChannel + id: InternalAffairs + name: chat-radio-internal-affairs + keycode: 'в' + frequency: 1373 + color: "#323ba9" diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Detective.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Detective.png index 5b43723b24addb..b65ea95528939f 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Detective.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Detective.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Lawyer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Lawyer.png index f153a95e5db483..c816fe59526e9d 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Lawyer.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Lawyer.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index a1f3a08e5e0207..a1d7df1a912351 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip, lawyer and detective changes by Estkemran (Github) for SS220", "size": { "x": 8, diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index b8c818a4ab706f..1cd8dc9edfb2fa 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. folder-centcomm by MrALPAKA for SS220", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. folder-centcomm by MrALPAKA for SS220, paper_stamp_iaa tweak by Estkemran (Github) for SS220", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-iaa.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-iaa.png index 4d6a32334a413a..e938f7e11d810c 100644 Binary files a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-iaa.png and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-iaa.png differ diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/Objects/Misc/stamps.rsi/meta.json index 923d14ee38558f..0f934602c620fa 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. Resprite stamp-IAA by Estkemran (Github) for SS220", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/stamp-iaa.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-iaa.png index eb505c77e03884..665ff85a5803a1 100644 Binary files a/Resources/Textures/Objects/Misc/stamps.rsi/stamp-iaa.png and b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-iaa.png differ diff --git a/Resources/Textures/SS220/Clothing/Ears/Headsets/internal_affairs.rsi/alt-equipped-EARS.png b/Resources/Textures/SS220/Clothing/Ears/Headsets/internal_affairs.rsi/alt-equipped-EARS.png new file mode 100644 index 00000000000000..ba010d21a427db Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Ears/Headsets/internal_affairs.rsi/alt-equipped-EARS.png differ diff --git a/Resources/Textures/SS220/Clothing/Ears/Headsets/internal_affairs.rsi/equipped-EARS.png b/Resources/Textures/SS220/Clothing/Ears/Headsets/internal_affairs.rsi/equipped-EARS.png new file mode 100644 index 00000000000000..4a1ea288d3a4c2 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Ears/Headsets/internal_affairs.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/SS220/Clothing/Ears/Headsets/internal_affairs.rsi/icon.png b/Resources/Textures/SS220/Clothing/Ears/Headsets/internal_affairs.rsi/icon.png new file mode 100644 index 00000000000000..387de7f554b28f Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Ears/Headsets/internal_affairs.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Ears/Headsets/internal_affairs.rsi/icon_alt.png b/Resources/Textures/SS220/Clothing/Ears/Headsets/internal_affairs.rsi/icon_alt.png new file mode 100644 index 00000000000000..4413baeea017f9 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Ears/Headsets/internal_affairs.rsi/icon_alt.png differ diff --git a/Resources/Textures/SS220/Clothing/Ears/Headsets/internal_affairs.rsi/meta.json b/Resources/Textures/SS220/Clothing/Ears/Headsets/internal_affairs.rsi/meta.json new file mode 100644 index 00000000000000..d1a78745736182 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Ears/Headsets/internal_affairs.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Hqlle and SonicHDC (github), color edited by Estkemran (Github) for S220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_alt" + }, + { + "name": "equipped-EARS", + "directions": 4 + }, + { + "name": "alt-equipped-EARS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Interface/Paper/license.txt b/Resources/Textures/SS220/Interface/Paper/license.txt index df8146418f7017..c8fbd18ea983fd 100644 --- a/Resources/Textures/SS220/Interface/Paper/license.txt +++ b/Resources/Textures/SS220/Interface/Paper/license.txt @@ -1 +1 @@ -syndie_form_header.png, nanotrasen_form_header.png, nanotrasen_cargo_form_header.png, nanotrasen_cc_form_header.png, nanotrasen_cmd_form_header.png, nanotrasen_eng_form_header.png, nanotrasen_med_form_header.png, nanotrasen_sec_form_header.png, nanotrasen_law_form_header.png, nanotrasen_сс_secure_form_header.png: CC BY-NC-SA-3.0 Originals are taken from Paradise build of SS13 (ParadiseSS13/Paradise on GitHub) at commit 548161c4ec3bdff455ba7a972b079780d74641bf. Author of original images is Warriorstar (warriorstar-orion on GitHub). \ No newline at end of file +syndie_form_header.png, nanotrasen_form_header.png, nanotrasen_cargo_form_header.png, nanotrasen_cc_form_header.png, nanotrasen_cmd_form_header.png, nanotrasen_eng_form_header.png, nanotrasen_med_form_header.png, nanotrasen_sec_form_header.png, nanotrasen_law_form_header.png, nanotrasen_сс_secure_form_header.png: CC BY-NC-SA-3.0 Originals are taken from Paradise build of SS13 (ParadiseSS13/Paradise on GitHub) at commit 548161c4ec3bdff455ba7a972b079780d74641bf. Author of original images is Warriorstar (warriorstar-orion on GitHub). nanotrasen_law_form_header.png resprited by Estkemran (Github) for SS220. \ No newline at end of file diff --git a/Resources/Textures/SS220/Interface/Paper/nanotrasen_law_form_header.png b/Resources/Textures/SS220/Interface/Paper/nanotrasen_law_form_header.png index b4ede9f9761796..958656f3f506f6 100644 Binary files a/Resources/Textures/SS220/Interface/Paper/nanotrasen_law_form_header.png and b/Resources/Textures/SS220/Interface/Paper/nanotrasen_law_form_header.png differ diff --git a/Resources/Textures/SS220/Objects/Devices/encryption_keys.rsi/crypt_silver.png b/Resources/Textures/SS220/Objects/Devices/encryption_keys.rsi/crypt_silver.png new file mode 100644 index 00000000000000..c31a743f473e04 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Devices/encryption_keys.rsi/crypt_silver.png differ diff --git a/Resources/Textures/SS220/Objects/Devices/encryption_keys.rsi/lawyer_label.png b/Resources/Textures/SS220/Objects/Devices/encryption_keys.rsi/lawyer_label.png new file mode 100644 index 00000000000000..c0bcd76523cbe3 Binary files /dev/null and b/Resources/Textures/SS220/Objects/Devices/encryption_keys.rsi/lawyer_label.png differ diff --git a/Resources/Textures/SS220/Objects/Devices/encryption_keys.rsi/meta.json b/Resources/Textures/SS220/Objects/Devices/encryption_keys.rsi/meta.json new file mode 100644 index 00000000000000..04510f2c8129d5 --- /dev/null +++ b/Resources/Textures/SS220/Objects/Devices/encryption_keys.rsi/meta.json @@ -0,0 +1,13 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by DSC@300074782328750080 for Space Station 14, modaifed by Estkemran (Github) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + {"name": "crypt_silver"}, + {"name": "lawyer_label"} + ] +}