From 0af503a0f36bebf3d89f311a036b417f8cdfea57 Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Fri, 16 Aug 2024 22:46:09 +0300 Subject: [PATCH] Internal Affairs (#1600) * departaments * channel&headset * paper-form * IAA-stamp * fix * added-remark --- .../ru-RU/prototypes/access/accesses.ftl | 4 +- .../devices/electronics/door_access.ftl | 8 +- .../structures/doors/airlocks/access.ftl | 20 +++- .../structures/doors/windoors/windoor.ftl | 4 +- .../entities/structures/wallmounts/switch.ftl | 4 +- .../ru-RU/ss220/clothing/Ears/headset.ftl | 4 + .../Locale/ru-RU/ss220/headset-component.ftl | 2 + .../ru-RU/ss220/job/department-desc.ftl | 1 + .../Locale/ru-RU/ss220/job/department.ftl | 1 + .../ru-RU/ss220/job/job-supervisors.ftl | 2 + Resources/Locale/ru-RU/ss220/paper.ftl | 4 +- .../entities/objects/devices/encryption.ftl | 2 + Resources/PhotocopierForms/FormIndex.yml | 6 +- .../blank/blank_regular_law.xml | 8 ++ .../nanotrasen_station/law/law_req.xml | 17 +++ .../VendingMachines/Inventories/lawdrobe.yml | 3 +- .../Entities/Clothing/Ears/headsets.yml | 1 + .../Corvax/Entities/Objects/Misc/stamps.yml | 3 +- .../Corvax/Roles/Jobs/Command/iaa.yml | 98 +++++++++--------- .../Roles/Jobs/Civilian/detective.yml | 68 ++++++------ .../Prototypes/Roles/Jobs/Civilian/lawyer.yml | 64 ++++++------ .../Roles/Jobs/Command/blue_shield.yml | 3 +- .../Roles/Jobs/Command/head_of_personnel.yml | 2 +- .../Prototypes/Roles/Jobs/departments.yml | 4 +- .../SS220/Entities/Clothing/Ears/headset.yml | 32 ++++++ .../Entities/Objects/Devices/encryption.yml | 15 +++ .../Roles/Jobs/Internal-Affairs/detective.yml | 34 ++++++ .../SS220/Roles/Jobs/Internal-Affairs/iaa.yml | 48 +++++++++ .../Roles/Jobs/Internal-Affairs/lawyer.yml | 31 ++++++ .../SS220/Roles/Jobs/departaments.yml | 13 +++ Resources/Prototypes/SS220/radio_channels.yml | 12 ++- .../Misc/job_icons.rsi/Detective.png | Bin 205 -> 182 bytes .../Interface/Misc/job_icons.rsi/Lawyer.png | Bin 126 -> 156 bytes .../Interface/Misc/job_icons.rsi/meta.json | 2 +- .../Objects/Misc/bureaucracy.rsi/meta.json | 2 +- .../Misc/bureaucracy.rsi/paper_stamp-iaa.png | Bin 148 -> 167 bytes .../Objects/Misc/stamps.rsi/meta.json | 2 +- .../Objects/Misc/stamps.rsi/stamp-iaa.png | Bin 265 -> 309 bytes .../alt-equipped-EARS.png | Bin 0 -> 375 bytes .../internal_affairs.rsi/equipped-EARS.png | Bin 0 -> 179 bytes .../Headsets/internal_affairs.rsi/icon.png | Bin 0 -> 370 bytes .../internal_affairs.rsi/icon_alt.png | Bin 0 -> 491 bytes .../Headsets/internal_affairs.rsi/meta.json | 25 +++++ .../SS220/Interface/Paper/license.txt | 2 +- .../Paper/nanotrasen_law_form_header.png | Bin 2695 -> 2978 bytes .../encryption_keys.rsi/crypt_silver.png | Bin 0 -> 512 bytes .../encryption_keys.rsi/lawyer_label.png | Bin 0 -> 164 bytes .../Devices/encryption_keys.rsi/meta.json | 13 +++ 48 files changed, 429 insertions(+), 135 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss220/clothing/Ears/headset.ftl create mode 100644 Resources/Locale/ru-RU/ss220/job/department-desc.ftl create mode 100644 Resources/Locale/ru-RU/ss220/job/job-supervisors.ftl create mode 100644 Resources/Locale/ru-RU/ss220/prototypes/entities/objects/devices/encryption.ftl create mode 100644 Resources/PhotocopierForms/nanotrasen_station/blank/blank_regular_law.xml create mode 100644 Resources/PhotocopierForms/nanotrasen_station/law/law_req.xml create mode 100644 Resources/Prototypes/SS220/Entities/Clothing/Ears/headset.yml create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Devices/encryption.yml create mode 100644 Resources/Prototypes/SS220/Roles/Jobs/Internal-Affairs/detective.yml create mode 100644 Resources/Prototypes/SS220/Roles/Jobs/Internal-Affairs/iaa.yml create mode 100644 Resources/Prototypes/SS220/Roles/Jobs/Internal-Affairs/lawyer.yml create mode 100644 Resources/Prototypes/SS220/Roles/Jobs/departaments.yml create mode 100644 Resources/Textures/SS220/Clothing/Ears/Headsets/internal_affairs.rsi/alt-equipped-EARS.png create mode 100644 Resources/Textures/SS220/Clothing/Ears/Headsets/internal_affairs.rsi/equipped-EARS.png create mode 100644 Resources/Textures/SS220/Clothing/Ears/Headsets/internal_affairs.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Ears/Headsets/internal_affairs.rsi/icon_alt.png create mode 100644 Resources/Textures/SS220/Clothing/Ears/Headsets/internal_affairs.rsi/meta.json create mode 100644 Resources/Textures/SS220/Objects/Devices/encryption_keys.rsi/crypt_silver.png create mode 100644 Resources/Textures/SS220/Objects/Devices/encryption_keys.rsi/lawyer_label.png create mode 100644 Resources/Textures/SS220/Objects/Devices/encryption_keys.rsi/meta.json 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 5b43723b24addb6fabfe6bc063db486350db2554..b65ea95528939f6ec4adb7e696c971ba586d5319 100644 GIT binary patch delta 154 zcmV;L0A>Hp0k#2+*R1*ZarjWwOxx3w*0BH4iQD9o45Un1sy6KY)-T}}JGiTh9`9<&! zWh?;4wxW!sDn;kWw>Y*nRXi4gcS+_{e?tH{Em0_AKi|9o&=cSu>i2^>d!1oDx_X$^&I@`3$&3hHNrE^*Ox&H X$mRfI5V#aP8AN%y`njxgN@xNAF`Yk} diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Lawyer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Lawyer.png index f153a95e5db483306e0ab6d83b8d3c2ac41267c5..c816fe59526e9d086f729e8e233bee646608c6bc 100644 GIT binary patch delta 139 zcmb=M!#F{ro`a2nf#C@MzHT7JSRCZ;#IWw1%u66A%+tj&L}F@kNSs{5gp-KHNKpPl5UHw>H);T3K0RSzHGU@;T delta 108 zcmbQkST{i;jft6ofnjH2m;{jG3GfMV{r~@eaBy&5ULKIKwWjhaP@J(O$S;_|;n|He zAV=gq>D2{st$*J`q`XKK(!2>u6{1- HoD!M<3zQ|; 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 4d6a32334a413a57ff4b89c6fe221ca7be45bce9..e938f7e11d810cd56a32088e54a8ab9c05c2234a 100644 GIT binary patch delta 139 zcmV;60CfM90jB|wB!2;OQb$4nuFf3k0001CNkl&RfvZ(q=Gb zV3aIFOUo86NtFfcNRgs@z5P!F006w8)V{s9#~b6S*&PuID7Ei7S~6P_iExkC^V-j- tcRWQSRI`{ZnWKe%g(5x~1_1oV4cuoRWoJ$r&Hw-a07*qoL<1002ovPDHLkV1n(BG$Q~2 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 eb505c77e03884a76844b2ef9b0e9260e652f998..665ff85a5803a1c8325069a4e51461f2c11f3213 100644 GIT binary patch delta 293 zcmV+=0owkF0<{8=8Gi-<0047(dh`GQ00DDSM?wIu&K&6g008evL_t(oh3%BVO2a@9 zhCfRX0zDKDW67yd1igrO^DVsO8GM93gU^x&$xVV61))d}3&|-^VM_>I4{f}tV5X2B zoDcReyUhGQJG%phVHn1dIngGbCwC!=C$zq%bh)}tq!mA#-hUIvGrWHX2wD>(O;Qw3 z06OuncrXL4uW7bR0GjQR*4Kj?2&K!}tXBYR)+kH3n%JRU976VWgX{g_>3`7T$H7IEs)|Y3Gxg64+RXt{uM$X!2*xSVg?4j zBOuH;Rhv&5D468w;uvC4=>N9IQs{sI2eay<*Z=kXI7|#S-d*x#*96neOv#4@d+xIu z=qI(uOj4i6=GyYF{8Fn@YANFafy~D%7YMPgDSWbW#fLpp6V9}{E%j~XTU=ewS!TXR i((%V5j$>{TkJ%P}kaPDg@6Q8T$KdJe=d#Wzp$Pz7(pcpH 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 0000000000000000000000000000000000000000..ba010d21a427dbaf634dd0346beec1758687e5a6 GIT binary patch literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z4Lw~PLn`LH zy|vcwaDd2xkH$`yujs6FGIM@tR%skxdGyun3A1du`x{oSoHc94bJ=f93Y`fCrv(52 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4a1ea288d3a4c2d045f460db2254f53abb71e81c GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|ay?xfLn`LH zy|t0E!9alZ!UKkF?-F0L+`M#6bF0uA6;2oZ4{^0E=VNEi7h({J-2V8F_2JpmYJ$&x zFnYiBef_HJeRGOmyuQEdSwB&#t6s6&0O^va(pHg7U~%PL4E`&G U*9X{V>;myUUHx3vIVCg!0FtvpJOBUy literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..387de7f554b28fb9b6ac056be21baaa414c4ff52 GIT binary patch literal 370 zcmV-&0ge8NP)Px$EJ;K`R9J=Wls{_2FcgPBizXPXG#D~?&J_xo3ISiB*U8o+=(6 zQcUWHi7Ti(*|bBbV!3qDx9K0>kM|@&AQ1RxBG-*smbCyP($9&A^Z9GsxyqC5iK$w` zX-gc(-BRlt;@88Sykn}Cl&38sg4P-l@v4M!-8fgpkMS7gcMdRD1^fM;xhnYhd>zAk zTL6HE#~13l9#!rf;F{RC|IPtyyrzD8#>Q(d)sg$ztP9|M51ayAs$(w)c&{p7uX_Mv zOq8fYFHh6~W6UTo00#VoP18`8Wdx9>X$$n@AvnJR5us@sthIFV)oR6Nv+0BUb%4lP z%VaV^Yuy6mdCqRP8|nsbXhDb8x?L<50G!Wfz^?^^NYk|SDSIFg2n4?K1+%JrvKJDr QfdBvi07*qoM6N<$f|iY<;{X5v literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4413baeea017f9e1672eff3d1d27e226fbab690c GIT binary patch literal 491 zcmVPx$rAb6VR9J=WmQPBX@Vk9Tzg8wwOO{aAV#ogqiuhnfdY&XlVHF>{S^ogwX5n;yA9f##RFB!Gpmd zdk({JCy~NQLI~~HHj9^+jSwM(HZt3abiQHW|woO-v z?05~o1sRDj46!T=rBtCrsS^M;f>vdWh?G)GDFIMQ?JiITBjY#@0PevB@1Kvn&90fv zW`*mwb`^-@c+Xsk2?yx;=lH(A(Kl)r07#PLN4V3v1;FYZ6-v}1u!_^VWjdW^5=GP| zV0Irx5yvN2L{ap&0^3rHfZgwtygmVtcF%~OFG;&+rRMJZ85(@w*H-U{ZvPN~$+J*&*$?W3on;TQgs8I0?=zca9^Sils*C1b@ga8A_xM;<1v%TB$JR* zYJhgTO{dcVDAk0ZVhxz^AP6wQQcCT49-ilsrYTCP(&13C23D`Yv|fP4VgXiZuk hE3;k?4Gj%d_yP*a&sI!4`2GL@002ovPDHLkV1jP;)c61Z literal 0 HcmV?d00001 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 b4ede9f9761796db7eea7d81eed0a63278bbb4aa..958656f3f506f64a6b826a12376fdf14af386333 100644 GIT binary patch literal 2978 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 YA0ka3Tp``k6aWAK07*qoM6N<$f}5b7VgLXD literal 2695 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 F{sl@2VG;lU 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 0000000000000000000000000000000000000000..c31a743f473e0440a89cf06984930634deb7f86b GIT binary patch literal 512 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6{!)PX}-P; zT0k}j0}G=R11m@g5Zf_I!`W_(8Vt-}aV7?a_DlvAs2V>Y&A?g#R1Xw^(G1KB7@?|x z<}6@>t5#URj9`OwespsD1Ee?$JR*x37)-B#Fk@WmQx2e@Os0!}2#^L^2nGT`QUi!V zGzhP|C{$Vkq^mq#977^FlM*CY7b_Y_F#(AXr-YxMp8oGVX!4o=#3yzCc@K{MZ)8}~ zr`E?HS@Z9XWs}4ck69Lr_HJg++1Vd|p}q#lpAfaGo$17d|Hpd|v^Cds@E(@&6lQOz z*;2a7Hjr<@uJ?{?O--_5dv4V53pKYgc<65I1KQ2-|G$TDy$O&}401(sf`ZVGAFO}v z>)+k^|Lxqo|EH(xAMbK3QZQB6>LTU6XHy`%LOX-Tio(QQE{+}#AN{{!5POM1LnWvA z)P|%8jmC^e!QvCO65E=aW(X{s$(-=<-~SyK|E~>x`+xCegUVSJ4JR6;Le0Ql{NlvG XaH#5as#k1qA;=+~u6{1-oD!MTS!JjGP%6eoU3t+AcPmqq+SM&?W{? LS3j3^P6