Revert "Internal Affairs (SerbiaStrong-220#1600)"

This reverts commit 0af503a.

Resources/Locale/ru-RU/prototypes/access/accesses.ftl

@@ -27,9 +27,7 @@ id-card-access-level-service = Сервис
 id-card-access-level-janitor = Уборщик
 id-card-access-level-theatre = Театр
 id-card-access-level-chapel = Церковь
-#SS220-InternalAffairs-Begin
-id-card-access-level-lawyer = Внутренние дела
-#SS220-InternalAffairs-End
+id-card-access-level-lawyer = Юридический
 id-card-access-level-maintenance = Техобслуживание
 id-card-access-level-external = Внешний
 id-card-access-level-nuclear-operative = Ядерный оперативник

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door_access.ftl

@@ -22,11 +22,9 @@ 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 }
@@ -93,11 +91,9 @@ 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 }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl

@@ -1,11 +1,9 @@
 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 }
@@ -123,11 +121,9 @@ 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 }
@@ -140,11 +136,9 @@ 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 }
@@ -252,11 +246,9 @@ 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 }
@@ -305,11 +297,9 @@ 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 }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl

@@ -122,11 +122,9 @@ 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 }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/switch.ftl

@@ -53,11 +53,9 @@ 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 }

Resources/Locale/ru-RU/ss220/headset-component.ftl

@@ -7,5 +7,3 @@ chat-radio-traders = Торговцы
 chat-radio-honk = Хонк-сквад
 
 chat-radio-hive = Улей
-
-chat-radio-internal-affairs = Внутренние дела

Resources/Locale/ru-RU/ss220/job/department.ftl

@@ -1,2 +1 @@
 ghost-roles = Роли призрака
-department-InternalAffairs = Департамент внутренних дел

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 = Лист белой бумаги. Логотип в верхней части бумаги выглядит очень подозрительным.
+    .desc = Лист белой бумаги. Логотип в верхней части бумаги выглядит очень подозрительным.

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: Внутренние Дела #SS220-InternalAffairs
-    Color: "#323ba9FF" #SS220-InternalAffairs
+    Name: Юридический отдел
+    Color: "#DD4040FF"
     IconPath: /Textures/SS220/DepartmentIcons/Law_dep.png
     Forms:
     - /PhotocopierForms/nanotrasen_station/law/cmd_comp.xml
@@ -71,8 +71,6 @@
     - /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"

Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml

@@ -12,8 +12,7 @@
     ClothingUniformJumpsuitLawyerGood: 1
     ClothingUniformJumpskirtLawyerGood: 1
     ClothingShoesBootsLaceup: 2
-#    ClothingHeadsetIAA: 2 SS220-InternalAffairs
-    ClothingHeadsetLawyer: 4 #SS220-InternalAffairs
+    ClothingHeadsetIAA: 2 # Corvax-IAA
     ClothingNeckLawyerbadge: 2
     # Corvax-LawyerDrip-Start
     ClothingHandsGlovesColorWhite: 1

Resources/Prototypes/Corvax/Entities/Clothing/Ears/headsets.yml

@@ -8,6 +8,5 @@
       containers:
         key_slots:
         - EncryptionKeyIAA
-        - EncryptionKeyInternalAffairs #SS220-InternalAffairs
     - type: Sprite
       sprite: Clothing/Ears/Headsets/servicesecurity.rsi

Resources/Prototypes/Corvax/Entities/Objects/Misc/stamps.yml

@@ -1,12 +1,11 @@
 - type: entity
   name: law office's rubber stamp
-  parent: RubberStampBase #SS220-InternalAffairs
+  parent: RubberStampMime
   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

Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml

@@ -1,52 +1,48 @@
-#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: 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
-#
-#SS220-InternalAffairs-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