merge origin/master

Content.Shared/Contraband/ContrabandSystem.cs

@@ -68,17 +68,15 @@ public sealed partial class ContrabandSystem : EntitySystem
         // one, the actual informative 'this is restricted'
         // then, the 'you can/shouldn't carry this around' based on the ID the user is wearing
         var severity = ProtoMan.Index(component.Severity);
-        String departmentExamineMessage;
+        // Corvax start: show the article before the allowed departments and jobs.
+        var departmentExamineMessage = Loc.GetString(severity.ExamineText,
+            ("type", ContrabandItemType.Item), ("color", severity.Color.ToHex()));
         if (severity.ShowDepartmentsAndJobs)
         {
-            // department restricted text
-            departmentExamineMessage =
+            departmentExamineMessage += "\n" +
                 GenerateDepartmentExamineMessage(component.AllowedDepartments, component.AllowedJobs, severity.Color);
         }
-        else
-        {
-            departmentExamineMessage = Loc.GetString(severity.ExamineText, ("type", ContrabandItemType.Item), ("color", severity.Color.ToHex()));
-        }
+        // Corvax end
 
         // if it is fully restricted, you're department-less, or your department isn't in the allowed list, you cannot carry it. Otherwise, you can.
         var carryingMessage = Loc.GetString("contraband-examine-text-in-the-clear");

Resources/ConfigPresets/Corvax/mrp.toml

@@ -2,7 +2,7 @@
 fallbackpreset = "extended"
 lobbyenabled = true
 role_timers = true
-contraband_examine = false
+# contraband_examine = false
 
 [ic]
 flavor_text = true

Resources/Locale/en-US/contraband/corvax-contraband-severity.ftl

@@ -0,0 +1,23 @@
+# Legality categories; identification and contextual exceptions remain roleplay rules.
+
+contraband-examine-text-Corvax131 = [color={ $color }]Article 131: Propaganda of prohibited organizations.[/color]
+
+contraband-examine-text-Corvax431 = [color={ $color }]Article 431: Misuse of equipment.[/color]
+
+contraband-examine-text-Corvax432 = [color={ $color }]Article 432: Unlawful possession of dangerous items.[/color]
+
+contraband-examine-text-Corvax433 = [color={ $color }]Article 433: Violation of regulated item possession rules.[/color]
+
+contraband-examine-text-Corvax434 = [color={ $color }]Article 434: Unlawful possession of restricted-circulation items.[/color]
+
+contraband-examine-text-Corvax435 = [color={ $color }]Article 435: Unlawful possession of contraband items.[/color]
+
+contraband-examine-text-Corvax436 = [color={ $color }]Article 436: Unlawful possession of terrorist equipment.[/color]
+
+contraband-examine-text-Corvax442 = [color={ $color }]Article 442: Basic chemical elements, household substances with pronounced adverse effects at safe doses, and mild narcotics.[/color]
+
+contraband-examine-text-Corvax443 = [color={ $color }]Article 443: Complex medicines.[/color]
+
+contraband-examine-text-Corvax444 = [color={ $color }]Article 444: Toxic substances, potent narcotics and explosive substances.[/color]
+
+contraband-examine-text-Corvax445 = [color={ $color }]Article 445: Critically dangerous toxins, chemicals, narcotics, stimulants, anomalous and magical liquids, and species mutagens.[/color]

Resources/Locale/ru-RU/contraband/contraband-severity.ftl

@@ -46,8 +46,8 @@ contraband-examine-text-Magical =
         [reagent] [color={ $color }]Этот реагент является крайне незаконной магической контрабандой![/color]
     }
 
-contraband-examine-text-avoid-carrying-around = [color=red][italic]Вам, вероятно, не стоит носить его с собой без веской причины.[/italic][/color]
-contraband-examine-text-in-the-clear = [color=green][italic]Вы должны быть чисты, чтобы носить этот предмет на виду.[/italic][/color]
+contraband-examine-text-avoid-carrying-around = [color=orange][italic]Вам, вероятно, не стоит носить его с собой без причины.(см. КЗ контрабанды)[/italic][/color]
+contraband-examine-text-in-the-clear = [color=green][italic]Вам ничто не мешает носить это на виду.[/italic][/color]
 
 contraband-examinable-verb-text = Легальность
 contraband-examinable-verb-message = Проверить легальность этого предмета.

Resources/Locale/ru-RU/contraband/corvax-contraband-severity.ftl

@@ -0,0 +1,23 @@
+# Legality categories; identification and contextual exceptions remain roleplay rules.
+
+contraband-examine-text-Corvax131 = [color={ $color }]Статья 131: Пропаганда запрещённых организаций.[/color]
+
+contraband-examine-text-Corvax431 = [color={ $color }]Статья 431: Злоупотребление экипировкой.[/color]
+
+contraband-examine-text-Corvax432 = [color={ $color }]Статья 432: Незаконное владение опасными предметами.[/color]
+
+contraband-examine-text-Corvax433 = [color={ $color }]Статья 433: Нарушение порядка владения регулируемыми предметами.[/color]
+
+contraband-examine-text-Corvax434 = [color={ $color }]Статья 434: Незаконное владение предметами ограниченного оборота.[/color]
+
+contraband-examine-text-Corvax435 = [color={ $color }]Статья 435: Незаконное владение контрабандными предметами.[/color]
+
+contraband-examine-text-Corvax436 = [color={ $color }]Статья 436: Незаконное владение террористическими средствами.[/color]
+
+contraband-examine-text-Corvax442 = [color={ $color }]Статья 442: Базовые химические элементы, хозяйственные вещества, у которых имеется выраженный отрицательный эффект в безопасных дозах и слабые наркотические вещества.[/color]
+
+contraband-examine-text-Corvax443 = [color={ $color }]Статья 443: Сложные лекарственные препараты.[/color]
+
+contraband-examine-text-Corvax444 = [color={ $color }]Статья 444: Токсичные вещества, сильнодействующие наркотики и взрывоопасные вещества.[/color]
+
+contraband-examine-text-Corvax445 = [color={ $color }]Статья 445: Критически опасные токсины, химикаты, наркотические вещества, стимуляторы, аномальные и магические жидкости, расовые мутагены.[/color]

Resources/Locale/ru-RU/corvax/guidebook/SOP/security.ftl

@@ -1,6 +1,6 @@
 # Общие СРП
 guidebook-SOP-security-general-must =
-    1. Соблюдать все установленные процедуры отдела службы безопасности в рамках своей должности.
+    1. Соблюдать все установленные процедуры отдела Службы безопасности в рамках своей должности.
     1. Применять меры подавления в отношении нарушителей в соответствии с уровнем угрозы, который они представляют.
     1. Поддерживать датчики костюма в режиме «Координаты».
     1. Соблюдать субординацию и использовать [tooltip="guidebook-SOP-security-tooltip-regulation-speech" text="уставную речь"] при общении с сотрудниками СБ, членами командования, сотрудниками юридического департамента, представителями Центрального Командования и ДСО.
@@ -24,15 +24,21 @@ guidebook-SOP-security-general-right =
       - В [color=dodgerblue][bold]синий код[/bold][/color] с устного разрешения капитана получить [tooltip="guidebook-SOP-security-tooltip-extended-access" text="расширенный доступ"].
       - В [color=red][bold]красный код[/bold][/color] по своему запросу получить [tooltip="guidebook-SOP-security-tooltip-extended-access" text="расширенный доступ"].
       - В [color=gold][bold]гамма код[/bold][/color] получить [tooltip="guidebook-SOP-security-tooltip-full-access" text="полный доступ"].
-    1. В рамках проведения процедур службы безопасности подавать запросы главам станции для получения требуемой информации.
+    1. В рамках проведения процедур Службы безопасности подавать запросы главам станции для получения требуемой информации.
     1. Составить рапорт о задержании, в котором подробно описываются обстоятельства задержания, основания, ход и результаты обыска, свидетели, а также иные сведения, имеющие значение для разбирательства.
+    1. Оцепить место преступления с помощью щитов, голобарьеров,  маркеров улик и прочих инструментов Службы безопасности (исключая барьеры и стационарные вспышки) в целях проведения расследования.
+      - Для создания оцепления необходимо одобрение ГСБ или капитана. Обязательно уведомление экипажа о создании оцепления в общий канал связи.
+      - Район не может быть оцеплен более, чем на 5 минут и не может оцепляться повторно в рамках того же дела.
+      - Пересечение оцепленной территории членами экипажа расценивается как помеха при проведении следственных мероприятий.
+
 
 guidebook-SOP-security-general-prohibited =
-    1. Проводить процедуры СБ в отношении равных либо старших по иерархии сотрудников СБ, лиц с [tooltip="guidebook-SOP-security-tooltip-legal-immunity" text="юридической неприкосновенностью"] без приказа уполномоченного лица.
+    1. Проводить процедуры СБ и применять силу в отношении равных либо старших по иерархии сотрудников СБ, лиц с [tooltip="guidebook-SOP-security-tooltip-legal-immunity" text="юридической неприкосновенностью"] без приказа уполномоченного лица.
       - Приказ в отношении сотрудника СБ может быть издан вышестоящим сотрудником СБ.
       - Приказ в отношении главы СБ может быть издан капитаном.
       - Лица с [tooltip="guidebook-SOP-security-tooltip-legal-immunity" text="юридической неприкосновенностью"] могут быть подвергнуты процедурам СБ только после снятия неприкосновенности.
       - Все вышеперечисленные лица могут быть задержаны до издания приказа в случае, если они представляют [tooltip="guidebook-SOP-security-tooltip-significant-threat" text="значительную угрозу безопасности"].
+      - Исключением является проведение тренировочного мероприятия в специально отведенном месте в бриге, либо в пределах ринга.
     1. Находиться в состоянии опьянения или нести службу при наличии серьёзных травм.
     1. При пилотировании шаттлов допускать столкновения со станцией и иными объектами, кроме случаев, когда столкновение необходимо для исполнения служебных обязанностей.
     1. Переодевать свою [tooltip="guidebook-SOP-security-tooltip-uniform" text="униформу"]. Также запрещено надевать элементы униформы и брони других должностей внутри отдела.
@@ -40,19 +46,19 @@ guidebook-SOP-security-general-prohibited =
 # Должностные СРП
 ## Глава службы безопасности
 guidebook-SOP-HeadOfSecurity-must =
-    1. Координировать работу отдела службы безопасности, обеспечивать поддержание порядка на станции и в ближайшем космическом пространстве.
-    1. Контролировать исполнение процедур службы безопасности сотрудниками отдела, в случае необходимости исполнять процедуры лично либо передать их исполнение уполномоченным лицам.
+    1. Координировать работу отдела Службы безопасности, обеспечивать поддержание порядка на станции и в ближайшем космическом пространстве.
+    1. Контролировать исполнение процедур Службы безопасности сотрудниками отдела, в случае необходимости исполнять процедуры лично либо передать их исполнение уполномоченным лицам.
     1. Обеспечивать сохранность диска ядерной авторизации.
     1. Организовать патрульные группы для поддержания порядка на станции.
     1. В случае отсутствия в отделе смотрителя назначить на пост ВрИО помощника смотрителя, а при его отсутствии — выбрать сотрудника из числа офицеров или самому исполнять его обязанности.
     1. Назначить кадетов в помощники офицеру, смотрителю, детективу или пилоту; при отсутствии таковых назначить кадетов в помощники себе.
 
 guidebook-SOP-HeadOfSecurity-right =
-    1. Проводить и контролировать проведение любых процедур отдела службы безопасности.
+    1. Проводить и контролировать проведение любых процедур отдела Службы безопасности.
     1. При приёме в отдел нового сотрудника из числа членов экипажа обязать кандидата пройти процедуру установки импланта «Щит разума».
     1. При выдаче сотруднику станции доступов уровней «бриг», «служба безопасности» или «оружейная» потребовать от него пройти процедуру установки импланта «Щит разума».
     1. В любой код держать при себе личный энергетический пистолет/револьвер и/или энергетический меч «Правосудие» (при наличии).
-    1. Провести процедуру личного досмотра в отношении любого нижестоящего сотрудника службы безопасности при подозрении в хранении контрабандных предметов или недопустимого для текущего уровня угрозы вооружения.
+    1. Провести процедуру личного досмотра в отношении любого нижестоящего сотрудника Службы безопасности при подозрении в хранении контрабандных предметов или недопустимого для текущего уровня угрозы вооружения.
     1. При отсутствии пилота/помощника смотрителя одобрить перевод сотрудника из числа офицеров на данную должность.
     1. Временно отстранить от службы любого сотрудника СБ при подтверждении состояния опьянения или при наличии серьёзных травм, а также в случае нарушения корпоративного закона или СРП сотрудником.
       - Отстранение может отменить капитан.
@@ -74,7 +80,7 @@ guidebook-SOP-HeadOfSecurity-prohibited =
 ## Смотритель
 guidebook-SOP-Warden-must =
     1. На постоянной основе нести службу в бриге.
-    1. Выдавать оружие сотрудникам службы безопасности в соответствии с положением о вооружении отдела.
+    1. Выдавать оружие сотрудникам Службы безопасности в соответствии с положением о вооружении отдела.
     1. Следить за достаточным количеством вооружения в арсенале, вести учёт выданного и полученного снаряжения, следить за своевременной сдачей оружия при понижении кода.
     1. При наличии задержанных лиц проводить процедуры допроса, вынесения вердикта и реализации наказания.
       - При наличии нескольких задержанных или при необходимости срочной выдачи оружия поручить исполнение нижестоящему сотруднику СБ.
@@ -84,12 +90,12 @@ guidebook-SOP-Warden-must =
     1. Обеспечивать поддержание чистоты и порядка в бриге.
 
 guidebook-SOP-Warden-right =
-    1. Проводить любые процедуры службы безопасности в рамках, установленных процедурами.
+    1. Проводить любые процедуры Службы безопасности в рамках, установленных процедурами.
     1. Отдавать [tooltip="guidebook-SOP-security-tooltip-lawful-orders" text="правомерные приказы"] помощнику и сотрудникам на территории брига, если они не противоречат указаниям ГСБ или капитана.
     1. При отсутствии связи с главой службы безопасности в течение 5 минут временно заменить его до выяснения обстоятельств.
-    1. В любой код держать при себе личный энергетический дробовик.
-      - В [color=dodgerblue][bold]синий код[/bold][/color] передать энергетический дробовик одному из сотрудников СБ на основании письменного разрешения.
-      - В [color=red][bold]красный код[/bold][/color] и выше передать энергетический дробовик одному из сотрудников СБ на основании устного разрешения.
+    1. В любой код держать при себе личный энергетический дробовик и перчатки крав-мага.
+      - В [color=dodgerblue][bold]синий код[/bold][/color] возможна передача этих предметов одному из сотрудников СБ на основании письменного разрешения.
+        - В [color=red][bold]красный код[/bold][/color] и выше передача возможна с устного разрешения.
     1. Проводить личный досмотр нижестоящих сотрудников при подозрении в хранении контрабанды или недопустимого вооружения.
     1. Временно отстранить от службы любого сотрудника СБ, кроме ГСБ, при подтверждении состояния опьянения или при наличии серьёзных травм, а также в случае нарушения корпоративного закона или СРП сотрудником.
       - Отстранение могут отменить ГСБ и капитан;
@@ -109,7 +115,7 @@ guidebook-SOP-WardenHelper-must =
     1. Поддерживать чистоту и порядок в бриге.
 
 guidebook-SOP-WardenHelper-right =
-    1. Проводить процедуры службы безопасности в рамках установленных процедур.
+    1. Проводить процедуры Службы безопасности в рамках установленных процедур.
     1. При проверке карцера, пермабрига или каторги иметь при себе летальное оружие и средства подавления вне зависимости от уровня угрозы.
       - По окончании проверки вооружение, запрещенное для текущего уровня угрозы, должно быть возвращено в арсенал.
     1. В [color=dodgerblue][bold]синий код[/bold][/color] и выше размещать переносные вспышки и развертываемые барьеры в бриге; при снижении уровня угрозы возвращать их в место хранения.
@@ -124,7 +130,7 @@ guidebook-SOP-Security-must =
     1. Поддерживать порядок на станции и среди персонала, предотвращая нарушения закона.
 
 guidebook-SOP-Security-right =
-    1. Проводить любые процедуры службы безопасности в рамках, установленных самими процедурами.
+    1. Проводить любые процедуры Службы безопасности в рамках, установленных самими процедурами.
     1. Изменять статус представителей персонала станции в консоли криминалистических записей с разрешения уполномоченных лиц или при личном свидетельстве нарушения корпоративного закона.
     1. С разрешения смотрителя и главы службы безопасности перейти на должность помощника смотрителя в качестве специализации.
     1. С разрешения главы службы безопасности пройти обучение навыку пилотирования и перейти на должность пилота в качестве специализации.
@@ -132,16 +138,14 @@ guidebook-SOP-Security-right =
 ## Детектив
 guidebook-SOP-Detective-must =
     1. Проводить следственные мероприятия с целью установления деталей преступления и привлечения виновных лиц к ответственности.
-    1. Оказывать содействие офицерам службы безопасности в поддержании порядка на станции.
+    1. Оказывать содействие офицерам СБ в поддержании порядка на станции.
 
 guidebook-SOP-Detective-right =
-    1. Проводить любые процедуры службы безопасности в рамках, установленных процедурами.
+    1. Проводить любые процедуры Службы безопасности в рамках, установленных процедурами.
       - Исключение — процедура задержания. Детектив может проводить задержание в следующих случаях:
         - В условиях [color=red][bold]красного кода[/bold][/color].
         - Если детектив является свидетелем [tooltip="guidebook-SOP-security-tooltip-public-dangerous-crime" text="общественно опасного преступления"].
         - В отношении лиц в розыске.
-    1. Оцепить место преступления с помощью голобарьеров и маркеров улик.
-      - Детектив обязан оповестить главу службы безопасности и ответственного за отсек об оцеплении, убрать оцепление по их первому требованию.
     1. Изъять у члена экипажа имущество, если есть основания полагать, что они являются орудием преступления.
       - Запрещено изъятие особо ценного имущества без разрешения капитана.
       - Запрещено изъятие имущества у лиц с [tooltip="guidebook-SOP-security-tooltip-legal-immunity" text="юридической неприкосновенностью"].
@@ -149,13 +153,13 @@ guidebook-SOP-Detective-right =
 
 ## Пилот службы безопасности
 guidebook-SOP-SecurityPilot-must =
-    1. Проверять космическое пространство, ИИ и каторжный лагерь с челнока службы безопасности или вне его.
+    1. Проверять космическое пространство, ИИ и каторжный лагерь с челнока Службы безопасности или вне его.
     1. Поддерживать станцию в неподвижном состоянии. При её движении — стабилизировать её.
     1. Конвоировать приговорённых к каторжным работам на каторгу.
     1. Следить за техническим состоянием челнока СБ и сообщать инженерам о поломках.
 
 guidebook-SOP-SecurityPilot-right =
-    1. Проводить процедуры службы безопасности в рамках установленных процедур.
+    1. Проводить процедуры Службы безопасности в рамках установленных процедур.
     1. Носить и использовать лучевое вооружение за пределами станции вне зависимости от уровня угрозы.
     1. Носить и использовать летальное вооружение и средства подавления при проверке каторжного лагеря, если там есть заключённые.
 
@@ -167,6 +171,8 @@ guidebook-SOP-SecurityPilot-prohibited =
 
 ## Бригмедик
 guidebook-SOP-Brigmedic-must =
+    1. На постоянной основе находиться в пределах брига или лазарета Службы безопасности.
+      - Допускается покинуть бриг на короткий срок с разрешения смотрителя или ГСБ 
     1. Оказывать медицинскую помощь сотрудникам СБ, заключённым и лицам под следствием.
       - Оказывать помощь любым членам экипажа в критическом состоянии.
     1. Проводить принудительное хирургическое вмешательство на законных основаниях.
@@ -175,7 +181,11 @@ guidebook-SOP-Brigmedic-must =
     1. Обеспечивать заключённым питание, питьё и поддерживать чистоту в бриге.
 
 guidebook-SOP-Brigmedic-right =
-    1. Проводить процедуру задержания если бригмедик свидетель [tooltip="guidebook-SOP-security-tooltip-public-dangerous-crime" text="общественно опасного преступления"].
+    1. Проводить любые процедуры Службы безопасности в рамках, установленных процедурами, за исключением процедуры задержания.
+      - Проведение процедуры задержания возможно в следующих случаях:
+        - В условиях [color=red][bold]красного кода[/bold][/color].
+        - Если бригмедик является свидетелем [tooltip="guidebook-SOP-security-tooltip-public-dangerous-crime" text="общественно опасного преступления"].
+        - В отношении лиц в розыске или доставленных для лечения заключенных и подозреваемых.
     1. Отказать в помощи при самоповреждении.
     1. Временно отстранить сотрудника СБ, кроме смотрителя и ГСБ, при подтверждённом опьянении или тяжёлой травме.
       - Отстранение могут отменить ГСБ и капитан;
@@ -196,33 +206,33 @@ guidebook-SOP-SecurityCadet-must =
     1. Исполнять правомерные приказы назначенного сотрудника СБ и находиться рядом при выполнении задач.
 
 guidebook-SOP-SecurityCadet-prohibited =
-    1. Самостоятельно проводить процедуры службы безопасности.
+    1. Самостоятельно проводить процедуры Службы безопасности.
 
 # Процедуры и протоколы
 ## Общее положение о вооружении отдела СБ
 guidebook-SOP-security-procedure-weapons-regulation =
     1. Глава службы безопасности и смотритель заведуют арсеналом: выдавать и принимать вооружение в соответствии с уровнем угроз.
-      - По усмотрению главы службы безопасности или смотрителя может быть заказано дополнительное оружие в отделе снабжения и доставлено в арсенал.
-      - По усмотрению главы службы безопасности или смотрителя может быть заказано дополнительное оружие в научном отделе и доставлено в арсенал.
+      - По усмотрению главы службы безопасности или смотрителя может быть заказано дополнительное оружие в отделе Снабжения или в Научном отделе и доставлено в арсенал.
       - По усмотрению главы службы безопасности или смотрителя может быть создано новое вооружение и гранаты на ОхранФабе.
     1. Сотрудник службы безопасности обязан соблюдать следующие правила обращения с оружием:
       - В [color=green][bold]зелёный код[/bold][/color] допустимо держать оружие в руках лишь при необходимости его применения.
-      - В [color=dodgerblue][bold]синий код[/bold][/color] допустимо держать оружие в руках при необходимости его применения или при исполнении процедур службы безопасности.
+      - В [color=dodgerblue][bold]синий код[/bold][/color] допустимо держать оружие в руках при необходимости его применения или при исполнении процедур Службы безопасности.
       - В [color=red][bold]красный код[/bold][/color] и выше допускается свободное ношение оружия на постоянной основе.
-    1. В штатном режиме сотрудники службы безопасности могут владеть оружием только в соответствии с таблицей стандартного вооружения или особыми разрешениями в личных СРП.
-      - Сотрудник службы безопасности имеет право получить бронированный скафандр вне зависимости от текущего уровня угрозы в случае необходимости работы в условиях экстремального давления.
+    1. В штатном режиме сотрудники Службы безопасности могут владеть оружием только в соответствии с таблицей стандартного вооружения или особыми разрешениями в личных СРП.
+      - Сотрудник Службы безопасности имеет право получить бронированный скафандр вне зависимости от текущего уровня угрозы в случае необходимости работы в условиях экстремального давления.
       - Пилот во время работы в космическом пространстве может иметь при себе лучевое вооружение при любом уровне угрозы.
       - Пилот во время проверки каторжного лагеря при наличии в нём заключённых может иметь при себе любое неконтрабандное летальное вооружение при любом уровне угрозы.
       - Смотритель во время проверки пермабрига, каторжного лагеря и карцера при наличии в них заключённых может иметь при себе любое неконтрабандное летальное вооружение при любом уровне угрозы.
       - Помощник смотрителя во время проверки пермабрига, каторжного лагеря и карцера при наличии в них заключённых может иметь при себе любое неконтрабандное летальное вооружение при любом уровне угрозы.
       - Смотритель имеет  право держать при себе личный энергетический дробовик.
       - Глава службы безопасности имеет право держать при себе личный энергетический пистолет/револьвер и/или личный энергетический меч.
+      - Корабельные орудия доступны для установки только на шаттлах Службы безопасности. Исключением является дематерилизатор материи как рабочее оборудование утилизаторов.
     1. Главе службы безопасности разрешается выдать разрешение на ношение оружия гражданским лицам, если на то есть причины.
       - Разрешение на оружие без печати главы службы безопасности является недействительным, ношение оружия гражданскими лицами без разрешения является незаконным.
       - Глава службы безопасности может в любой момент времени отозвать разрешение на ношение оружия у любого члена экипажа с изъятием оружия.
-      - Сотрудникам службы безопасности запрещено получать разрешение на ношение оружия.
-    1. После понижения кода, сотрудники службы безопасности обязаны сдать неразрешённое в текущий код оружие в арсенал в течение 5 минут.
-      - Смотрителю и главе службы безопасности разрешено проводить личный досмотр нижестоящих сотрудников службы безопасности с целью выявления несданного оружия.
+      - Сотрудникам Службы безопасности запрещено получать разрешение на ношение оружия.
+    1. После понижения кода, сотрудники Службы безопасности обязаны сдать неразрешённое в текущий код оружие в арсенал в течение 5 минут.
+      - Смотрителю и главе службы безопасности разрешено проводить личный досмотр нижестоящих сотрудников Службы безопасности с целью выявления несданного оружия.
 
 ### Таблица вооружения
 guidebook-SOP-security-weapons-table-green = [tooltip="guidebook-SOP-security-weapons-tooltip-pistols" text="Пистолеты"], станнер, шоковая дубинка, DT-8 «Терминус», [tooltip="guidebook-SOP-security-weapons-tooltip-melee-list" text="личное холодное оружие"], вспышка, [tooltip="guidebook-SOP-security-weapons-tooltip-special-grenades" text="специальные гранаты"], [tooltip="guidebook-SOP-security-weapons-tooltip-restraints" text="средства ограничения мобильности"], [tooltip="guidebook-SOP-security-weapons-tooltip-standard-armor" text="стандартная броня"], пояс корпоративного дзюдо.
@@ -259,11 +269,11 @@ guidebook-SOP-security-procedure-search =
 guidebook-SOP-security-procedure-search-personal =
     {"[italic]Личный досмотр — процедура проверки имущества, которое находится в непосредственном распоряжении у обыскиваемого лица.[/italic]"}
     1. В ходе данной процедуры досматривающий имеет право осмотреть любое имущество, которое в данный момент имеется в распоряжении досматриваемого.
-    1. Сотрудник службы безопасности имеет право выбрать, каким способом будет проводиться процедура досмотра:
+    1. Сотрудник Службы безопасности имеет право выбрать, каким способом будет проводиться процедура досмотра:
       - Досматриваемый самостоятельно предъявляет необходимое имущество.
-      - Сотрудник службы безопасности принудительно изымает требуемые для досмотра предметы.
+      - Сотрудник Службы безопасности принудительно изымает требуемые для досмотра предметы.
       - В случае оказания сопротивления обыску, допустимо ограничить свободу перемещения обыскиваемого.
-    1. В рамках процедуры досмотра сотрудник службы безопасности уполномочен снять отпечатки пальцев и изучить образцы ДНК с любой вещи обыскиваемого.
+    1. В рамках процедуры досмотра сотрудник Службы безопасности уполномочен снять отпечатки пальцев и изучить образцы ДНК с любой вещи обыскиваемого.
     1. В рамках процедуры досмотра допускается взятие образца ДНК и отпечатков пальцев у досматриваемого лица.
     1. При выявлении у досматриваемого лица незаконного имущества, оно должно быть незамедлительно изъято, а лицо задержано.
     1. При наличии подозрений касательно законности какого-либо предмета, он может быть временно изъят для подтверждения его законности.
@@ -282,10 +292,10 @@ guidebook-SOP-security-procedure-search-personal =
 ### Обыск отдела
 guidebook-SOP-security-procedure-search-department =
     {"[italic]Обыск отдела — процедура обыска территории целого отдела, включающая в себя доскональное исследование всего отдела.[/italic]"}
-    1. При проведении обыска отдела сотрудники службы безопасности могут запросить набор доступов к обыскиваемому отделу.
+    1. При проведении обыска отдела сотрудники Службы безопасности могут запросить набор доступов к обыскиваемому отделу.
     1. На время проведения обыска все выходы из отдела могут быть заблокированы.
-    1. При проведении обыска все сотрудники отдела обязаны исполнять правомерные приказы сотрудников службы безопасности и содействовать в проведении процедуры.
-    1. В рамках процедуры обыска, сотрудники службы безопасности уполномочены снять отпечатки пальцев и изучить образцы ДНК на любом обыскиваемом предмете.
+    1. При проведении обыска все сотрудники отдела обязаны исполнять правомерные приказы сотрудников Службы безопасности и содействовать в проведении процедуры.
+    1. В рамках процедуры обыска, сотрудники Службы безопасности уполномочены снять отпечатки пальцев и изучить образцы ДНК на любом обыскиваемом предмете.
     1. При выявлении незаконного имущества, оно должно быть незамедлительно изъято.
     1. При наличии подозрений касательно законности какого-либо предмета, он может быть временно изъят для подтверждения его законности.
 
@@ -296,8 +306,8 @@ guidebook-SOP-security-procedure-search-department =
 ### Опознание
 guidebook-SOP-security-procedure-search-identification =
     {"[italic]Опознание — процедура, направленная на подтверждение личности определённого лица.[/italic]"}
-    1. При проведении опознания сотрудник службы безопасности уполномочен получить у опознаваемого лица образец ДНК и отпечатки пальцев.
-    1. В рамках процедуры опознания сотрудник службы безопасности имеет право снять любые предметы одежды, скрывающие лицо и прочие отличительные признаки опознаваемого.
+    1. При проведении опознания сотрудник Службы безопасности уполномочен получить у опознаваемого лица образец ДНК и отпечатки пальцев.
+    1. В рамках процедуры опознания сотрудник Службы безопасности имеет право снять любые предметы одежды, скрывающие лицо и прочие отличительные признаки опознаваемого.
     1. В случае несоответствия каких-либо данных опознаваемое лицо должно быть задержано и подвергнуто протоколу работы с незарегистрированными лицами.
 
     {"[head=3]Основания для проведения процедуры опознания[/head]"}
@@ -314,7 +324,7 @@ guidebook-SOP-security-procedure-search-surgical =
     1. Достаточно устного приказа, если на станции действует [color=gold][bold]гамма код[/bold][/color].
     1. Для проведения хирургических процедур в отношении лиц, осуждённых по статьям ХХ5 и ХХ6, разрешение не требуется.
     1. Внедрение импланта "Трекер" лицам, освобожденным по УДО, является добровольной процедурой и не требует приказа.
-    1. Внедрение импланта "Щит разума" лицам, заступающим на пост ВрИО главы, поступающим на службу в СБ или получающим доступы службы безопасности, является добровольной процедурой и не требует приказа.
+    1. Внедрение импланта "Щит разума" лицам, заступающим на пост ВрИО главы, поступающим на службу в СБ или получающим доступы Службы безопасности, является добровольной процедурой и не требует приказа.
     1. Проведение данной процедуры возможно непосредственно в месте заключения, лазарете брига или в операционной медицинского отдела.
     1. Лицо, подвергаемое процедуре, должно быть ограничено в свободе перемещения, а при необходимости, возможно введение анестезии.
     1. При извлечении голопаразитов допускается временное умертвление владельца с последующей реанимацией.
@@ -352,8 +362,8 @@ guidebook-SOP-security-procedure-investigation-rozysk =
     {"[head=3]Основания для объявления лица в розыск[/head]"}
     1. Сообщение о правонарушении со стороны свидетелей. Правонарушение может быть обнаружено непосредственно, либо при помощи средств связи.
     1. Для объявления лица в розыск требуются показания как минимум двух свидетелей.
-    1. Достаточно показаний одного свидетеля, если он является членом командования, сотрудником службы безопасности, сотрудником юридического департамента, центрального командования или департамента специальных операций.
-    1. В распоряжении службы безопасности имеются [tooltip="guidebook-SOP-security-procedure-tooltip-direct-evidence" text="прямые доказательства"] причастности подозреваемого к преступлению.
+    1. Достаточно показаний одного свидетеля, если он является членом командования, сотрудником Службы безопасности, сотрудником юридического департамента, центрального командования или департамента специальных операций.
+    1. В распоряжении Службы безопасности имеются [tooltip="guidebook-SOP-security-procedure-tooltip-direct-evidence" text="прямые доказательства"] причастности подозреваемого к преступлению.
     1. Лицо отказалось прибыть в бриг на законный вызов от сотрудника СБ.
     1. Имеется обвинительное заключение, заверенное печатью главы службы безопасности.
 
@@ -361,20 +371,20 @@ guidebook-SOP-security-procedure-investigation-rozysk =
 guidebook-SOP-security-procedure-investigation-arrest =
     {"[italic]Задержание — кратковременное ограничение свободы перемещения какого-либо лица с последующим сопровождением в бриг для установления причастности лица к совершению преступления.[/italic]"}
     1. Перед началом задержания оценить ситуацию и принять меры для задержания, которые будут наиболее эффективны в данной ситуации и соответствовать дозволенному уровню применения силы.
-    1. В случае отсутствия прямой угрозы со стороны подозреваемого, сотрудник службы безопасности обязан сообщить подозреваемому о факте его задержания, а также о составе инкриминируемого преступления.
-    1. В случае добровольного согласия задержанного следовать в бриг, сотрудник службы безопасности имеет право не применять средства ограничения мобильности.
+    1. В случае отсутствия прямой угрозы со стороны подозреваемого, сотрудник Службы безопасности обязан сообщить подозреваемому о факте его задержания, а также о составе инкриминируемого преступления.
+    1. В случае добровольного согласия задержанного следовать в бриг, сотрудник Службы безопасности имеет право не применять средства ограничения мобильности.
     1. Отказ добровольно следовать в бриг является поводом для перехода на более высокий уровень воздействия.
-    1. Ситуации, в которых сотрудник службы безопасности имеет право сообщить о задержании после нейтрализации правонарушителя:
+    1. Ситуации, в которых сотрудник Службы безопасности имеет право сообщить о задержании после нейтрализации правонарушителя:
       - Правонарушитель находится в нетрезвом состоянии.
       - Правонарушитель захватил заложника.
       - Правонарушитель вооружен холодным или стрелковым оружием, либо имеет при себе взрывчатые вещества.
-      - Правонарушитель совершает общественно опасное деяние на глазах сотрудника службы безопасности.
+      - Правонарушитель совершает общественно опасное деяние на глазах сотрудника Службы безопасности.
     1. После доставки в бриг в отношении задержанного должна быть инициирована процедура допроса.
     1. Допускается вынесение вердикта на месте правонарушения, согласно пункту 5 процедуры вынесения вердикта.
 
     {"[head=3]Основания для задержания лица[/head]"}
     1. Лицо находится в розыске.
-    1. Лицо совершает правонарушение непосредственно на глазах сотрудника службы безопасности.
+    1. Лицо совершает правонарушение непосредственно на глазах сотрудника Службы безопасности.
     1. Лицо нарушает процедуры экипажа, предусмотренные для текущего уровня угрозы.
     1. Лицо не является членом экипажа, либо принадлежность к экипажу невозможно установить.
 
@@ -384,17 +394,17 @@ guidebook-SOP-security-procedure-investigation-interrogation =
     1. Процедура допроса может быть пропущена при следующих условиях:
       - В случае получения письменного признания вины, заверенного подписью задержанного.
       - На станции действует [color=gold][bold]гамма код[/bold][/color], либо введен режим ЧС, требующий [tooltip="guidebook-SOP-security-procedure-tooltip-emergencies" text="непосредственного участия сотрудников службы безопасности"].
-    1. С момента доставки в бриг у сотрудников службы безопасности имеется 10 минут для вынесения вердикта, всё время, проведённое в бриге сверх данного времени, должно быть вычтено из срока заключения, если подозреваемый был признан виновным в правонарушении.
+    1. С момента доставки в бриг у сотрудников Службы безопасности имеется 10 минут для вынесения вердикта, всё время, проведённое в бриге сверх данного времени, должно быть вычтено из срока заключения, если подозреваемый был признан виновным в правонарушении.
       - Сокращение срока не предусмотрено, если итоговый срок заключения, к которому может быть приговорён подозреваемый составляет более 75 минут.
       - Суммарное время допроса не может превышать срок, равный 10 минутам в сумме с потенциальным сроком заключения, к которому подозреваемый может быть приговорён при подтверждении его виновности.
       - Если в результате сокращения срока заключения фактический срок заключения равен 0, подозреваемый должен быть признан как отбывший срок заключения в полном объеме.
       - В случае направления задержанного в корпоративный суд, допрос ограничивается сроком до 5 минут, после чего задержанный должен быть незамедлительно направлен в суд. Магистрат может отменить это требование в случае занятости судебными делами.
     1. В процедуре допроса принимают участие задержанный, допрашивающий, а также адвокат, свидетели и эксперты, если таковые имеются.
-      - В роли допрашивающего может выступать смотритель, помощник смотрителя, глава службы безопасности, капитан, либо иной сотрудник службы безопасности — с разрешения ранее упомянутых лиц.
+      - В роли допрашивающего может выступать смотритель, помощник смотрителя, глава службы безопасности, капитан, либо иной сотрудник Службы безопасности — с разрешения ранее упомянутых лиц.
       - При нарушении порядка проведения процедуры агент внутренних дел уполномочен отстранить допрашивающего от дальнейшего проведения допроса, в таком случае проведение допроса должно быть передано вышестоящему сотруднику, вплоть до капитана. Агент внутренних дел не может отстранить допрашивающего в [color=red][bold]красном коде[/bold][/color] и выше.
       - В роли адвоката может выступать агент внутренних дел, адвокат либо глава отдела, к которому относится подозреваемый.
       - Адвокат должен быть приглашен на допрос непосредственно перед началом процедуры.
-      - При допросе главы отдела обязательным условием должно быть присутствие агента внутренних дел либо капитана.
+      - При допросе главы отдела обязательным условием должно быть присутствие агента внутренних дел, представителя NT, либо капитана.
       - В роли свидетелей выступают лица, которые могут дать показания, подтверждающие причастность либо непричастность задержанного к совершению правонарушения.
       - В роли экспертов могут выступать лица, профессиональные навыки которых способствуют установлению виновности или невиновности задержанного.
       - Личное присутствие экспертов и свидетелей может быть исключено, если данные ими показания представлены в виде документа, заверенного личной подписью эксперта/свидетеля и печатью АВД.
@@ -433,7 +443,7 @@ guidebook-SOP-security-procedure-investigation-analysis =
       - Наличие у подозреваемого судимостей.
       - Нахождение подозреваемого в состоянии алкогольного или наркотического опьянения.
     1. Если собранной доказательной базы недостаточно для вынесения обвинительного приговора, то подозреваемый не может быть признан виновным.
-    1. Если сотрудник службы безопасности не уполномочен вынести вердикт, который должен быть вынесен в отношении подозреваемого, он обязан предоставить все материалы дела лицу, уполномоченному вынести требуемый вердикт.
+    1. Если сотрудник Службы безопасности не уполномочен вынести вердикт, который должен быть вынесен в отношении подозреваемого, он обязан предоставить все материалы дела лицу, уполномоченному вынести требуемый вердикт.
 
 ### Вынесение вердикта
 guidebook-SOP-security-procedure-investigation-verdict =
@@ -446,11 +456,11 @@ guidebook-SOP-security-procedure-investigation-verdict =
     1. капитан;
     1. глава службы безопасности;
     1. смотритель, помощник смотрителя;
-    1. иные сотрудники службы безопасности, исключая кадетов.
+    1. иные сотрудники Службы безопасности, исключая кадетов.
 
     {"[head=3]Уровни наказаний[/head]"}
     {"[italic]В зависимости от тяжести совершённого правонарушения осуждённому лицу могут быть назначены различные виды наказания. В зависимости от тяжести наказания одобрить его вынесение могут лишь лица, занимающие определённые должности.[/italic]"}
-    1. Предупреждение. Вынести приговор о выдаче предупреждения может любой сотрудник службы безопасности, исключая кадетов, а также все вышестоящие лица.
+    1. Предупреждение. Вынести приговор о выдаче предупреждения может любой сотрудник Службы безопасности, исключая кадетов, а также все вышестоящие лица.
     1. Временное заключение. Вынести приговор о временном заключении могут смотритель, либо помощник смотрителя с разрешения самого смотрителя и все вышестоящие лица.
     1. Пожизненное лишение свободы. Вынести приговор о пожизненном лишении свободы могут глава службы безопасности и все вышестоящие лица.
     1. Высшая мера наказания. Вынести приговор о высшей мере наказания могут капитан и все вышестоящие лица.
@@ -537,7 +547,7 @@ guidebook-SOP-security-procedure-seizure-storage =
     1. Изъятое имущество первоначально должно быть доставлено в бриг.
     1. Изъятое имущество может быть исследовано при помощи криминалистического сканера для получения следов.
     1. В случае затруднения в определении свойств предмета, он может быть доставлен в соответствующий отдел для идентификации.
-      - В условиях [color=red][bold]красного кода[/bold][/color] сотрудники службы безопасности уполномочены вызвать эксперта непосредственно в бриг.
+      - В условиях [color=red][bold]красного кода[/bold][/color] сотрудники Службы безопасности уполномочены вызвать эксперта непосредственно в бриг.
     1. После оценки всех свойств предмета, его дальнейшее перемещение регламентируется соответствующими процедурами.
 
 ### Оборот изъятого имущества
@@ -549,7 +559,7 @@ guidebook-SOP-security-procedure-seizure-turnover =
       - Изъятое имущество может быть передано в пользу отдела (сотрудника) с законным правом владения изъятыми предметами.
     1. Предметы, регулируемые статьями 435 и 436 подлежат хранению в запираемом шкафу. Его оборот и использование без надлежащего разрешения строго запрещены.
       - В рамках любого кода ГСБ может одобрить использование [tooltip="guidebook-SOP-security-procedure-tooltip-limited-contraband-use" text="некоторых"] запрещенных к обороту предметов в интересах следствия.
-      - В рамках [color=gold][bold]гамма кода[/bold][/color] глава службы безопасности может одобрить использование любых запрещенных к обороту предметов.
+      - В рамках [color=gold][bold]гамма кода[/bold][/color], либо в условиях ЧС при отсутствии ответа от ЦК на запрос [color=gold][bold]гамма кода[/bold][/color], глава службы безопасности может одобрить использование любых запрещенных к обороту предметов.
 
 ## Процедура выдачи УДО
 guidebook-SOP-security-procedure-parole =
@@ -700,11 +710,11 @@ guidebook-SOP-security-procedure-prisoner-cell =
 
 ## Уровни Применения Силы
 guidebook-SOP-security-procedure-force-levels =
-    {"[italic]Сотрудник службы безопасности должен применять рекомендуемый данным положением уровень силы в отношении цели, стремясь снизить его до минимального. Если конкретная ситуация не предусмотрена в данном положении, сотрудник службы безопасности обязан снизить уровень воздействия до минимального, при котором будет возможна нейтрализация цели.[/italic]"}
+    {"[italic]Сотрудник службы безопасности должен применять рекомендуемый данным положением уровень силы в отношении цели, стремясь снизить его до минимального. Если конкретная ситуация не предусмотрена в данном положении, сотрудник Службы безопасности обязан снизить уровень воздействия до минимального, при котором будет возможна нейтрализация цели.[/italic]"}
 
 ### Уровень 1
 guidebook-SOP-security-procedure-force-level-1 =
-    {"[italic]Вербальное воздействие — ненасильственные методы воздействия в отношении какого-либо лица, направленные на добровольную сдачу и содействие сотрудникам службы безопасности.[/italic]"}
+    {"[italic]Вербальное воздействие — ненасильственные методы воздействия в отношении какого-либо лица, направленные на добровольную сдачу и содействие сотрудникам Службы безопасности.[/italic]"}
 
     {"[head=3]Меры воздействия[/head]"}
     1. Вербальное обращение к лицу с прямым приказом о сдаче, сообщением о задержании, указанием следовать в бриг и т. д.
@@ -732,7 +742,7 @@ guidebook-SOP-security-procedure-force-level-2 =
     {"[head=3]Основания для применения[/head]"}
     1. Применяется в ситуациях, когда предыдущий уровень силы не оказал должного влияния на цель.
     1. Применяется в ситуациях, когда цель представляет угрозу для себя или окружающих.
-    1. Применяется в отношении лиц, отказавшихся от сотрудничества с сотрудниками службы безопасности при проведении процедур обыска и следствия.
+    1. Применяется в отношении лиц, отказавшихся от сотрудничества с сотрудниками Службы безопасности при проведении процедур обыска и следствия.
 
     {"[head=3]Рекомендуемые случаи[/head]"}
     1. В отношении лиц, ранее скрывшихся при задержании или обыске.
@@ -757,7 +767,7 @@ guidebook-SOP-security-procedure-force-level-3 =
     {"[head=3]Основания для применения[/head]"}
     1. Применяется в ситуациях, когда предыдущий уровень силы не оказал должного влияния на цель.
     1. Применяется в ситуациях, когда цель представляет значительную угрозу для себя и/или окружающих.
-    1. Применяется в отношении лиц, оказывающих агрессивное сопротивление сотрудникам службы безопасности.
+    1. Применяется в отношении лиц, оказывающих агрессивное сопротивление сотрудникам Службы безопасности.
 
     {"[head=3]Рекомендуемые случаи[/head]"}
     1. При нарушении норм экипажа в условиях [color=gold][bold]гамма кода[/bold][/color].
@@ -782,6 +792,7 @@ guidebook-SOP-security-procedure-force-level-4 =
     1. Применяется в ситуациях, когда предыдущие уровни силы [tooltip="guidebook-SOP-security-procedure-tooltip-previous-levels" text="полностью исчерпали себя"].
     1. Применяется в ситуациях, когда цель представляет значительную угрозу для безопасности станции.
     1. В случае, если нарушители больше не соответствуют рекомендуемым уровням применения силы и/или сдались/прекратили оказывать сопротивление — необходимо немедленно понизить уровень применения силы.
+    1. С целью подавления транспортного средства, включая сегвеи и их аналоги, а также шаттлы. Целью должно быть устранение мобильности, после чего уровень силы необходимо понизить до актуального.
 
     {"[head=3]Рекомендуемые случаи[/head]"}
     1. В отношении лиц, оказывающих агрессивное сопротивление при помощи холодного оружия.

Resources/Locale/ru-RU/corvax/guidebook/corporatelaw/articles.ftl

@@ -22,6 +22,7 @@ guidebook-corporatelaw-112-note =
 
     { -guidebook-corporatelaw-article }
     - Побег, попытка побега, отказ, помеха при проведении следственных мероприятий.
+    - Попытка завладеть нелетальным снаряжением СБ, не повлиявшая на успех задержания.
     - Нарушение норм экипажа.
 
 guidebook-corporatelaw-113-desc = [italic]Несанкционированное отказ от работы сотрудников или призывы к забастовке с целью требования от командования станции выполнения условий забастовщиков.[/italic]

Resources/Maps/Corvax/corvax_cluster.yml

@@ -4,8 +4,8 @@ meta:
   engineVersion: 289.0.0
   forkId: ""
   forkVersion: ""
-  time: 08/23/2026 09:11:21
-  entityCount: 12753
+  time: 09/14/2026 11:25:28
+  entityCount: 12754
 maps:
 - 12281
 grids:
@@ -13,7 +13,6 @@ grids:
 - 10949
 orphans: []
 nullspace:
-- 12723
 - 12724
 - 12725
 - 12726
@@ -44,6 +43,7 @@ nullspace:
 - 12751
 - 12752
 - 12753
+- 12754
 tilemap:
   0: Space
   2: FloorArcadeBlue
@@ -1445,7 +1445,6 @@ entities:
     - type: ExplosionAirtightGrid
     - type: ChunkContainer
       chunkEntities:
-      - 12723
       - 12724
       - 12725
       - 12726
@@ -1476,6 +1475,7 @@ entities:
       - 12751
       - 12752
       - 12753
+      - 12754
     - type: TileHistory
       chunkHistory: {}
     - type: GridSplitNode
@@ -23951,7 +23951,7 @@ entities:
       pos: -26.5,24.5
 - proto: ChunkEntity
   entities:
-  - uid: 12723
+  - uid: 12724
     components:
     - type: ChunkEntity
       root: 1
@@ -24258,7 +24258,7 @@ entities:
             2614: 27,21
             2615: 27,20
             2616: 27,19
-  - uid: 12724
+  - uid: 12725
     components:
     - type: ChunkEntity
       root: 1
@@ -24662,7 +24662,7 @@ entities:
             2688: 22.750717,9.677307
             2689: 22.656967,9.521057
             2690: 27.000717,5.786682
-  - uid: 12725
+  - uid: 12726
     components:
     - type: ChunkEntity
       root: 1
@@ -24744,7 +24744,7 @@ entities:
             1183: 20.983843,34.62477
             1184: 19.968218,33.077896
             1185: 23.34307,34.234146
-  - uid: 12726
+  - uid: 12727
     components:
     - type: ChunkEntity
       root: 1
@@ -24857,7 +24857,7 @@ entities:
             color: '#F9801DFF'
           decals:
             1114: 45,33
-  - uid: 12727
+  - uid: 12728
     components:
     - type: ChunkEntity
       root: 1
@@ -25205,7 +25205,7 @@ entities:
             227: 3,11
             228: 3,9
             229: 3,10
-  - uid: 12728
+  - uid: 12729
     components:
     - type: ChunkEntity
       root: 1
@@ -25310,7 +25310,7 @@ entities:
             color: '#2BAF9D93'
           decals:
             1234: 31,-19
-  - uid: 12729
+  - uid: 12730
     components:
     - type: ChunkEntity
       root: 1
@@ -25524,7 +25524,7 @@ entities:
             962: 14,-28
             963: 12,-28
             1028: 10,-28
-  - uid: 12730
+  - uid: 12731
     components:
     - type: ChunkEntity
       root: 1
@@ -25804,7 +25804,7 @@ entities:
             1942: -11,19
             1943: -11.431358,19.09242
             1944: -11.618858,19.233046
-  - uid: 12731
+  - uid: 12732
     components:
     - type: ChunkEntity
       root: 1
@@ -26036,7 +26036,7 @@ entities:
             color: '#4B362BFF'
           decals:
             2613: 15,22
-  - uid: 12732
+  - uid: 12733
     components:
     - type: ChunkEntity
       root: 1
@@ -26320,7 +26320,7 @@ entities:
             1398: -17,-16
             1400: -18,-12
             1401: -17,-12
-  - uid: 12733
+  - uid: 12734
     components:
     - type: ChunkEntity
       root: 1
@@ -26537,7 +26537,7 @@ entities:
           decals:
             74: -7,49
             1089: -7,53
-  - uid: 12734
+  - uid: 12735
     components:
     - type: ChunkEntity
       root: 1
@@ -26640,7 +26640,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             128: -1,44
-  - uid: 12735
+  - uid: 12736
     components:
     - type: ChunkEntity
       root: 1
@@ -26823,7 +26823,7 @@ entities:
             1983: -17,21
             1984: -17,20
             1985: -17,19
-  - uid: 12736
+  - uid: 12737
     components:
     - type: ChunkEntity
       root: 1
@@ -26995,7 +26995,7 @@ entities:
             2351: 32,12
             2352: 32,13
             2353: 33,13
-  - uid: 12737
+  - uid: 12738
     components:
     - type: ChunkEntity
       root: 1
@@ -27323,7 +27323,7 @@ entities:
             cleanable: True
           decals:
             1978: -2.1235144,-2.16181
-  - uid: 12738
+  - uid: 12739
     components:
     - type: ChunkEntity
       root: 1
@@ -27586,7 +27586,7 @@ entities:
             1824: -27,8
             1825: -27,6
             1826: -26,5
-  - uid: 12739
+  - uid: 12740
     components:
     - type: ChunkEntity
       root: 1
@@ -27788,7 +27788,7 @@ entities:
             color: '#D381C9FF'
           decals:
             146: 1,51
-  - uid: 12740
+  - uid: 12741
     components:
     - type: ChunkEntity
       root: 1
@@ -27839,7 +27839,7 @@ entities:
           decals:
             1213: -12,-53
             1214: -12,-54
-  - uid: 12741
+  - uid: 12742
     components:
     - type: ChunkEntity
       root: 1
@@ -27893,7 +27893,7 @@ entities:
           decals:
             1079: -44,-19
             1080: -44,-20
-  - uid: 12742
+  - uid: 12743
     components:
     - type: ChunkEntity
       root: 1
@@ -27948,7 +27948,7 @@ entities:
             1471: -18,-28
             1472: -18,-28
             1473: -20,-25
-  - uid: 12743
+  - uid: 12744
     components:
     - type: ChunkEntity
       root: 1
@@ -28049,7 +28049,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1062: -7,-27
-  - uid: 12744
+  - uid: 12745
     components:
     - type: ChunkEntity
       root: 1
@@ -28262,7 +28262,7 @@ entities:
           decals:
             850: 16,-4
             1263: 17,-1
-  - uid: 12745
+  - uid: 12746
     components:
     - type: ChunkEntity
       root: 1
@@ -28424,7 +28424,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1094: 44,30
-  - uid: 12746
+  - uid: 12747
     components:
     - type: ChunkEntity
       root: 1
@@ -28732,7 +28732,7 @@ entities:
           decals:
             237: -1,10
             238: -1,11
-  - uid: 12747
+  - uid: 12748
     components:
     - type: ChunkEntity
       root: 1
@@ -28975,7 +28975,7 @@ entities:
           decals:
             1961: 1,-3
             1973: 1,-6
-  - uid: 12748
+  - uid: 12749
     components:
     - type: ChunkEntity
       root: 1
@@ -29051,7 +29051,7 @@ entities:
             color: '#EFB34196'
           decals:
             1162: -2,-35
-  - uid: 12749
+  - uid: 12750
     components:
     - type: ChunkEntity
       root: 1
@@ -29123,7 +29123,7 @@ entities:
             1054: -40,21
             1055: -40,22
             1810: -40,23
-  - uid: 12750
+  - uid: 12751
     components:
     - type: ChunkEntity
       root: 1
@@ -29150,7 +29150,7 @@ entities:
             1411: -42,6
             1412: -42,9
             1413: -33,0
-  - uid: 12751
+  - uid: 12752
     components:
     - type: ChunkEntity
       root: 1
@@ -29172,7 +29172,7 @@ entities:
             cleanable: True
           decals:
             1476: 2,-34
-  - uid: 12752
+  - uid: 12753
     components:
     - type: ChunkEntity
       root: 1
@@ -29213,7 +29213,7 @@ entities:
             color: '#2BAF9D93'
           decals:
             1232: 33,-17
-  - uid: 12753
+  - uid: 12754
     components:
     - type: ChunkEntity
       root: 1
@@ -69585,6 +69585,13 @@ entities:
     - type: Transform
       parent: 1
       pos: 17.5,22.5
+- proto: SpawnPointWardenWeapon
+  entities:
+  - uid: 12723
+    components:
+    - type: Transform
+      parent: 1
+      pos: 17.5,23.5
 - proto: SpawnVendingMachineRestockDrink
   entities:
   - uid: 3058

Resources/Maps/Corvax/corvax_delta.yml

@@ -4,7 +4,7 @@ meta:
   engineVersion: 289.0.0
   forkId: ""
   forkVersion: ""
-  time: 08/23/2026 09:41:35
+  time: 09/14/2026 11:02:03
   entityCount: 41191
 maps:
 - 1
@@ -13,15 +13,15 @@ grids:
 - 38569
 orphans: []
 nullspace:
-- 25416
-- 25417
 - 25418
 - 25603
 - 25604
 - 25605
 - 26761
 - 27386
+- 27492
 - 27494
+- 27764
 - 29716
 - 29718
 - 29721
@@ -4484,15 +4484,15 @@ entities:
     - type: GridSplitNode
     - type: ChunkContainer
       chunkEntities:
-      - 25416
-      - 25417
       - 25418
       - 25603
       - 25604
       - 25605
       - 26761
       - 27386
+      - 27492
       - 27494
+      - 27764
       - 29716
       - 29718
       - 29721
@@ -83746,7 +83746,7 @@ entities:
       pos: 63.66099,-25.833206
 - proto: ChunkEntity
   entities:
-  - uid: 25416
+  - uid: 25418
     components:
     - type: ChunkEntity
       root: 2
@@ -84259,7 +84259,7 @@ entities:
           decals:
             7095: 33,0
             7125: 34,0
-  - uid: 25417
+  - uid: 25603
     components:
     - type: ChunkEntity
       root: 2
@@ -84992,7 +84992,7 @@ entities:
             20848: 5,24
             20849: 7,24
             20850: 8,24
-  - uid: 25418
+  - uid: 25604
     components:
     - type: ChunkEntity
       root: 2
@@ -85151,7 +85151,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             438: 0,-84
-  - uid: 25603
+  - uid: 25605
     components:
     - type: ChunkEntity
       root: 2
@@ -85797,7 +85797,7 @@ entities:
             11782: -16,-80
             14444: -8,-78
             14446: -3,-78
-  - uid: 25604
+  - uid: 26761
     components:
     - type: ChunkEntity
       root: 2
@@ -86032,7 +86032,7 @@ entities:
             color: '#DABC8BFF'
           decals:
             11783: -16,-81
-  - uid: 25605
+  - uid: 27386
     components:
     - type: ChunkEntity
       root: 2
@@ -86723,7 +86723,7 @@ entities:
             5692: -13,-4
             5738: -10,-2
             6084: -4,-12
-  - uid: 26761
+  - uid: 27492
     components:
     - type: ChunkEntity
       root: 2
@@ -87354,7 +87354,7 @@ entities:
             3977: -27,22
             3981: -29,20
             4014: -21,20
-  - uid: 27386
+  - uid: 27494
     components:
     - type: ChunkEntity
       root: 2
@@ -87864,7 +87864,7 @@ entities:
             5765: -16,9
             5766: -16,10
             5792: -3,13
-  - uid: 27494
+  - uid: 27764
     components:
     - type: ChunkEntity
       root: 2
@@ -225603,14 +225603,6 @@ entities:
       pos: -50.5,37.5
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 27492
-    components:
-    - type: Transform
-      parent: 2
-      rot: -1.5707963267948966 rad
-      pos: -17.5,5.5
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 27493
     components:
     - type: Transform
@@ -228713,6 +228705,11 @@ entities:
       parent: 2
       rot: 1.5707963267948966 rad
       pos: -63.5,-35.5
+  - uid: 25417
+    components:
+    - type: Transform
+      parent: 2
+      pos: -15.5,5.5
   - uid: 27734
     components:
     - type: Transform
@@ -228866,13 +228863,6 @@ entities:
     - type: Transform
       parent: 2
       pos: -59.5,61.5
-  - uid: 27764
-    components:
-    - type: Transform
-      parent: 2
-      pos: -15.5,5.5
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 27765
     components:
     - type: Transform
@@ -245118,6 +245108,15 @@ entities:
     - type: Transform
       parent: 2
       pos: 17.5,-22.5
+- proto: SignPlaque
+  entities:
+  - uid: 25416
+    components:
+    - type: MetaData
+      desc: Старая доска почета, жаль, что доска слишком изношена, чтобы можно было её прочитать, кроме нескольких слов "no_mad" "Aurora" "Bollo" "DanTheSynth", вот только что означают эти слова, вы никогда не узнаете.
+    - type: Transform
+      parent: 2
+      pos: -16.5,5.5
 - proto: SignPrison
   entities:
   - uid: 30362

Resources/Maps/Corvax/corvax_omega.yml

@@ -4,15 +4,14 @@ meta:
   engineVersion: 289.0.0
   forkId: ""
   forkVersion: ""
-  time: 08/23/2026 09:03:14
-  entityCount: 14249
+  time: 09/12/2026 14:09:59
+  entityCount: 14250
 maps:
 - 473
 grids:
 - 4812
 orphans: []
 nullspace:
-- 12570
 - 12656
 - 12975
 - 13076
@@ -54,6 +53,7 @@ nullspace:
 - 14247
 - 14248
 - 14249
+- 14250
 tilemap:
   0: Space
   41: FloorArcadeBlue
@@ -354,6 +354,11 @@ entities:
           moles:
             Oxygen: 27.225372
             Nitrogen: 102.419266
+        - temperature: 293.14975
+          volume: 2500
+          moles:
+            Oxygen: 21.824879
+            Nitrogen: 82.10312
         - temperature: 293.15
           volume: 2500
           moles: {}
@@ -665,7 +670,8 @@ entities:
           -8,8:
             0: 3292
           -7,4:
-            0: 32631
+            0: 16247
+            3: 16384
           -7,5:
             0: 65287
           -7,6:
@@ -874,13 +880,13 @@ entities:
             1: 3584
           0,12:
             0: 8448
-            3: 2176
+            4: 2176
           0,13:
             0: 66
           0,14:
             0: 2180
           1,12:
-            3: 4352
+            4: 4352
             0: 34944
           1,14:
             0: 28928
@@ -899,7 +905,7 @@ entities:
           3,13:
             0: 13107
           4,12:
-            3: 32
+            4: 32
             0: 32768
           4,13:
             0: 25612
@@ -910,12 +916,12 @@ entities:
           -9,8:
             0: 136
           -8,9:
-            3: 16
+            4: 16
             0: 8
           -9,9:
-            3: 142
+            4: 142
           -8,10:
-            3: 3
+            4: 3
             0: 3072
           -7,9:
             0: 17535
@@ -1186,12 +1192,12 @@ entities:
             0: 65529
           8,-8:
             0: 62003
-            3: 128
+            4: 128
           8,-7:
             0: 65535
           8,-6:
             0: 15
-            3: 26368
+            4: 26368
           8,-9:
             0: 48112
           9,-5:
@@ -1201,7 +1207,7 @@ entities:
           9,-8:
             0: 36072
           9,-7:
-            3: 64
+            4: 64
           9,-6:
             0: 19584
           10,-8:
@@ -1397,11 +1403,11 @@ entities:
           -9,10:
             0: 17
           -12,4:
-            3: 546
-            4: 2184
+            4: 546
+            5: 2184
           -13,4:
-            3: 2184
-            5: 546
+            4: 2184
+            6: 546
           -12,5:
             0: 1
             1: 3856
@@ -1410,7 +1416,7 @@ entities:
           -11,5:
             1: 272
           -11,4:
-            6: 546
+            7: 546
           -11,7:
             0: 35904
           -11,3:
@@ -1423,7 +1429,7 @@ entities:
           -10,6:
             0: 238
           -10,7:
-            3: 1632
+            4: 1632
           -10,3:
             0: 61007
           -13,0:
@@ -1462,7 +1468,7 @@ entities:
             0: 12288
           -16,0:
             1: 4369
-            3: 3276
+            4: 3276
           -17,0:
             1: 8930
           -16,1:
@@ -1472,19 +1478,19 @@ entities:
             1: 43746
           -16,2:
             1: 13090
-            3: 34944
+            4: 34944
           -17,2:
             1: 34986
           -16,3:
             1: 58594
           -15,0:
-            3: 273
+            4: 273
             0: 52428
           -15,1:
             0: 239
             1: 61440
           -15,2:
-            3: 13104
+            4: 13104
             1: 34952
           -15,3:
             1: 16120
@@ -1501,20 +1507,20 @@ entities:
             0: 61166
           -14,4:
             1: 12561
-            3: 2184
+            4: 2184
           -16,-2:
             0: 1772
           -16,-3:
             0: 51200
           -15,-3:
             0: 4368
-            3: 1024
+            4: 1024
           -15,-2:
             0: 2295
           -15,-1:
-            3: 1
+            4: 1
           -15,-4:
-            3: 16384
+            4: 16384
           -14,-2:
             0: 61424
           -14,-1:
@@ -1524,7 +1530,7 @@ entities:
           -14,-3:
             0: 61166
           -14,-5:
-            3: 27848
+            4: 27848
           -16,-8:
             1: 61440
           -17,-8:
@@ -1675,7 +1681,6 @@ entities:
     - type: GridSplitNode
     - type: ChunkContainer
       chunkEntities:
-      - 12570
       - 12656
       - 12975
       - 13076
@@ -1717,6 +1722,7 @@ entities:
       - 14247
       - 14248
       - 14249
+      - 14250
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 1755
@@ -29273,7 +29279,7 @@ entities:
       pos: -2.493187,-34.40246
 - proto: ChunkEntity
   entities:
-  - uid: 12570
+  - uid: 12656
     components:
     - type: ChunkEntity
       root: 4812
@@ -29649,7 +29655,7 @@ entities:
             angle: 1.5707963267948966 rad
           decals:
             721: -39,-3
-  - uid: 12656
+  - uid: 12975
     components:
     - type: ChunkEntity
       root: 4812
@@ -29863,7 +29869,7 @@ entities:
             angle: -1.5707963267948966 rad
           decals:
             405: 27,-31
-  - uid: 12975
+  - uid: 13076
     components:
     - type: ChunkEntity
       root: 4812
@@ -30056,7 +30062,7 @@ entities:
             2422: -60,9
             2427: -60,1
             2432: -61,2
-  - uid: 13076
+  - uid: 13088
     components:
     - type: ChunkEntity
       root: 4812
@@ -30126,7 +30132,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2141: 34,-5
-  - uid: 13088
+  - uid: 13201
     components:
     - type: ChunkEntity
       root: 4812
@@ -30199,7 +30205,7 @@ entities:
             1924: 53,-1
             1927: 51,-1
             1928: 52,-1
-  - uid: 13201
+  - uid: 13202
     components:
     - type: ChunkEntity
       root: 4812
@@ -30576,7 +30582,7 @@ entities:
             color: '#A88661FF'
           decals:
             3446: -7,-7
-  - uid: 13202
+  - uid: 13203
     components:
     - type: ChunkEntity
       root: 4812
@@ -30827,7 +30833,7 @@ entities:
             3435: -19,-9
             3436: -19,-8
             3437: -19,-7
-  - uid: 13203
+  - uid: 13549
     components:
     - type: ChunkEntity
       root: 4812
@@ -31089,7 +31095,7 @@ entities:
             963: 7,26
             964: 8,26
             965: 9,26
-  - uid: 13549
+  - uid: 13744
     components:
     - type: ChunkEntity
       root: 4812
@@ -31335,7 +31341,7 @@ entities:
             928: 24,1
             930: 22,5
             3088: 22,7
-  - uid: 13744
+  - uid: 13749
     components:
     - type: ChunkEntity
       root: 4812
@@ -31442,7 +31448,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1901: 26,16
-  - uid: 13749
+  - uid: 14219
     components:
     - type: ChunkEntity
       root: 4812
@@ -31614,7 +31620,7 @@ entities:
             214: 15,46
             215: 14,46
             216: 13,46
-  - uid: 14219
+  - uid: 14220
     components:
     - type: ChunkEntity
       root: 4812
@@ -31808,7 +31814,7 @@ entities:
           decals:
             417: 3,-22
             418: 3,-21
-  - uid: 14220
+  - uid: 14221
     components:
     - type: ChunkEntity
       root: 4812
@@ -32014,7 +32020,7 @@ entities:
             color: '#EFB34196'
           decals:
             619: -18,11
-  - uid: 14221
+  - uid: 14222
     components:
     - type: ChunkEntity
       root: 4812
@@ -32182,7 +32188,7 @@ entities:
           decals:
             2960: -37,15
             3077: -37,14
-  - uid: 14222
+  - uid: 14223
     components:
     - type: ChunkEntity
       root: 4812
@@ -32291,7 +32297,7 @@ entities:
             871: -53,-12
             872: -54,-12
             873: -55,-12
-  - uid: 14223
+  - uid: 14224
     components:
     - type: ChunkEntity
       root: 4812
@@ -32340,7 +32346,7 @@ entities:
             997: 35,-28
             998: 35,-27
             999: 35,-26
-  - uid: 14224
+  - uid: 14225
     components:
     - type: ChunkEntity
       root: 4812
@@ -32489,7 +32495,7 @@ entities:
           decals:
             799: 13.296297,-42.144028
             800: 3.8275461,-36.737778
-  - uid: 14225
+  - uid: 14226
     components:
     - type: ChunkEntity
       root: 4812
@@ -32504,7 +32510,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1896: 32,14
-  - uid: 14226
+  - uid: 14227
     components:
     - type: ChunkEntity
       root: 4812
@@ -32519,7 +32525,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1897: 32,16
-  - uid: 14227
+  - uid: 14228
     components:
     - type: ChunkEntity
       root: 4812
@@ -32569,7 +32575,7 @@ entities:
             cleanable: True
           decals:
             2518: -50,-18
-  - uid: 14228
+  - uid: 14229
     components:
     - type: ChunkEntity
       root: 4812
@@ -32676,7 +32682,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             2795: 7,14
-  - uid: 14229
+  - uid: 14230
     components:
     - type: ChunkEntity
       root: 4812
@@ -32929,7 +32935,7 @@ entities:
             color: '#DE3A3A96'
           decals:
             2919: -28,16
-  - uid: 14230
+  - uid: 14231
     components:
     - type: ChunkEntity
       root: 4812
@@ -33107,7 +33113,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             3076: -37,16
-  - uid: 14231
+  - uid: 14232
     components:
     - type: ChunkEntity
       root: 4812
@@ -33142,7 +33148,7 @@ entities:
             3107: -28,32
             3108: -27,32
             3109: -26,32
-  - uid: 14232
+  - uid: 14233
     components:
     - type: ChunkEntity
       root: 4812
@@ -33270,7 +33276,7 @@ entities:
           decals:
             980: -8,0
             981: -8,1
-  - uid: 14233
+  - uid: 14234
     components:
     - type: ChunkEntity
       root: 4812
@@ -33426,7 +33432,7 @@ entities:
             2805: -13,28
             2806: -12,28
             2807: -11,28
-  - uid: 14234
+  - uid: 14235
     components:
     - type: ChunkEntity
       root: 4812
@@ -33536,7 +33542,7 @@ entities:
             2572: 9,50
             2573: 10,50
             2574: 11,50
-  - uid: 14235
+  - uid: 14236
     components:
     - type: ChunkEntity
       root: 4812
@@ -33637,7 +33643,7 @@ entities:
             cleanable: True
           decals:
             1035: -44,-27
-  - uid: 14236
+  - uid: 14237
     components:
     - type: ChunkEntity
       root: 4812
@@ -33861,7 +33867,7 @@ entities:
           decals:
             970: -29,-17
             971: -28,-17
-  - uid: 14237
+  - uid: 14238
     components:
     - type: ChunkEntity
       root: 4812
@@ -34017,7 +34023,7 @@ entities:
             angle: 1.5707963267948966 rad
           decals:
             1608: -13,-40
-  - uid: 14238
+  - uid: 14239
     components:
     - type: ChunkEntity
       root: 4812
@@ -34049,7 +34055,7 @@ entities:
             1020: -25,-37
             1021: -24,-37
             1022: -23,-37
-  - uid: 14239
+  - uid: 14240
     components:
     - type: ChunkEntity
       root: 4812
@@ -34447,7 +34453,7 @@ entities:
           decals:
             1272: -7,-23
             1273: -7,-22
-  - uid: 14240
+  - uid: 14241
     components:
     - type: ChunkEntity
       root: 4812
@@ -34524,7 +34530,7 @@ entities:
             1350: -11,-53
             1351: -11,-52
             1352: -11,-51
-  - uid: 14241
+  - uid: 14242
     components:
     - type: ChunkEntity
       root: 4812
@@ -34635,7 +34641,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             953: 0,-13
-  - uid: 14242
+  - uid: 14243
     components:
     - type: ChunkEntity
       root: 4812
@@ -34721,7 +34727,7 @@ entities:
             645: -38,-36
             646: -38,-35
             647: -38,-34
-  - uid: 14243
+  - uid: 14244
     components:
     - type: ChunkEntity
       root: 4812
@@ -34790,7 +34796,7 @@ entities:
             2730: 29,-8
             2731: 30,-8
             2732: 31,-8
-  - uid: 14244
+  - uid: 14245
     components:
     - type: ChunkEntity
       root: 4812
@@ -34835,7 +34841,7 @@ entities:
           decals:
             883: 17,32
             886: 17,35
-  - uid: 14245
+  - uid: 14246
     components:
     - type: ChunkEntity
       root: 4812
@@ -34870,7 +34876,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1880: 53,0
-  - uid: 14246
+  - uid: 14247
     components:
     - type: ChunkEntity
       root: 4812
@@ -34933,7 +34939,7 @@ entities:
             1125: -6,32
             1126: -6,33
             1127: -7,33
-  - uid: 14247
+  - uid: 14248
     components:
     - type: ChunkEntity
       root: 4812
@@ -34948,7 +34954,7 @@ entities:
             color: '#FFFFFFFF'
           decals:
             1907: 66,-23
-  - uid: 14248
+  - uid: 14249
     components:
     - type: ChunkEntity
       root: 4812
@@ -34972,7 +34978,7 @@ entities:
             cleanable: True
           decals:
             861: 27.509422,-40.416092
-  - uid: 14249
+  - uid: 14250
     components:
     - type: ChunkEntity
       root: 4812
@@ -66507,6 +66513,17 @@ entities:
     - type: Transform
       parent: 4812
       pos: -25.5,19.5
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          ents:
+          - 12570
+          showEnts: False
+          occludes: True
+        paper_label: !type:ContainerSlot
+          ent: null
+          showEnts: False
+          occludes: True
 - proto: LockerWeldingSuppliesFilled
   entities:
   - uid: 11898
@@ -91278,6 +91295,16 @@ entities:
     - type: Transform
       parent: 4812
       pos: -37.57921,10.753048
+- proto: WeaponEnergyShotgun
+  entities:
+  - uid: 12570
+    components:
+    - type: Transform
+      parent: 7820
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+      storage: 7820
 - proto: WeaponEnergyTurretAI
   entities:
   - uid: 12270

Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ]
+  parent: [CrateSyndicate, StorePresetUplink] # Corvax-Contraband
   id: CrateSyndicateSurplusBundle
   name: Syndicate surplus crate
   description: Contains 50 telecrystals worth of completely random Syndicate items. It can be useless junk or really good.
@@ -23,7 +23,7 @@
           tableId: SyndicateHardsuitExtrasEntityTable
 
 - type: entity
-  parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ]
+  parent: [CrateSyndicate, StorePresetUplink] # Corvax-Contraband
   id: CrateSyndicateSuperSurplusBundle
   name: Syndicate super surplus crate
   description: Contains 125 telecrystals worth of completely random Syndicate items.

Resources/Prototypes/Corvax/Entities/Clothing/Head/hats.yml

@@ -65,7 +65,7 @@
       sprite: Corvax/Clothing/Head/Hats/warden_alt.rsi
 
 - type: entity
-  parent: ClothingHeadBase
+  parent: [BaseCorvaxContraband431JobsBrigmedic, ClothingHeadBase] # Corvax-Contraband
   id: ClothingHeadHatBeretSecurityMedic
   name: security medic beret
   description: A robust beret with the medical insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection.
@@ -87,7 +87,7 @@
     sprite: Corvax/Clothing/Head/Hats/caphat.rsi
 
 - type: entity
-  parent: ClothingHeadBase
+  parent: [BaseCorvaxContraband431JobsPilot, ClothingHeadBase] # Corvax-Contraband
   id: ClothingHeadHatBeretSecurityPilot
   name: pilot beret
   description: Black beret with a silver badge.

Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml

@@ -10,7 +10,7 @@
   - type: Clothing
     sprite: Corvax/Clothing/Neck/Misc/pins.rsi
     equippedPrefix: ath
-      
+
 - type: entity
   parent: ClothingNeckPinBase
   id: ClothingNeckUSSPPin
@@ -23,7 +23,7 @@
   - type: Clothing
     sprite: Corvax/Clothing/Neck/Misc/pins.rsi
     equippedPrefix: comm
-      
+
 - type: entity
   parent: ClothingNeckPinBase
   id: ClothingNeckCorvaxPin
@@ -36,7 +36,7 @@
   - type: Clothing
     sprite: Corvax/Clothing/Neck/Misc/pins.rsi
     equippedPrefix: cor
-      
+
 - type: entity
   parent: ClothingNeckPinBase
   id: ClothingNeckDonkPin
@@ -62,8 +62,8 @@
   - type: Clothing
     sprite: Corvax/Clothing/Neck/Misc/pins.rsi
     equippedPrefix: earth
-      
-- type: entity    
+
+- type: entity
   parent: ClothingNeckPinBase
   id: ClothingNeckEchoPin
   name: comet pin
@@ -101,7 +101,7 @@
   - type: Clothing
     sprite: Corvax/Clothing/Neck/Misc/pins.rsi
     equippedPrefix: logistika
-      
+
 - type: entity
   parent: ClothingNeckPinBase
   id: ClothingNeckMainPin
@@ -114,7 +114,7 @@
   - type: Clothing
     sprite: Corvax/Clothing/Neck/Misc/pins.rsi
     equippedPrefix: main
-      
+
 - type: entity
   parent: ClothingNeckPinBase
   id: ClothingNeckDeForestPin
@@ -166,7 +166,7 @@
   - type: Clothing
     sprite: Corvax/Clothing/Neck/Misc/pins.rsi
     equippedPrefix: neb
-    
+
 - type: entity
   parent: ClothingNeckPinBase
   id: ClothingNeckNovaPin
@@ -181,7 +181,7 @@
     equippedPrefix: nova
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: [BaseCorvaxContraband131, ClothingNeckPinBase]
   id: ClothingNeckSyndicakePin
   name: Syndicake pin
   description: The pin of Syndicakes, on backside have a little numbers "2559".

Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml

@@ -53,7 +53,7 @@
           Heat: 0.8
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [BaseCorvaxContraband431JobsSecurityOfficer, ClothingOuterStorageBase] # Corvax-Contraband
   id: ClothingOuterCoatSecurityOvercoat
   name: security overcoat
   description: Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of Nanotrasen Security.
@@ -71,7 +71,7 @@
           Heat: 0.9
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [BaseCorvaxContraband431JobsBrigmedic, ClothingOuterStorageBase] # Corvax-Contraband
   id: ClothingOuterCoatLabSecurityMedic
   name: security medic labcoat
   description: A suit that protects against minor chemical spills.

Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/suits.yml

@@ -21,7 +21,7 @@
       sprite: Corvax/Clothing/OuterClothing/Coats/disco.rsi
       
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [BaseCorvaxContraband431JobsAtmosphericTechnician, ClothingOuterStorageBase] # Corvax-Contraband
   id: ClothingAtmosphericsOveralls
   name: atmospherics overalls
   description: A set of fireproof overalls, good for protecting thinner clothes from gas leaks.

Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/vests.yml

@@ -15,13 +15,17 @@
   name: security medic armor vest
   description: A security medic's armor vest, with little pockets for little things.
   components:
+    - type: Contraband
+      severity: Corvax431
+      allowedDepartments: [Security]
+      allowedJobs: [Brigmedic]
     - type: Sprite
       sprite: Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi
     - type: Clothing
       sprite: Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi
 
 - type: entity
-  parent: ClothingOuterBase
+  parent: [BaseCorvaxContraband431JobsBrigmedic, ClothingOuterBase] # Corvax-Contraband
   id: ClothingOuterVestSecurityMedic
   name: security medic vest
   description: A lightweight vest worn by the Security Medic.

Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml

@@ -44,7 +44,7 @@
     sprite: Corvax/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [BaseCorvaxContraband431JobsCaptain, ClothingUniformBase] # Corvax-Contraband
   id: ClothingUniformJumpskirtCapTurtleneck
   name: captain's turtleneck
   description: True captain's turtleneck.
@@ -55,7 +55,7 @@
       sprite: Corvax/Clothing/Uniforms/Jumpskirt/cap_turtleneck.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [BaseCorvaxContraband431JobsHeadOfPersonnel, ClothingUniformBase] # Corvax-Contraband
   id: ClothingUniformJumpskirtHoPTurtleneck
   name: head of personal's turtleneck
   description: It's Head of Personal's turtleneck.
@@ -66,7 +66,7 @@
       sprite: Corvax/Clothing/Uniforms/Jumpskirt/hop_turtleneck.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [BaseCorvaxContraband431JobsHeadOfSecurity, ClothingUniformBase] # Corvax-Contraband
   id: ClothingUniformJumpskirtHoSBlack
   name: head of security's black skirt
   description: It's Head of Security's black skirt.
@@ -77,7 +77,7 @@
       sprite: Corvax/Clothing/Uniforms/Jumpskirt/hos_black.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [BaseCorvaxContraband431JobsResearchDirector, ClothingUniformBase] # Corvax-Contraband
   id: ClothingUniformJumpskirtRDClassical
   name: research director's classical skirt
   description: It's Research Director's classical skirt.

Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -43,7 +43,7 @@
       sprite: Corvax/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [BaseCorvaxContraband431JobsCaptain, ClothingUniformBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitCapTurtleneck
   name: captain's turtleneck
   description: True captain's turtleneck.
@@ -54,7 +54,7 @@
       sprite: Corvax/Clothing/Uniforms/Jumpsuit/cap_turtleneck.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [BaseCorvaxContraband431JobsHeadOfPersonnel, ClothingUniformBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitHoPTurtleneck
   name: head of personal's turtleneck
   description: It's Head of Personal's turtleneck.
@@ -65,7 +65,7 @@
       sprite: Corvax/Clothing/Uniforms/Jumpsuit/hop_turtleneck.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [BaseCorvaxContraband431JobsHeadOfSecurity, ClothingUniformBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitHoSBlack
   name: head of security's black suit
   description: It's Head of Security's black suit.
@@ -76,7 +76,7 @@
       sprite: Corvax/Clothing/Uniforms/Jumpsuit/hos_black.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [BaseCorvaxContraband431JobsResearchDirector, ClothingUniformBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitRDClassical
   name: research director's classical suit
   description: It's Research Director's сlassical suit.

Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml

@@ -4,6 +4,10 @@
   name: internal affairs agent PDA
   description: Corporation and profit are best friends.
   components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [IAA]
   - type: Pda
     id: IAAIDCard
     penSlot:
@@ -19,7 +23,7 @@
     state: pda-lawyer
 
 - type: entity
-  parent: BaseSecurityPDA
+  parent: [BaseCorvaxContraband431JobsPilot, BaseSecurityPDA] # Corvax-Contraband
   id: PilotPDA
   name: pilot PDA
   description: Нas protection from cosmic radiation.
@@ -53,6 +57,10 @@
   name: magistrate's PDA
   description: Corporation and profit are best friends.
   components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Magistrate]
   - type: Sprite
     sprite: Corvax/Objects/Devices/pda.rsi
     state: pda-magistrate

Resources/Prototypes/Corvax/Entities/Objects/Devices/secapartment.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [ BaseCorvaxContraband433DepartmentsCommandSecurity, BaseItem ]
   id: SecApartmentTabletUnpowered
   name: SecApartment handheld tablet
   description: "A NanoTrasen-approved device for organizing and coordinating the actions of security personnel at corporate facilities."

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

@@ -4,6 +4,10 @@
   id: PenLegal
   description: Writes sentences and more.
   components:
+  - type: Contraband
+    severity: Corvax432
+    allowedDepartments: [Legal, CentralCommand]
+    allowedJobs: []
   - type: Sprite
     sprite: Corvax/Objects/Misc/pens.rsi
     state: legal_pen

Resources/Prototypes/Corvax/base_contraband.yml

@@ -0,0 +1,633 @@
+# Corvax-Contraband: reusable article and permission combinations.
+# Put these before functional parents so their explicit permissions take precedence.
+# Keep empty permission lists: another parent must not add unintended exemptions.
+
+- type: entity
+  id: BaseCorvaxContraband131
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax131
+    allowedDepartments: []
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband431JobsAtmosphericTechnician
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [AtmosphericTechnician]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsAtmosphericTechnicianSeniorEngineer
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [AtmosphericTechnician, SeniorEngineer]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsBartender
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Bartender]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsBotanist
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Botanist]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsBrigmedic
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Brigmedic]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsCaptain
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Captain]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsCargoTechnician
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [CargoTechnician]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsChaplain
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Chaplain]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsChef
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Chef]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsChemist
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Chemist]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsChiefEngineer
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [ChiefEngineer]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsChiefMedicalOfficer
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [ChiefMedicalOfficer]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsDetective
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Detective]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsHeadOfPersonnel
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [HeadOfPersonnel]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsHeadOfSecurity
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [HeadOfSecurity]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsJanitor
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Janitor]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsMedicalDoctor
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [MedicalDoctor]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsParamedic
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Paramedic]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsPilot
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Pilot]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsQuartermaster
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Quartermaster]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsResearchDirector
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [ResearchDirector]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsSalvageSpecialist
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [SalvageSpecialist]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsScientist
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Scientist]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsScientistSeniorResearcher
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Scientist, SeniorResearcher]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsSecurityOfficer
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [SecurityOfficer]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsSecurityOfficerSeniorOfficer
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [SecurityOfficer, SeniorOfficer]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsSeniorEngineerStationEngineer
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [SeniorEngineer, StationEngineer]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsStationEngineer
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [StationEngineer]
+
+- type: entity
+  id: BaseCorvaxContraband431JobsWarden
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Warden]
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsCentralCommand
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [CentralCommand]
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsCentralCommandJobsCentralCommandOfficial
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [CentralCommand]
+    allowedJobs: [CentralCommandOfficial]
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsCommandJobsCaptain
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [Command]
+    allowedJobs: [Captain]
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsCommandJobsChiefEngineer
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [Command]
+    allowedJobs: [ChiefEngineer]
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsCommandJobsChiefMedicalOfficer
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [Command]
+    allowedJobs: [ChiefMedicalOfficer]
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsCommandJobsHeadOfPersonnel
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [Command]
+    allowedJobs: [HeadOfPersonnel]
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsCommandJobsHeadOfSecurity
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [Command]
+    allowedJobs: [HeadOfSecurity]
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsCommandJobsQuartermaster
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [Command]
+    allowedJobs: [Quartermaster]
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsCommandJobsResearchDirector
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [Command]
+    allowedJobs: [ResearchDirector]
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsCommandSecurityJobsHeadOfSecurity
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [Command, Security]
+    allowedJobs: [HeadOfSecurity]
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsEngineering
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [Engineering]
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsEngineeringSecurity
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [Engineering, Security]
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsMedical
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [Medical]
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsScience
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [Science]
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsSecurity
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [Security]
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsSecurityJobsBrigmedicDetectiveSecurityOfficerSeniorOfficer
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [Security]
+    allowedJobs: [Brigmedic, Detective, SecurityOfficer, SeniorOfficer]
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsSecurityJobsDetective
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [Security]
+    allowedJobs: [Detective]
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsSecurityJobsSecurityCadetSecurityOfficer
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [Security]
+    allowedJobs: [SecurityCadet, SecurityOfficer]
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsSecurityJobsSecurityOfficer
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [Security]
+    allowedJobs: [SecurityOfficer]
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsSecurityJobsSecurityOfficerSeniorOfficer
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [Security]
+    allowedJobs: [SecurityOfficer, SeniorOfficer]
+
+- type: entity
+  id: BaseCorvaxContraband431DepartmentsSecurityJobsWarden
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [Security]
+    allowedJobs: [Warden]
+
+- type: entity
+  id: BaseCorvaxContraband432JobsBotanist
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax432
+    allowedDepartments: []
+    allowedJobs: [Botanist]
+
+- type: entity
+  id: BaseCorvaxContraband432JobsChef
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax432
+    allowedDepartments: []
+    allowedJobs: [Chef]
+
+- type: entity
+  id: BaseCorvaxContraband432DepartmentsCargo
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax432
+    allowedDepartments: [Cargo]
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband432DepartmentsCargoSecurity
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax432
+    allowedDepartments: [Cargo, Security]
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband432DepartmentsCentralCommand
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax432
+    allowedDepartments: [CentralCommand]
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband432DepartmentsCommandSecurity
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax432
+    allowedDepartments: [Command, Security]
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband432DepartmentsMedical
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax432
+    allowedDepartments: [Medical]
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband432DepartmentsScience
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax432
+    allowedDepartments: [Science]
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband432DepartmentsSecurity
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax432
+    allowedDepartments: [Security]
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband433DepartmentsCommand
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax433
+    allowedDepartments: [Command]
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband433DepartmentsCommandSecurity
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax433
+    allowedDepartments: [Command, Security]
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband433DepartmentsSecurity
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax433
+    allowedDepartments: [Security]
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband434DepartmentsCentralCommand
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax434
+    allowedDepartments: [CentralCommand]
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband434DepartmentsCommand
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax434
+    allowedDepartments: [Command]
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband434DepartmentsScience
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax434
+    allowedDepartments: [Science]
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband434DepartmentsSecurity
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax434
+    allowedDepartments: [Security]
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband434DepartmentsSecurityJobsBartender
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax434
+    allowedDepartments: [Security]
+    allowedJobs: [Bartender]
+
+- type: entity
+  id: BaseCorvaxContraband435
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax435
+    allowedDepartments: []
+    allowedJobs: []
+
+- type: entity
+  id: BaseCorvaxContraband436
+  abstract: true
+  components:
+  - type: Contraband
+    severity: Corvax436
+    allowedDepartments: []
+    allowedJobs: []

Resources/Prototypes/Corvax/contraband_severities.yml

@@ -0,0 +1,83 @@
+# Corvax: localized contraband articles from the Station14 wiki (2026-09-06).
+# https://station14.ru/wiki/Контрабанда
+# Article numbers describe legality, not whether a character has identified an item.
+# Identification, research, licenses and contextual exceptions remain roleplay rules.
+# Corvax: XX1-XX5 use the corporate law table colors from the wiki dark theme.
+
+# 131: Propaganda of prohibited organizations.
+- type: contrabandSeverity
+  id: Corvax131
+  examineText: contraband-examine-text-Corvax131
+  color: "#1A4B1E"
+  priority: 1
+
+# 431: Misuse of professional equipment.
+- type: contrabandSeverity
+  id: Corvax431
+  examineText: contraband-examine-text-Corvax431
+  showDepartmentsAndJobs: true
+  color: "#1A4B1E"
+  priority: 2
+
+# 432: Dangerous items.
+- type: contrabandSeverity
+  id: Corvax432
+  examineText: contraband-examine-text-Corvax432
+  color: "#564513"
+  priority: 3
+
+# 433: Regulated items.
+- type: contrabandSeverity
+  id: Corvax433
+  examineText: contraband-examine-text-Corvax433
+  color: "#652F0F"
+  priority: 4
+
+# 434: Restricted-circulation items.
+- type: contrabandSeverity
+  id: Corvax434
+  examineText: contraband-examine-text-Corvax434
+  color: "#65240F"
+  priority: 5
+
+# 435: Contraband items.
+- type: contrabandSeverity
+  id: Corvax435
+  examineText: contraband-examine-text-Corvax435
+  color: "#ff0000"
+  priority: 6
+
+# 436: Terrorist equipment.
+- type: contrabandSeverity
+  id: Corvax436
+  examineText: contraband-examine-text-Corvax436
+  color: darkred
+  priority: 7
+
+# 442: Harmful basic chemicals and weak narcotics.
+- type: contrabandSeverity
+  id: Corvax442
+  examineText: contraband-examine-text-Corvax442
+  color: "#564513"
+  priority: 3
+
+# 443: Complex medicines.
+- type: contrabandSeverity
+  id: Corvax443
+  examineText: contraband-examine-text-Corvax443
+  color: "#652F0F"
+  priority: 4
+
+# 444: Toxins, strong narcotics and explosive chemicals.
+- type: contrabandSeverity
+  id: Corvax444
+  examineText: contraband-examine-text-Corvax444
+  color: "#65240F"
+  priority: 5
+
+# 445: Critical toxins, stimulants and mutagens.
+- type: contrabandSeverity
+  id: Corvax445
+  examineText: contraband-examine-text-Corvax445
+  color: "#ff0000"
+  priority: 6

Resources/Prototypes/Entities/Clothing/Back/backpacks.yml

@@ -287,7 +287,7 @@
 
 #Syndicate
 - type: entity
-  parent: [ClothingBackpack, BaseSyndicateContraband]
+  parent: [ClothingBackpack] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingBackpackSyndicate
   name: syndicate backpack
   description:

Resources/Prototypes/Entities/Clothing/Back/duffel.yml

@@ -163,7 +163,7 @@
       sprite: Clothing/Back/Duffels/salvage.rsi
 
 - type: entity
-  parent: [ClothingBackpackDuffel, BaseSyndicateContraband]
+  parent: [ClothingBackpackDuffel] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingBackpackDuffelSyndicate
   name: syndicate duffel bag
   description: A large duffel bag for holding various traitor goods.
@@ -177,7 +177,7 @@
     - 0,0,8,4
 
 - type: entity
-  parent: [ ClothingBackpackDuffelSyndicate, BaseSyndicateContraband ]
+  parent: [ ClothingBackpackDuffelSyndicate ] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingBackpackDuffelSyndicateBundle
   abstract: true
   components:

Resources/Prototypes/Entities/Clothing/Back/smuggler.yml

@@ -29,7 +29,7 @@
     bodyType: Static
 
 - type: entity
-  parent: [ BaseSubfloorAnchorStorageAnchored, ClothingBackpackSatchel, BaseMinorContraband ]
+  parent: [BaseSubfloorAnchorStorageAnchored, ClothingBackpackSatchel] # Corvax-Contraband
   id: ClothingBackpackSatchelSmuggler
   name: smuggler's satchel
   suffix: Empty
@@ -40,7 +40,7 @@
     state: icon
 
 - type: entity
-  parent: [ BaseSubfloorAnchorStorage, ClothingBackpackSatchel, BaseMinorContraband ]
+  parent: [ BaseSubfloorAnchorStorage, ClothingBackpackSatchel ] # Corvax-Contraband BaseMinorContraband
   id: ClothingBackpackSatchelSmugglerUnanchored
   name: smuggler's satchel
   suffix: Empty, Unanchored

Resources/Prototypes/Entities/Clothing/Belt/belts.yml

@@ -111,7 +111,7 @@
 ## Holsters
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: [BaseCorvaxContraband431DepartmentsSecurity, ClothingBeltStorageBase] # Corvax-Contraband
   id: ClothingBeltHolster
   name: shoulder holster
   description: 'A holster to carry a handgun and ammo. WARNING: Badasses only.'
@@ -129,7 +129,7 @@
     - 0,0,4,1
 
 - type: entity
-  parent: [ClothingBeltStorageBase, BaseSyndicateContraband]
+  parent: [BaseCorvaxContraband431DepartmentsSecurity, ClothingBeltStorageBase, BaseSyndicateContraband] # Corvax-Contraband
   id: ClothingBeltSyndieHolster
   name: syndicate shoulder holster
   description: A deep shoulder holster capable of holding many types of ballistics.

Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

@@ -166,7 +166,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: [ClothingEyesBase, ShowSecurityIcons, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, ClothingEyesBase, ShowSecurityIcons, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingEyesGlassesSecurity
   name: security glasses
   description: Upgraded sunglasses that provide flash immunity and a security HUD.
@@ -194,7 +194,7 @@
     coverage: EYES
 
 - type: entity
-  parent: [ClothingEyesBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, ClothingEyesBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingEyesGlassesCommand
   name: administration glasses
   description: Upgraded sunglasses that provide flash immunity and show ID card status.
@@ -252,7 +252,7 @@
   - type: ThermalSight
 
 - type: entity
-  parent: ClothingEyesBase
+  parent: [BaseCorvaxContraband431DepartmentsMedical, ClothingEyesBase] # Corvax-Contraband
   id: ClothingEyesGlassesChemical
   name: chemical analysis goggles
   description: Goggles that can scan the chemical composition of a solution.

Resources/Prototypes/Entities/Clothing/Eyes/hud.yml

@@ -27,7 +27,7 @@
   - type: ShowHealthIcons
 
 - type: entity
-  parent: ClothingEyesHudBase
+  parent: [BaseCorvaxContraband431DepartmentsScience, ClothingEyesHudBase] # Corvax-Contraband
   id: ClothingEyesHudDiagnostic
   name: diagnostic hud
   description: A heads-up display capable of analyzing the integrity and status of robotics and exosuits. Made out of see-borg-ium.
@@ -43,7 +43,7 @@
   - type: ShowAccessReaderSettings
 
 - type: entity
-  parent: [ClothingEyesHudBase, ShowMedicalIcons]
+  parent: [BaseCorvaxContraband431DepartmentsMedical, ClothingEyesHudBase, ShowMedicalIcons] # Corvax-Contraband
   id: ClothingEyesHudMedical
   name: medical hud
   description: A heads-up display that scans the humanoids in view and provides accurate data about their health status.
@@ -59,7 +59,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: [ClothingEyesHudBase, ShowSecurityIcons, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, ClothingEyesHudBase, ShowSecurityIcons, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingEyesHudSecurity
   name: security hud
   description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records.
@@ -75,7 +75,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: [ClothingEyesHudBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, ClothingEyesHudBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingEyesHudCommand
   name: administration hud
   description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status.
@@ -91,7 +91,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingEyesHudBase
+  parent: [BaseCorvaxContraband431JobsBartender, ClothingEyesHudBase] # Corvax-Contraband
   id: ClothingEyesHudBeer
   name: beer goggles
   description: A pair of sunHud outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion.

Resources/Prototypes/Entities/Clothing/Hands/colored.yml

@@ -319,7 +319,7 @@
 # Insulated Gloves (Yellow Gloves)
 # Currently can not be greyscaled without looking like shit.
 - type: entity
-  parent: [ClothingHandsBase, BaseSlicingRefinable]
+  parent: [BaseCorvaxContraband431DepartmentsEngineering, ClothingHandsBase, BaseSlicingRefinable] # Corvax-Contraband
   id: ClothingHandsGlovesColorYellow
   name: insulated gloves
   description: These gloves will protect the wearer from electric shocks.

Resources/Prototypes/Entities/Clothing/Hands/gloves.yml

@@ -496,7 +496,7 @@
 
 #Knuckledusters
 - type: entity
-  parent: [ClothingHandsBase, BaseMinorContraband]
+  parent: [BaseCorvaxContraband433DepartmentsSecurity, ClothingHandsBase, BaseMinorContraband] # Corvax-Contraband
   id: ClothingHandsKnuckleDusters
   name: knuckle dusters
   description: "Cold plasteel knuckle dusters, makes your punches hit much harder."
@@ -571,7 +571,7 @@
     stealGroup: ClothingHandsKnuckleDustersQM
 
 - type: entity
-  parent: [ClothingHandsBase, BaseSyndicateContraband]
+  parent: [BaseCorvaxContraband433DepartmentsSecurity, ClothingHandsBase, BaseSyndicateContraband] # Corvax-Contraband
   id: ClothingHandsKnuckleDustersSyndicate
   name: syndicate knuckle dusters
   description: "Plastitanium knuckle dusters branded with the blood-red S. A real man beats someone to death with these."

Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml

@@ -34,7 +34,7 @@
 
 #Syndicate EVA Helmet
 - type: entity
-  parent: [ ClothingHeadEVAHelmetBase, BaseSyndicateContraband ]
+  parent: [ ClothingHeadEVAHelmetBase ] # Corvax-Contraband deleted - BaseSyndicateContraband
   id: ClothingHeadHelmetSyndicate
   name: syndicate EVA helmet
   description: A simple, stylish EVA helmet. Designed for maximum humble space-badassery.

Resources/Prototypes/Entities/Clothing/Head/hats.yml

@@ -49,7 +49,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBase
+  parent: [BaseCorvaxContraband431JobsSecurityOfficerSeniorOfficer, ClothingHeadBase] # Corvax-Contraband
   id: ClothingHeadHatBeretSecurity
   name: security beret
   description: A beret with the security department's insignia. For officers that are more inclined towards style than safety.
@@ -68,7 +68,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBase
+  parent: [BaseCorvaxContraband431JobsSecurityOfficer, ClothingHeadBase] # Corvax-Contraband
   id: ClothingHeadHatSecurityTrooper
   name: trooper hat
   description: A campaign hat for the Nanotrasen Troopers. It's supposed to come with a case, too...
@@ -122,6 +122,12 @@
   name: engineering beret
   description: A beret with the engineering department's insignia. For engineers that are more inclined towards style than safety.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [ChiefEngineer, SeniorEngineer, StationEngineer]
+  # Corvax-Contraband-end
   - type: Sprite
     sprite: Clothing/Head/Hats/beret_engineering.rsi
   - type: Clothing
@@ -136,7 +142,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBase
+  parent: [BaseCorvaxContraband431JobsQuartermaster, ClothingHeadBase] # Corvax-Contraband
   id: ClothingHeadHatBeretQM
   name: quartermaster's beret
   description: A beret with the cargo department's insignia.
@@ -155,7 +161,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBase
+  parent: [BaseCorvaxContraband431JobsHeadOfSecurity, ClothingHeadBase] # Corvax-Contraband
   id: ClothingHeadHatBeretHoS
   name: head of security's beret
   description: A black beret with a commander's rank emblem. For officers that are more inclined towards style than safety.
@@ -174,7 +180,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBase
+  parent: [BaseCorvaxContraband431JobsWarden, ClothingHeadBase] # Corvax-Contraband
   id: ClothingHeadHatBeretWarden
   name: warden's beret
   description: A corporate-blue beret with a warden's rank emblem. For officers that are more inclined towards style than safety.
@@ -206,7 +212,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBase
+  parent: [BaseCorvaxContraband431JobsBrigmedic, ClothingHeadBase] # Corvax-Contraband
   id: ClothingHeadHatBeretBrigmedic
   name: brigmedical beret
   description: A white beret for brigmedics.
@@ -270,7 +276,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: [ClothingHeadBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsCaptain, ClothingHeadBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingHeadHatCaptain
   name: captain's hardhat
   description: Feels good being the king.
@@ -304,7 +310,7 @@
   - type: IngestionBlocker
 
 - type: entity
-  parent: [ ClothingHeadBase, BaseCentcommContraband ]
+  parent: [BaseCorvaxContraband431DepartmentsCentralCommandJobsCentralCommandOfficial, ClothingHeadBase, BaseCentcommContraband] # Corvax-Contraband
   id: ClothingHeadHatCentcom
   name: CentComm brand hat
   description: Feels good being the king's boss.
@@ -320,7 +326,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBase
+  parent: [BaseCorvaxContraband431JobsChef, ClothingHeadBase] # Corvax-Contraband
   id: ClothingHeadHatChef
   name: chef's hat
   description: A hat used by chefs to keep their hair out of your food. Judging by the food in the mess, they don't work.
@@ -428,7 +434,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: [ClothingHeadBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfSecurity, ClothingHeadBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingHeadHatHoshat
   name: head of security cap
   description: A stylish cap worn by the Head of Security. Shows the officers who's in charge.
@@ -512,7 +518,7 @@
     relayAccent: true
 
 - type: entity
-  parent: ClothingHeadBase
+  parent: [ClothingHeadBase]
   id: ClothingHeadHatPlaguedoctor
   name: plague doctor hat
   description: These were once used by plague doctors.
@@ -751,7 +757,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBase
+  parent: [BaseCorvaxContraband431JobsWarden, ClothingHeadBase] # Corvax-Contraband
   id: ClothingHeadHatWarden
   name: warden's cap
   description: This hat emphasizes that you are THE LAW.
@@ -854,7 +860,7 @@
     sprite: Clothing/Head/Hats/truckershat.rsi
 
 - type: entity
-  parent: [ ClothingHeadBase, BaseSyndicateContraband ]
+  parent: [ ClothingHeadBase] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingHeadPyjamaSyndicateBlack
   name: syndicate black pyjama hat
   description: For keeping that traitor head of yours warm.
@@ -870,7 +876,7 @@
       HeadSide : HEAD
 
 - type: entity
-  parent: [ ClothingHeadBase, BaseSyndicateContraband ]
+  parent: [ ClothingHeadBase] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingHeadPyjamaSyndicatePink
   name: syndicate pink pyjama hat
   description: For keeping that traitor head of yours warm.
@@ -886,7 +892,7 @@
       HeadSide : HEAD
 
 - type: entity
-  parent: [ ClothingHeadBase, BaseSyndicateContraband ]
+  parent: [ ClothingHeadBase] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingHeadPyjamaSyndicateRed
   name: syndicate red pyjama hat
   description: For keeping that traitor head of yours warm.
@@ -1027,7 +1033,7 @@
         HeadSide : HEAD
 
 - type: entity
-  parent: [ClothingHeadBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefMedicalOfficer, ClothingHeadBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingHeadHatBeretCmo
   name: chief medical officer's beret
   description: A turquoise beret with a cross on the front. The sight of it calms you down and makes it clear that you will be cured.
@@ -1090,7 +1096,7 @@
         Caustic: 0.95
 
 - type: entity
-  parent: [ClothingHeadBase, BaseSyndicateContraband]
+  parent: [ClothingHeadBase] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingHeadHatSyndie
   name: syndicate hat
   description: A souvenir hat from "Syndieland", their production has already been closed.
@@ -1474,7 +1480,7 @@
         acts: [ "Destruction" ]
 
 - type: entity
-  parent: ClothingHeadBase
+  parent: [BaseCorvaxContraband431JobsMedicalDoctor, ClothingHeadBase] # Corvax-Contraband
   id: ClothingHeadHatBeretMedic
   name: medical beret
   description: A sterile white beret.

Resources/Prototypes/Entities/Clothing/Head/helmets.yml

@@ -29,7 +29,7 @@
 
 #Security Helmet
 - type: entity
-  parent: [ClothingHeadHelmetArmoredBase, BaseFoldable, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingHeadHelmetArmoredBase, BaseFoldable, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingHeadHelmetBasic
   name: security helmet
   description: Standard security gear. Protects the head from impacts, and comes with a visor which can be lowered to protect the eyes.
@@ -61,7 +61,7 @@
 
 #Mercenary Helmet
 - type: entity
-  parent: [ ClothingHeadHelmetArmoredBase, BaseMajorContraband ]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingHeadHelmetArmoredBase, BaseMajorContraband] # Corvax-Contraband
   id: ClothingHeadHelmetMerc
   name: mercenary helmet
   description: The combat helmet is commonly used by mercenaries, is strong, light and smells like gunpowder and the jungle.
@@ -76,7 +76,7 @@
 
 #SWAT Helmet
 - type: entity
-  parent: [ClothingHeadHelmetBase, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingHeadHelmetBase, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingHeadHelmetSwat
   name: SWAT helmet
   description: An extremely robust helmet, commonly used by paramilitary forces. This one has the Nanotrasen logo emblazoned on the top.
@@ -118,7 +118,7 @@
 
 #Light Riot Helmet
 - type: entity
-  parent: [ClothingHeadHelmetBase, BaseFoldable, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingHeadHelmetBase, BaseFoldable, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingHeadHelmetRiot
   name: light riot helmet
   description: It's a helmet specifically designed to protect against close range attacks, it has a foldable visor.
@@ -198,7 +198,7 @@
 
 #Cult Helmet
 - type: entity
-  parent: [ClothingHeadHelmetBase, BaseMajorContraband]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingHeadHelmetBase, BaseMajorContraband] # Corvax-Contraband
   id: ClothingHeadHelmetCult
   name: cult helmet
   description: A robust, evil-looking cult helmet.
@@ -379,7 +379,7 @@
 
 #Chitinous Helmet
 - type: entity
-  parent: [ ClothingHeadHelmetBase, BaseMajorContraband]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingHeadHelmetBase, BaseMajorContraband] # Corvax-Contraband
   id: ClothingHeadHelmetLing
   name: chitinous helmet
   description: An all-consuming chitinous mass of armor.
@@ -402,7 +402,7 @@
 #ERT HELMETS
 #ERT Leader Helmet
 - type: entity
-  parent: [ BaseCentcommContraband, ClothingHeadHelmetArmoredBase ]
+  parent: [BaseCorvaxContraband432DepartmentsCentralCommand, BaseCentcommContraband, ClothingHeadHelmetArmoredBase] # Corvax-Contraband
   id: ClothingHeadHelmetERTLeader
   name: ERT leader helmet
   description: An in-atmosphere helmet worn by the leader of a Nanotrasen Emergency Response Team. Has blue highlights.
@@ -476,7 +476,7 @@
       Hair: HEAD
 
 - type: entity
-  parent: [ BaseSyndicateContraband, ClothingHeadHelmetBase ]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, BaseSyndicateContraband, ClothingHeadHelmetBase] # Corvax-Contraband
   id: ClothingHeadHelmetRaid
   name: syndicate raid helmet
   description: An armored helmet for use with the syndicate raid suit. Very stylish.
@@ -499,7 +499,7 @@
 #Bone Helmet
 #No need to hide the hair on this one
 - type: entity
-  parent: [ ClothingHeadHelmetArmoredBase, BaseMinorContraband ]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingHeadHelmetArmoredBase, BaseMinorContraband] # Corvax-Contraband
   id: ClothingHeadHelmetBone
   name: bone helmet
   description: Cool-looking helmet made of skull of your enemies.
@@ -514,7 +514,7 @@
 
 #Ironclad II Helmet
 - type: entity
-  parent: [ ClothingHeadHelmetArmoredBase, BaseMinorContraband ]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingHeadHelmetArmoredBase, BaseMinorContraband] # Corvax-Contraband
   id: ClothingHeadHelmetPodWars
   name: ironclad II helmet
   description: An ironclad II helmet, a relic of the pod wars.
@@ -529,7 +529,7 @@
 
 #Justice Helmet
 - type: entity
-  parent: [ClothingHeadHelmetArmoredBase, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingHeadHelmetArmoredBase, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingHeadHelmetJustice
   name: justice helm
   description: Advanced security gear. Protects the station from ne'er-do-wells.

Resources/Prototypes/Entities/Clothing/Head/misc.yml

@@ -219,7 +219,7 @@
     relayAccent: true
 
 - type: entity
-  parent: [ ClothingHeadBase, BaseSyndicateContraband ]
+  parent: [ ClothingHeadBase ] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingHeadHatCatEars
   name: cat ears
   description: "NYAH!"

Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml

@@ -51,7 +51,7 @@
 
 # The helmet itself
 - type: entity
-  parent: [ClothingHeadHelmetBase, BaseMajorContraband]
+  parent: [BaseCorvaxContraband432DepartmentsCargoSecurity, ClothingHeadHelmetBase, BaseMajorContraband] # Corvax-Contraband
   id: ClothingHeadHelmetScrap
   name: scrap helmet
   description: A cobbled-together helmet made from cabling, steel, and a bucket.

Resources/Prototypes/Entities/Clothing/Head/soft.yml

@@ -56,7 +56,7 @@
   name: blue cap
 
 - type: entity
-  parent: ClothingHeadHeadHatBaseFlippable
+  parent: [BaseCorvaxContraband431JobsCargoTechnician, ClothingHeadHeadHatBaseFlippable] # Corvax-Contraband
   id: ClothingHeadHatCargosoft
   name: cargo cap
   description: A baseball cap colored to match cargo's uniforms.
@@ -85,7 +85,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadHeadHatBaseFlippable
+  parent: [BaseCorvaxContraband431JobsQuartermaster, ClothingHeadHeadHatBaseFlippable] # Corvax-Contraband
   id: ClothingHeadHatQMsoft
   name: quartermaster's cap
   description: A baseball cap colored to match the Quartermaster's uniform.
@@ -258,7 +258,7 @@
   name: red cap
 
 - type: entity
-  parent: ClothingHeadHeadHatBaseFlippable
+  parent: [BaseCorvaxContraband431JobsSecurityOfficerSeniorOfficer, ClothingHeadHeadHatBaseFlippable] # Corvax-Contraband
   id: ClothingHeadHatSecsoft
   name: security cap
   description: A baseball cap colored to match security's uniforms.
@@ -306,7 +306,7 @@
   name: troublemaker's cap
 
 - type: entity
-  parent: ClothingHeadHeadHatBaseFlippable
+  parent: [BaseCorvaxContraband431JobsParamedic, ClothingHeadHeadHatBaseFlippable] # Corvax-Contraband
   id: ClothingHeadHatParamedicsoft
   name: paramedic cap
   description: A blue baseball cap with a cross on the front.

Resources/Prototypes/Entities/Clothing/Head/welding.yml

@@ -28,7 +28,7 @@
     additionalColorOverlay: "#000000A0"
 
 - type: entity
-  parent: WeldingMaskBase
+  parent: [BaseCorvaxContraband431DepartmentsEngineering, WeldingMaskBase] # Corvax-Contraband
   id: ClothingHeadHatWelding
   name: welding mask
   description: A head-mounted face cover designed to protect the wearer completely from space-arc eye.

Resources/Prototypes/Entities/Clothing/Masks/masks.yml

@@ -21,7 +21,7 @@
     hideOnToggle: true
 
 - type: entity
-  parent: [ClothingMaskGas, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingMaskGas, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingMaskGasSecurity
   name: security gas mask
   description: A standard issue Security gas mask.
@@ -41,7 +41,7 @@
         Heat: 0.95
 
 - type: entity
-  parent: [ClothingMaskGas, BaseSyndicateContraband]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingMaskGas, BaseSyndicateContraband] # Corvax-Contraband
   id: ClothingMaskGasSyndicate
   name: syndicate gas mask
   description: A close-fitting tactical mask that can be connected to an air supply.
@@ -398,7 +398,7 @@
     relayAccent: true
 
 - type: entity
-  parent: [ ClothingMaskGas, BaseSecurityContraband ]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingMaskGas, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingMaskGasSwat
   name: swat gas mask
   description: A elite issue Security gas mask.

Resources/Prototypes/Entities/Clothing/Multiple/towel.yml

@@ -134,7 +134,7 @@
 - type: entity
   id: TowelColorSyndicate
   name: syndicate towel
-  parent: [ BaseTowel, BaseSyndicateContraband ]
+  parent: [BaseCorvaxContraband131, BaseTowel, BaseSyndicateContraband] # Corvax-Contraband
   components:
   - type: Sprite
     layers:

Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingNeckBase
+  parent: [BaseCorvaxContraband431DepartmentsCentralCommand, ClothingNeckBase] # Corvax-Contraband
   id: ClothingNeckCloakCentcom
   name: central commander's cloak
   description: A pompous and elite green cloak with a nice gold trim, tailored specifically to the Central Commander. It's so heavy, the gold trim might be real.
@@ -10,7 +10,7 @@
     stealGroup: HeadCloak # leaving this here because I suppose it might be interesting?
 
 - type: entity
-  parent: [ClothingNeckBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsCaptain, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingNeckCloakCap
   name: captain's cloak
   description: A pompous and comfy blue cloak with a nice gold trim, while not particularly valuable as your other possessions, it sure is fancy.
@@ -21,7 +21,7 @@
     stealGroup: HeadCloak
 
 - type: entity
-  parent: [ClothingNeckBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfSecurity, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingNeckCloakHos
   name: head of security's cloak
   description: An exquisite dark and red cloak fitting for those who can assert dominance over wrongdoers. Take a stab at being civil in prosecution!
@@ -32,7 +32,7 @@
     stealGroup: HeadCloak
 
 - type: entity
-  parent: [ClothingNeckBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefEngineer, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingNeckCloakCe
   name: chief engineer's cloak
   description: A dark green cloak with light blue ornaments, given to those who proved themselves to master the precise art of engineering.
@@ -43,7 +43,7 @@
     stealGroup: HeadCloak
 
 - type: entity
-  parent: [ClothingNeckBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefMedicalOfficer, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingCloakCmo
   name: chief medical officer's cloak
   description: A sterile blue cloak with a green cross, radiating with a sense of duty and willingness to help others.
@@ -54,7 +54,7 @@
     stealGroup: HeadCloak
 
 - type: entity
-  parent: [ClothingNeckBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsResearchDirector, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingNeckCloakRd
   name: research director's cloak
   description: A white cloak with violet stripes, showing your status as the arbiter of cutting-edge technology.
@@ -65,7 +65,7 @@
     stealGroup: HeadCloak
 
 - type: entity
-  parent: [ClothingNeckBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsQuartermaster, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingNeckCloakQm
   name: quartermaster's cloak
   description: A strong brown cloak with a reflective stripe, while not as fancy as others, it does show your managing skills.
@@ -76,7 +76,7 @@
     stealGroup: HeadCloak
 
 - type: entity
-  parent: [ClothingNeckBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfPersonnel, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingNeckCloakHop
   name: head of personnel's cloak
   description: A blue cloak with red shoulders and gold buttons, proving you are the gatekeeper to any airlock on the station.
@@ -105,7 +105,7 @@
     sprite: Clothing/Neck/Cloaks/nanotrasen.rsi
 
 - type: entity
-  parent: [ClothingNeckBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsCaptain, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingNeckCloakCapFormal
   name: captain's formal cloak
   description: A lavish and decorated cloak for special occasions.

Resources/Prototypes/Entities/Clothing/Neck/mantles.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: [ClothingNeckBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsCaptain, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingNeckMantleCap
   name: captain's mantle
   description: A formal mantle to drape around the shoulders. Others stand on the shoulders of giants. You're the giant they stand on.  # Corvax-Resprite
@@ -10,7 +10,7 @@
     sprite: Clothing/Neck/mantles/capmantle.rsi
 
 - type: entity
-  parent: [ClothingNeckBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefEngineer, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingNeckMantleCE
   name: chief engineer's mantle
   description: A bright white and yellow striped mantle. Do not wear around active machinery.  # Corvax-Resprite
@@ -21,7 +21,7 @@
     sprite: Clothing/Neck/mantles/cemantle.rsi
 
 - type: entity
-  parent: [ClothingNeckBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefMedicalOfficer, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingNeckMantleCMO
   name: chief medical officer's mantle
   description: A light blue shoulder draping for THE medical professional. Contrasts well with blood.  # Corvax-Resprite
@@ -43,7 +43,7 @@
     sprite: Clothing/Neck/mantles/hopmantle.rsi
 
 - type: entity
-  parent: [ClothingNeckBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfSecurity, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingNeckMantleHOS
   name: head of security's mantle
   description: Shootouts with syndicate agents are just another Tuesday for this HoS. This mantle is a symbol of commitment to the station.
@@ -54,7 +54,7 @@
     sprite: Clothing/Neck/mantles/hosmantle.rsi
 
 - type: entity
-  parent: [ClothingNeckBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsResearchDirector, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingNeckMantleRD
   name: research director's mantle
   description: A terribly comfortable shoulder draping for the discerning scientist of fashion.  # Corvax-Resprite
@@ -65,7 +65,7 @@
     sprite: Clothing/Neck/mantles/rdmantle.rsi
 
 - type: entity
-  parent: [ClothingNeckBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsQuartermaster, ClothingNeckBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingNeckMantleQM
   name: quartermaster's mantle
   description: For the master of goods and materials to rule over the department, a befitting mantle to show off superiority!

Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml

@@ -87,7 +87,7 @@
       sprite: Clothing/Neck/Scarfs/purple.rsi
 
 - type: entity
-  parent: [ ClothingScarfBase, BaseSyndicateContraband ]
+  parent: [ ClothingScarfBase ] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingNeckScarfStripedSyndieGreen
   name: striped syndicate green scarf
   description: A stylish striped syndicate green scarf. The perfect winter accessory for those with a keen fashion sense, and those who are in the mood to steal something.
@@ -100,7 +100,7 @@
       price: 500
 
 - type: entity
-  parent: [ ClothingScarfBase, BaseSyndicateContraband ]
+  parent: [ ClothingScarfBase ] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingNeckScarfStripedSyndieRed
   name: striped syndicate red scarf
   description: A stylish striped syndicate red scarf. The perfect winter accessory for those with a keen fashion sense, and those who are in the mood to steal something.

Resources/Prototypes/Entities/Clothing/Neck/stoles.yml

@@ -4,6 +4,12 @@
   name: chaplain stole
   description: An elegantly designed stole, with a vibrant gold plus on either end.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Chaplain, ERTChaplain]
+  # Corvax-Contraband-end
   - type: Sprite
     sprite: Clothing/Neck/Stoles/chaplain.rsi
   - type: Clothing

Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml

@@ -26,7 +26,7 @@
 
 #Standard armor vest, allowed for security only
 - type: entity
-  parent: [ BaseSecurityContraband, ClothingOuterArmorBase ]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, BaseSecurityContraband, ClothingOuterArmorBase] # Corvax-Contraband
   id: ClothingOuterArmorBasic
   components:
   - type: Tag
@@ -41,6 +41,12 @@
   suffix: slim
   description: A slim Type I armored vest that provides decent protection against most types of damage.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax432
+    allowedDepartments: [Security]
+    allowedJobs: [Bartender]
+  # Corvax-Contraband-end
   - type: Sprite
     sprite: Clothing/OuterClothing/Armor/security_slim.rsi
   - type: Clothing
@@ -122,6 +128,12 @@
   name: captain's carapace
   description: An armored chestpiece that provides protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax432
+    allowedDepartments: [Command]
+    allowedJobs: []
+  # Corvax-Contraband-end
   - type: Sprite
     sprite: Clothing/OuterClothing/Armor/captain_carapace.rsi
   - type: Clothing
@@ -131,7 +143,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: [ClothingOuterArmorBaseCarapace, BaseCentcommContraband]
+  parent: [BaseCorvaxContraband432DepartmentsCentralCommand, ClothingOuterArmorBaseCarapace, BaseCentcommContraband] # Corvax-Contraband
   id: ClothingOuterArmorCentcommCarapace
   name: centcomm carapace
   description: An armored chestpiece that provides protection whilst still offering maximum mobility and flexibility. Issued only to centcomm officials and agents.
@@ -143,7 +155,7 @@
 
 #Web vest
 - type: entity
-  parent: [ClothingOuterArmorBase, ClothingOuterStorageBase, BaseSyndicateContraband]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterArmorBase, ClothingOuterStorageBase, BaseSyndicateContraband] # Corvax-Contraband
   id: ClothingOuterVestWeb
   name: web vest
   description: A synthetic armor vest. This one has added webbing and ballistic plates.
@@ -164,7 +176,7 @@
 
 #Elite web vest
 - type: entity
-  parent: [ClothingOuterArmorBase, TemperatureProtection, ClothingOuterStorageBase, BaseSyndicateContraband]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterArmorBase, TemperatureProtection, ClothingOuterStorageBase, BaseSyndicateContraband] # Corvax-Contraband
   id: ClothingOuterVestWebElite
   name: elite web vest
   description: A synthetic armor vest. This one has added webbing and heat resistant fibers.
@@ -189,7 +201,7 @@
 
 #Mercenary web vest
 - type: entity
-  parent: [ BaseMajorContraband, ClothingOuterVestWeb] #web vest so it should have some pockets for ammo
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, BaseMajorContraband, ClothingOuterVestWeb] # Corvax-Contraband; web vest so it should have some pockets for ammo
   id: ClothingOuterVestWebMerc
   name: mercenary web vest
   description: A high-quality armored vest made from a hard synthetic material. It's surprisingly flexible and light, despite formidable armor plating.
@@ -209,7 +221,7 @@
 
 # Armor covering multiple body parts including limbs
 - type: entity
-  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseSyndicateContraband ]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseSyndicateContraband] # Corvax-Contraband
   id: ClothingOuterArmorRaid
   name: syndicate raid suit
   description: A somewhat flexible and well-armored suit with a powerful shoulder mounted flashlight manufactured in the Gorlex Marauder's iconic blood-red color scheme, it does not protect its wearer from space.
@@ -283,7 +295,7 @@
     size: Normal
 
 - type: entity
-  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingOuterArmorRiot
   name: riot suit
   description: A suit of semi-flexible polycarbonate body armor with heavy padding to protect against melee attacks. Perfect for fighting delinquents around the station.
@@ -305,7 +317,7 @@
   - type: GroupExamine
 
 - type: entity
-  parent: [ ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing ]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing] # Corvax-Contraband
   id: ClothingOuterArmorCult
   name: acolyte armor
   description: An evil-looking piece of cult armor, made of bones.
@@ -391,7 +403,7 @@
     sprite: Clothing/OuterClothing/Armor/magusred.rsi
 
 - type: entity
-  parent: [ ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing ]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing] # Corvax-Contraband
   id: ClothingOuterArmorChangeling
   name: chitinous armor
   description: Inflates the changeling's body into an all-consuming chitinous mass of armor.
@@ -419,7 +431,7 @@
     slots: WITHOUT_POCKET
 
 - type: entity
-  parent: [ ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing ]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing] # Corvax-Contraband
   id: ClothingOuterArmorBone
   name: bone armor
   description: Sits on you like a second skin.
@@ -448,7 +460,7 @@
     slots: WITHOUT_POCKET
 
 - type: entity
-  parent: [ ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing ]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing] # Corvax-Contraband
   id: ClothingOuterArmorPodWars
   name: ironclad II armor
   description: A repurposed suit of ironclad II armor, a relic of the pod wars.

Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml

@@ -39,7 +39,7 @@
 
 
 - type: entity
-  parent: ClothingOuterCoatDetective
+  parent: [BaseCorvaxContraband431DepartmentsSecurityJobsDetective, ClothingOuterCoatDetective] # Corvax-Contraband
   id: ClothingOuterCoatDetectiveLoadout
   components:
   - type: EntityTableContainerFill
@@ -89,7 +89,7 @@
         Caustic: 0.9
 
 - type: entity
-  parent: [BaseSecurityCommandContraband, ClothingOuterArmorHoS]
+  parent: [BaseCorvaxContraband431DepartmentsCommandSecurityJobsHeadOfSecurity, BaseSecurityCommandContraband, ClothingOuterArmorHoS] # Corvax-Contraband
   id: ClothingOuterCoatHoSTrench
   name: head of security's armored trenchcoat
   description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence.
@@ -158,7 +158,7 @@
   name: lab coat
 
 - type: entity
-  parent: ClothingOuterStorageFoldableBase
+  parent: [BaseCorvaxContraband431JobsChemist, ClothingOuterStorageFoldableBase] # Corvax-Contraband
   id: ClothingOuterCoatLabChem
   name: chemist lab coat
   description: A suit that protects against minor chemical spills. Has an orange stripe on the shoulder.
@@ -218,7 +218,7 @@
   name: geneticist lab coat
 
 - type: entity
-  parent: ClothingOuterStorageFoldableBase
+  parent: [BaseCorvaxContraband431JobsChiefMedicalOfficer, ClothingOuterStorageFoldableBase] # Corvax-Contraband
   id: ClothingOuterCoatLabCmo
   name: chief medical officer's lab coat
   description: Custom made blue lab coat for the Chief Medical Officer, offers improved protection against chemical spills and minor cuts.
@@ -240,7 +240,7 @@
   name: chief medical officer's lab coat
 
 - type: entity
-  parent: ClothingOuterStorageFoldableBase
+  parent: [BaseCorvaxContraband431JobsScientist, ClothingOuterStorageFoldableBase] # Corvax-Contraband
   id: ClothingOuterCoatRnd
   name: scientist lab coat
   description: A suit that protects against minor chemical spills. Has a purple stripe on the shoulder.
@@ -280,7 +280,7 @@
   name: roboticist lab coat
 
 - type: entity
-  parent: ClothingOuterStorageFoldableBase
+  parent: [BaseCorvaxContraband431JobsResearchDirector, ClothingOuterStorageFoldableBase] # Corvax-Contraband
   id: ClothingOuterCoatRD
   name: research director lab coat
   description: Woven with top of the line technology, this labcoat helps protect against radiation in similar way to the experimental hardsuit.
@@ -312,7 +312,7 @@
     sprite: Clothing/OuterClothing/Coats/pirate.rsi
 
 - type: entity
-  parent: [ClothingOuterArmorWarden, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband431DepartmentsSecurityJobsWarden, ClothingOuterArmorWarden, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingOuterCoatWarden
   name: warden's armored jacket
   description: A sturdy, utilitarian jacket designed to protect a warden from any brig-bound threats.
@@ -362,7 +362,7 @@
         Piercing: 0.85
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [BaseCorvaxContraband431JobsParamedic, ClothingOuterStorageBase] # Corvax-Contraband
   id: ClothingOuterCoatParamedicWB
   name: paramedic windbreaker
   description: A paramedic's trusty windbreaker, for all the space wind.
@@ -384,7 +384,7 @@
     sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi
 
 - type: entity
-  parent: [BaseSyndicateContraband, ClothingOuterCoatHoSTrench] # BaseSyndicateContraband as first parent so contraband system takes that as priority, yeah I know
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, BaseSyndicateContraband, ClothingOuterCoatHoSTrench] # Corvax-Contraband; BaseSyndicateContraband as first parent so contraband system takes that as priority, yeah I know
   id: ClothingOuterCoatSyndieCapArmored
   name: syndicate's armored coat
   description: The syndicate's armored coat is made of durable fabric, with gilded patterns.
@@ -395,7 +395,7 @@
     sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [BaseCorvaxContraband431JobsBrigmedic, ClothingOuterStorageBase] # Corvax-Contraband
   id: ClothingOuterCoatAMG
   name: armored medical gown
   description: The version of the medical gown, with elements of a bulletproof vest, looks strange, but your heart is protected.
@@ -414,7 +414,7 @@
         Caustic: 0.75
 
 - type: entity
-  parent: ClothingOuterStorageFoldableBase
+  parent: [BaseCorvaxContraband431JobsScientistSeniorResearcher, ClothingOuterStorageFoldableBase] # Corvax-Contraband
   id: ClothingOuterCoatLabSeniorResearcher
   name: senior researcher lab coat
   description: A suit that protects against minor chemical spills. Has a purple collar and wrist trims.

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -110,7 +110,7 @@
 
 #Salvage Hardsuit
 - type: entity
-  parent: [ClothingOuterHardsuitBase, BaseCargoContraband]
+  parent: [BaseCorvaxContraband432DepartmentsCargoSecurity, ClothingOuterHardsuitBase, BaseCargoContraband] # Corvax-Contraband
   id: ClothingOuterHardsuitSalvage
   name: mining hardsuit
   description: A special suit that protects against hazardous, low pressure environments. Has reinforced plating for wildlife encounters.
@@ -146,7 +146,7 @@
 
 #Goliath Hardsuit
 - type: entity
-  parent: [ClothingOuterHardsuitBase, BaseCargoContraband]
+  parent: [BaseCorvaxContraband432DepartmentsCargoSecurity, ClothingOuterHardsuitBase, BaseCargoContraband] # Corvax-Contraband
   id: ClothingOuterHardsuitGoliath
   name: goliath hardsuit
   description: A lightweight hardsuit, adorned with a patchwork of thick, chitinous goliath hide.
@@ -215,7 +215,7 @@
 
 #Security Hardsuit
 - type: entity
-  parent: [ClothingOuterHardsuitBase, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterHardsuitBase, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingOuterHardsuitSecurity
   name: security hardsuit
   description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
@@ -250,7 +250,7 @@
 
 #Brigmedic Hardsuit
 - type: entity
-  parent: [ClothingOuterHardsuitBase, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterHardsuitBase, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingOuterHardsuitBrigmedic
   name: brigmedic hardsuit
   description: Special hardsuit of the guardian angel of the brig. It is the medical version of the security hardsuit.
@@ -277,7 +277,7 @@
 
 #Warden's Hardsuit
 - type: entity
-  parent: [ClothingOuterHardsuitBase, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, ClothingOuterHardsuitBase, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingOuterHardsuitWarden
   name: warden's hardsuit
   description: A specialized riot suit geared to combat low pressure environments.
@@ -458,7 +458,7 @@
 
 #Head of Security's Hardsuit
 - type: entity
-  parent: [ClothingOuterHardsuitBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband432DepartmentsCommandSecurity, ClothingOuterHardsuitBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingOuterHardsuitSecurityRed
   name: head of security's hardsuit
   description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
@@ -847,7 +847,7 @@
 #CENTCOMM / ERT HARDSUITS
 #ERT Leader Hardsuit
 - type: entity
-  parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndieCommander ]
+  parent: [BaseCorvaxContraband432DepartmentsCentralCommand, BaseCentcommContraband, ClothingOuterHardsuitSyndieCommander] # Corvax-Contraband
   id: ClothingOuterHardsuitERTLeader
   name: ERT leader's hardsuit
   description: A protective hardsuit worn by the leader of an emergency response team.
@@ -865,7 +865,7 @@
 
 #ERT Chaplain Hardsuit
 - type: entity
-  parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndie ]
+  parent: [BaseCorvaxContraband432DepartmentsCentralCommand, BaseCentcommContraband, ClothingOuterHardsuitSyndie] # Corvax-Contraband
   id: ClothingOuterHardsuitERTChaplain
   name: ERT chaplain's hardsuit
   description: A protective hardsuit worn by the chaplains of an Emergency Response Team.
@@ -883,7 +883,7 @@
 
 #ERT Engineer Hardsuit
 - type: entity
-  parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndieElite ]
+  parent: [BaseCorvaxContraband432DepartmentsCentralCommand, BaseCentcommContraband, ClothingOuterHardsuitSyndieElite] # Corvax-Contraband
   id: ClothingOuterHardsuitERTEngineer
   name: ERT engineer's hardsuit
   description: A protective hardsuit worn by the engineers of an emergency response team.
@@ -903,7 +903,7 @@
 
 #ERT Medic Hardsuit
 - type: entity
-  parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndieMedic ]
+  parent: [BaseCorvaxContraband432DepartmentsCentralCommand, BaseCentcommContraband, ClothingOuterHardsuitSyndieMedic] # Corvax-Contraband
   id: ClothingOuterHardsuitERTMedical
   name: ERT medic's hardsuit
   description: A protective hardsuit worn by the medics of an emergency response team.
@@ -921,7 +921,7 @@
 
 #ERT Security Hardsuit
 - type: entity
-  parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndie ]
+  parent: [BaseCorvaxContraband432DepartmentsCentralCommand, BaseCentcommContraband, ClothingOuterHardsuitSyndie] # Corvax-Contraband
   id: ClothingOuterHardsuitERTSecurity
   name: ERT security's hardsuit
   description: A protective hardsuit worn by the security officers of an emergency response team.
@@ -943,7 +943,7 @@
 
 #ERT Janitor Hardsuit
 - type: entity
-  parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndieElite ]
+  parent: [BaseCorvaxContraband432DepartmentsCentralCommand, BaseCentcommContraband, ClothingOuterHardsuitSyndieElite] # Corvax-Contraband
   id: ClothingOuterHardsuitERTJanitor
   name: ERT janitor's hardsuit
   description: A protective hardsuit worn by the janitors of an emergency response team.
@@ -961,7 +961,7 @@
 
 #Deathsquad
 - type: entity
-  parent: [ BaseCentcommContraband, ClothingOuterHardsuitBase ]
+  parent: [BaseCorvaxContraband432DepartmentsCentralCommand, BaseCentcommContraband, ClothingOuterHardsuitBase] # Corvax-Contraband
   id: ClothingOuterHardsuitDeathsquad
   name: death squad hardsuit
   description: An advanced hardsuit favored by commandos for use in special operations.

Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml

@@ -30,7 +30,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [BaseCorvaxContraband431JobsBotanist, ClothingOuterStorageBase] # Corvax-Contraband
   id: ClothingOuterApronBotanist
   name: apron
   suffix: Botanical
@@ -46,7 +46,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [BaseCorvaxContraband431JobsChef, ClothingOuterStorageBase] # Corvax-Contraband
   id: ClothingOuterApronChef
   name: apron
   suffix: Chef
@@ -62,7 +62,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [BaseCorvaxContraband431JobsChef, ClothingOuterStorageBase] # Corvax-Contraband
   id: ClothingOuterJacketChef
   name: chef jacket
   description: An apron-jacket used by a high class chef.
@@ -111,7 +111,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingOuterBaseToggleable
+  parent: [BaseCorvaxContraband431JobsChaplain, ClothingOuterBaseToggleable] # Corvax-Contraband
   id: ClothingOuterHoodieChaplain
   name: chaplain's hoodie
   description: Black and strict chaplain hoodie.

Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml

@@ -51,7 +51,7 @@
 
 # The armor itself
 - type: entity
-  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseMajorContraband]
+  parent: [BaseCorvaxContraband432DepartmentsCargoSecurity, ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseMajorContraband] # Corvax-Contraband
   id: ClothingOuterArmorScrap
   name: scrap armor
   description: A tider's gleaming plate mail. Bail up, or you're a dead man.

Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml

@@ -17,7 +17,7 @@
 
 #Syndicate EVA
 - type: entity
-  parent: [ ClothingOuterEVASuitBase, BaseSyndicateContraband ]
+  parent: [ ClothingOuterEVASuitBase ] # Corvax-Contraband deleted - BaseSyndicateContraband
   id: ClothingOuterEVASuitSyndicate
   name: syndicate EVA suit
   description: "Has a tag on the back that reads: 'Totally not property of an enemy corporation, honest!'"

Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml

@@ -41,7 +41,7 @@
         ents: []
 
 - type: entity
-  parent: ClothingOuterWinterCoatToggleable
+  parent: [BaseCorvaxContraband431JobsAtmosphericTechnicianSeniorEngineer, ClothingOuterWinterCoatToggleable] # Corvax-Contraband
   id: ClothingOuterWinterAtmos
   name: atmospherics winter coat
   components:
@@ -87,7 +87,7 @@
     clothingPrototype: ClothingHeadHatHoodWinterBartender
 
 - type: entity
-  parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsCaptain, ClothingOuterWinterCoatToggleable, BaseCommandContraband] # Corvax-Contraband
   id: ClothingOuterWinterCap
   name: captain's winter coat
   components:
@@ -110,7 +110,7 @@
     clothingPrototype: ClothingHeadHatHoodWinterCaptain
 
 - type: entity
-  parent: ClothingOuterWinterCoatToggleable
+  parent: [BaseCorvaxContraband431JobsCargoTechnician, ClothingOuterWinterCoatToggleable] # Corvax-Contraband
   id: ClothingOuterWinterCargo
   name: cargo winter coat
   components:
@@ -133,7 +133,7 @@
     clothingPrototype: ClothingHeadHatHoodWinterCargo
 
 - type: entity
-  parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefEngineer, ClothingOuterWinterCoatToggleable, BaseCommandContraband] # Corvax-Contraband
   id: ClothingOuterWinterCE
   name: chief engineer's winter coat
   components:
@@ -179,7 +179,7 @@
     clothingPrototype: ClothingHeadHatHoodWinterCentcom
 
 - type: entity
-  parent: ClothingOuterWinterCoat
+  parent: [BaseCorvaxContraband431JobsChef, ClothingOuterWinterCoat] # Corvax-Contraband
   id: ClothingOuterWinterChef
   name: chef's freezer coat
   description: A coat specifically designed for work inside cold storage, sorely needed by cold-blooded lizard chefs.
@@ -201,7 +201,7 @@
       - state: CHEF-equipped-OUTERCLOTHING
 
 - type: entity
-  parent: ClothingOuterWinterCoatToggleable
+  parent: [BaseCorvaxContraband431JobsChemist, ClothingOuterWinterCoatToggleable] # Corvax-Contraband
   id: ClothingOuterWinterChem
   name: chemistry winter coat
   components:
@@ -231,7 +231,7 @@
     clothingPrototype: ClothingHeadHatHoodWinterChem
 
 - type: entity
-  parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefMedicalOfficer, ClothingOuterWinterCoatToggleable, BaseCommandContraband] # Corvax-Contraband
   id: ClothingOuterWinterCMO
   name: chief medical officer's winter coat
   components:
@@ -271,7 +271,7 @@
     sprite: Clothing/OuterClothing/WinterCoats/coatclown.rsi
 
 - type: entity
-  parent: ClothingOuterWinterCoatToggleable
+  parent: [BaseCorvaxContraband431JobsSeniorEngineerStationEngineer, ClothingOuterWinterCoatToggleable] # Corvax-Contraband
   id: ClothingOuterWinterEngi
   name: engineering winter coat
   components:
@@ -324,7 +324,7 @@
     clothingPrototype: ClothingHeadHatHoodWinterSci
 
 - type: entity
-  parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfPersonnel, ClothingOuterWinterCoatToggleable, BaseCommandContraband] # Corvax-Contraband
   id: ClothingOuterWinterHoP
   name: head of personnel's winter coat
   components:
@@ -349,7 +349,7 @@
 
 ##########################################################
 - type: entity
-  parent: [ClothingOuterArmorHoS, ClothingOuterWinterCoatToggleable, BaseSecurityCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandSecurityJobsHeadOfSecurity, ClothingOuterArmorHoS, ClothingOuterWinterCoatToggleable, BaseSecurityCommandContraband] # Corvax-Contraband
   id: ClothingOuterWinterHoS
   name: head of security's armored winter coat
   description: A sturdy, utilitarian winter coat designed to protect a head of security from any brig-bound threats and hypothermic events.
@@ -415,7 +415,7 @@
     clothingPrototype: ClothingHeadHatHoodWinterHydro
 
 - type: entity
-  parent: ClothingOuterWinterCoatToggleable
+  parent: [BaseCorvaxContraband431JobsJanitor, ClothingOuterWinterCoatToggleable] # Corvax-Contraband
   id: ClothingOuterWinterJani
   name: janitorial winter coat
   components:
@@ -445,7 +445,7 @@
     clothingPrototype: ClothingHeadHatHoodWinterJani
 
 - type: entity
-  parent: ClothingOuterWinterCoatToggleable
+  parent: [BaseCorvaxContraband431JobsMedicalDoctor, ClothingOuterWinterCoatToggleable] # Corvax-Contraband
   id: ClothingOuterWinterMed
   name: medical winter coat
   components:
@@ -521,7 +521,7 @@
     clothingPrototype: ClothingHeadHatHoodWinterMiner
 
 - type: entity
-  parent: ClothingOuterWinterCoatToggleable
+  parent: [BaseCorvaxContraband431JobsParamedic, ClothingOuterWinterCoatToggleable] # Corvax-Contraband
   id: ClothingOuterWinterPara
   name: paramedic winter coat
   components:
@@ -551,7 +551,7 @@
     clothingPrototype: ClothingHeadHatHoodWinterPara
 
 - type: entity
-  parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsQuartermaster, ClothingOuterWinterCoatToggleable, BaseCommandContraband] # Corvax-Contraband
   id: ClothingOuterWinterQM
   name: quartermaster's winter coat
   components:
@@ -575,7 +575,7 @@
 
 
 - type: entity
-  parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsResearchDirector, ClothingOuterWinterCoatToggleable, BaseCommandContraband] # Corvax-Contraband
   id: ClothingOuterWinterRD
   name: research director's winter coat
   components:
@@ -629,7 +629,7 @@
 
 
 - type: entity
-  parent: ClothingOuterWinterCoatToggleable
+  parent: [BaseCorvaxContraband431JobsScientist, ClothingOuterWinterCoatToggleable] # Corvax-Contraband
   id: ClothingOuterWinterSci
   name: science winter coat
   components:
@@ -659,7 +659,7 @@
     clothingPrototype: ClothingHeadHatHoodWinterSci
 
 - type: entity
-  parent: [ClothingOuterWinterCoatToggleable, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband431DepartmentsSecurityJobsBrigmedicDetectiveSecurityOfficerSeniorOfficer, ClothingOuterWinterCoatToggleable, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingOuterWinterSec
   name: security winter coat
   components:
@@ -713,7 +713,7 @@
 
 ################################################################
 - type: entity
-  parent: [ClothingOuterArmorWarden, ClothingOuterWinterCoatToggleable, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband431DepartmentsSecurityJobsWarden, ClothingOuterArmorWarden, ClothingOuterWinterCoatToggleable, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingOuterWinterWarden
   name: warden's armored winter coat
   description: A sturdy, utilitarian winter coat designed to protect a warden from any brig-bound threats and hypothermic events.
@@ -756,7 +756,7 @@
     clothingPrototype: ClothingHeadHatHoodWinterWarden
 
 - type: entity
-  parent: [ClothingOuterWinterCoatToggleable, BaseSyndicateContraband]
+  parent: [ClothingOuterWinterCoatToggleable] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingOuterWinterSyndieCap
   name: syndicate's winter coat
   description: "The syndicate's winter coat is made of durable fabric, with gilded patterns, and coarse wool."
@@ -781,7 +781,7 @@
 
 ##############################################################
 - type: entity
-  parent: [ BaseSyndicateContraband, ClothingOuterWinterWarden ]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, BaseSyndicateContraband, ClothingOuterWinterWarden] # Corvax-Contraband
   id: ClothingOuterWinterSyndieCapArmored
   name: syndicate's armored winter coat
   description: "The syndicate's armored winter coat is made of durable fabric, with gilded patterns, and coarse wool."
@@ -795,7 +795,7 @@
 ##############################################################
 
 - type: entity
-  parent: [ClothingOuterWinterCoatToggleable, BaseSyndicateContraband]
+  parent: [ClothingOuterWinterCoatToggleable] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingOuterWinterSyndie
   name: syndicate's winter coat
   description: Insulated winter coat, looks like a merch from "Syndieland".

Resources/Prototypes/Entities/Clothing/Shoes/boots.yml

@@ -168,7 +168,7 @@
     sprite: Clothing/Shoes/Boots/winterbootssec.rsi
 
 - type: entity
-  parent: [ClothingShoesBaseWinterBoots, BaseSyndicateContraband]
+  parent: [ClothingShoesBaseWinterBoots] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingShoesBootsWinterSyndicate
   name: syndicate's winter boots
   description: Durable heavy boots, looks like merch from "Syndieland".

Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml

@@ -40,7 +40,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: [ClothingShoesBootsMagBase]
+  parent: [BaseCorvaxContraband431DepartmentsEngineering, ClothingShoesBootsMagBase] # Corvax-Contraband
   id: ClothingShoesBootsMag
 
 - type: entity
@@ -67,7 +67,7 @@
     stealGroup: ClothingShoesBootsMagAdv
 
 - type: entity
-  parent: [ClothingShoesBootsMagBase]
+  parent: [BaseCorvaxContraband431DepartmentsScience, ClothingShoesBootsMagBase] # Corvax-Contraband
   id: ClothingShoesBootsMagSci
   components:
   - type: Sprite
@@ -88,7 +88,7 @@
     price: 3000
 
 - type: entity
-  parent: [ClothingShoesBootsMagBase, BaseJetpack, BaseSyndicateContraband]
+  parent: [ClothingShoesBootsMagBase, BaseJetpack] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingShoesBootsMagSyndie
   name: blood-red magboots
   description: Reverse-engineered from ERT magboots, they have a heavy magnetic pull and integrated thrusters. It can hold 0.75 L of gas.

Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/cargo.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: [BaseCorvaxContraband431JobsCargoTechnician, ClothingUniformSkirtBase] # Corvax-Contraband
   id: ClothingUniformJumpskirtCargo
   name: cargo tech jumpskirt
   description: A sturdy jumpskirt, issued to members of the Cargo department.
@@ -10,7 +10,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Cargo/cargotech.rsi
 
 - type: entity
-  parent: [ClothingUniformSkirtBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsQuartermaster, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpskirtQM
   name: quartermaster's jumpskirt
   description: 'What can brown do for you?'
@@ -21,7 +21,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Cargo/qm.rsi
 
 - type: entity
-  parent: [ClothingUniformSkirtBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsQuartermaster, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpskirtQMTurtleneck
   name: quartermasters's turtleneck
   description: A sharp turtleneck made for the hardy work environment of supply.

Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/command.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: [ClothingUniformSkirtBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsCaptain, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpskirtCaptain
   name: captain's jumpskirt
   description: It's a blue jumpskirt with some gold markings denoting the rank of "Captain".
@@ -10,7 +10,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Command/captain.rsi
 
 - type: entity
-  parent: [ClothingUniformSkirtBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfPersonnel, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpskirtHoP
   name: head of personnel's jumpskirt
   description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
@@ -32,7 +32,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Command/commandgeneric.rsi
 
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: [BaseCorvaxContraband431JobsCaptain, ClothingUniformSkirtBase] # Corvax-Contraband
   id: ClothingUniformJumpskirtCapFormalDress
   name: captain's formal dress
   description: A dress for special occasions.

Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/engineering.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: [ClothingUniformSkirtBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefEngineer, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpskirtChiefEngineer
   name: chief engineer's jumpskirt
   description: It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of Chief Engineer.
@@ -10,7 +10,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Engineering/ce.rsi
 
 - type: entity
-  parent: [ClothingUniformSkirtBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefEngineer, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpskirtChiefEngineerTurtle
   name: chief engineer's turtleneck
   description: A yellow turtleneck designed specifically for work in conditions of the engineering department.
@@ -21,7 +21,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Engineering/ce_turtle.rsi
 
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: [BaseCorvaxContraband431JobsStationEngineer, ClothingUniformSkirtBase] # Corvax-Contraband
   id: ClothingUniformJumpskirtEngineering
   name: engineering jumpskirt
   description: If this suit was non-conductive, maybe engineers would actually do their damn job.
@@ -32,7 +32,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Engineering/engineering.rsi
 
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: [BaseCorvaxContraband431JobsAtmosphericTechnician, ClothingUniformSkirtBase] # Corvax-Contraband
   id: ClothingUniformJumpskirtAtmos
   name: atmospheric technician jumpskirt
   description: I am at work. I can't leave work. Work is breathing. I am testing air quality.
@@ -43,7 +43,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Engineering/atmosf.rsi
 
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: [BaseCorvaxContraband431JobsSeniorEngineerStationEngineer, ClothingUniformSkirtBase] # Corvax-Contraband
   id: ClothingUniformJumpskirtSeniorEngineer
   name: senior engineer jumpskirt
   description: A sign of skill and prestige within the engineering department.

Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/medical.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: [BaseCorvaxContraband431JobsChemist, ClothingUniformSkirtBase] # Corvax-Contraband
   id: ClothingUniformJumpskirtChemistry
   name: chemistry jumpskirt
   description: There's some odd stains on this jumpskirt. Hm.
@@ -32,7 +32,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Medical/genetics.rsi
 
 - type: entity
-  parent: [ClothingUniformSkirtBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefMedicalOfficer, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpskirtCMO
   name: chief medical officer's jumpskirt
   description: It's a jumpskirt worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
@@ -43,7 +43,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Medical/cmo.rsi
 
 - type: entity
-  parent: [ClothingUniformSkirtBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefMedicalOfficer, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpskirtCMOTurtle
   name: chief medical officer's turtleneck jumpskirt
   description: It's a turtleneck worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
@@ -54,7 +54,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Medical/cmo_turtle.rsi
 
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: [BaseCorvaxContraband431JobsMedicalDoctor, ClothingUniformSkirtBase] # Corvax-Contraband
   id: ClothingUniformJumpskirtMedicalDoctor
   name: medical doctor jumpskirt
   description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel.
@@ -65,7 +65,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Medical/medical.rsi
 
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: [BaseCorvaxContraband431JobsParamedic, ClothingUniformSkirtBase] # Corvax-Contraband
   id: ClothingUniformJumpskirtParamedic
   name: paramedic jumpskirt
   description: It's got a plus on it, that's a good thing right?

Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/science.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: [ClothingUniformSkirtBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsResearchDirector, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpskirtResearchDirector
   name: research director's turtleneck
   description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
@@ -10,7 +10,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Science/rnd.rsi
 
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: [BaseCorvaxContraband431JobsScientist, ClothingUniformSkirtBase] # Corvax-Contraband
   id: ClothingUniformJumpskirtScientist
   name: scientist jumpskirt
   description: It's made of a special fiber that increases perceived intelligence and decreases personal ethics. It has markings that denote the wearer as a scientist.
@@ -32,7 +32,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Science/roboticist.rsi
 
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: [BaseCorvaxContraband431JobsScientistSeniorResearcher, ClothingUniformSkirtBase] # Corvax-Contraband
   id: ClothingUniformJumpskirtSeniorResearcher
   name: senior researcher jumpskirt
   description: A sign of skill and prestige within the science department.

Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/security.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: [BaseCorvaxContraband431JobsDetective, ClothingUniformSkirtBase] # Corvax-Contraband
   id: ClothingUniformJumpskirtDetective
   name: hard-worn suitskirt
   description: Someone who wears this means business.
@@ -10,7 +10,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Security/detective.rsi
 
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: [BaseCorvaxContraband431JobsDetective, ClothingUniformSkirtBase] # Corvax-Contraband
   id: ClothingUniformJumpskirtDetectiveGrey
   name: noir suitskirt
   description: A hard-boiled private investigator's grey suit, complete with tie clip.
@@ -21,7 +21,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Security/detective_grey.rsi
 
 - type: entity
-  parent: [ClothingUniformSkirtBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfSecurity, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpskirtHoS
   name: head of security's jumpskirt
   description: It's bright red and rather crisp, much like security's victims tend to be.
@@ -46,7 +46,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Security/hos.rsi
 
 - type: entity
-  parent: [ClothingUniformSkirtBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfSecurity, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpskirtHoSAlt
   name: head of security's turtleneck
   description: It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security.
@@ -68,7 +68,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Security/hos_parade.rsi
 
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: [BaseCorvaxContraband431JobsBrigmedic, ClothingUniformSkirtBase] # Corvax-Contraband
   id: ClothingUniformJumpskirtBrigmedic
   name: brigmedic jumpskirt
   description: This uniform is issued to qualified personnel who have been trained. No one cares that the training took half a day.
@@ -119,7 +119,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: [ClothingUniformSkirtBase, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband431DepartmentsSecurityJobsSecurityOfficer, ClothingUniformSkirtBase, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingUniformJumpskirtSec
   name: security jumpskirt
   description: A jumpskirt made of strong material, providing robust protection.
@@ -144,7 +144,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Security/security.rsi
 
 - type: entity
-  parent: [ClothingUniformSkirtBase, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband431DepartmentsSecurityJobsWarden, ClothingUniformSkirtBase, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingUniformJumpskirtWarden
   name: warden's uniform
   description: A formal security suit for officers complete with Nanotrasen belt buckle.
@@ -169,7 +169,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Security/warden.rsi
 
 - type: entity
-  parent: [ClothingUniformSkirtBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfSecurity, ClothingUniformSkirtBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpskirtHosFormal
   name: hos's formal dress
   description: A dress for special occasions.
@@ -180,7 +180,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Security/hosformaldress.rsi
 
 - type: entity
-  parent: [ClothingUniformSkirtBase, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband431DepartmentsSecurityJobsSecurityOfficerSeniorOfficer, ClothingUniformSkirtBase, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingUniformJumpskirtSeniorOfficer
   name: senior officer jumpskirt
   description: A sign of skill and prestige within the security department.
@@ -191,7 +191,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Security/senior_officer.rsi
 
 - type: entity
-  parent: [ClothingUniformSkirtBase, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband431DepartmentsSecurityJobsSecurityCadetSecurityOfficer, ClothingUniformSkirtBase, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingUniformJumpskirtSecGrey
   name: grey security jumpskirt
   description: A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood.

Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/service.yml

@@ -10,7 +10,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Service/bartender.rsi
 
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: [BaseCorvaxContraband431JobsChaplain, ClothingUniformSkirtBase] # Corvax-Contraband
   id: ClothingUniformJumpskirtChaplain
   name: chaplain's jumpskirt
   description: It's a black jumpskirt, often worn by religious folk.
@@ -21,7 +21,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Service/chaplain.rsi
 
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: [BaseCorvaxContraband431JobsChef, ClothingUniformSkirtBase] # Corvax-Contraband
   id: ClothingUniformJumpskirtChef
   name: chef uniform
   description: Can't cook without this.
@@ -43,7 +43,7 @@
     sprite: Clothing/Uniforms/Jumpskirts/Service/hydro.rsi
 
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: [BaseCorvaxContraband431JobsJanitor, ClothingUniformSkirtBase] # Corvax-Contraband
   id: ClothingUniformJumpskirtJanitor
   name: janitor jumpskirt
   description: The jumpskirt for the poor sop with a mop.

Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/cargo.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: [ClothingUniformBase, ClothingUniformFoldableBase]
+  parent: [BaseCorvaxContraband431JobsCargoTechnician, ClothingUniformBase, ClothingUniformFoldableBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitCargo
   name: cargo tech jumpsuit
   description: A sturdy jumpsuit, issued to members of the Cargo department.
@@ -8,7 +8,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Cargo/cargotech.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, ClothingUniformFoldableBase]
+  parent: [BaseCorvaxContraband431JobsSalvageSpecialist, ClothingUniformBase, ClothingUniformFoldableBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitSalvageSpecialist
   name: salvage specialist's jumpsuit
   description: It's a snappy jumpsuit with a sturdy set of overalls. It's very dirty.
@@ -17,7 +17,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Cargo/salvage.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsQuartermaster, ClothingUniformBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpsuitQM
   name: quartermaster's jumpsuit
   description: 'What can brown do for you?'
@@ -28,7 +28,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Cargo/qm.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsQuartermaster, ClothingUniformBase, ClothingUniformFoldableBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpsuitQMTurtleneck
   name: quartermasters's turtleneck
   description: A sharp turtleneck made for the hardy work environment of supply.
@@ -39,7 +39,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Cargo/qmturtle.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsQuartermaster, ClothingUniformBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpsuitQMFormal
   name: quartermasters's formal suit
   description: Inspired by the quartermasters of military's past, the perfect outfit for supplying a formal occasion.

Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/centcomm.yml

@@ -21,7 +21,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Centcomm/centcom_agent.rsi
 
 - type: entity
-  parent: [ ClothingUniformBase, BaseCentcommContraband ]
+  parent: [BaseCorvaxContraband431DepartmentsCentralCommandJobsCentralCommandOfficial, ClothingUniformBase, BaseCentcommContraband] # Corvax-Contraband
   id: ClothingUniformJumpsuitCentcomOfficial
   name: CentComm official's jumpsuit
   description: It's a jumpsuit worn by CentComm's officials.
@@ -70,6 +70,12 @@
   name: ERT engineering uniform
   description: A special suit made for the elite engineers under CentComm.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [CentralCommand]
+    allowedJobs: [ERTEngineer]
+  # Corvax-Contraband-end
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuits/Centcomm/ert_engineer.rsi
   - type: Clothing
@@ -81,6 +87,12 @@
   name: ERT janitorial uniform
   description: A special suit made for the elite janitors under CentComm.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [CentralCommand]
+    allowedJobs: [ERTJanitor]
+  # Corvax-Contraband-end
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuits/Centcomm/ert_janitor.rsi
   - type: Clothing
@@ -103,6 +115,12 @@
   name: ERT medical uniform
   description: A special suit made for the elite medics under CentComm.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [CentralCommand]
+    allowedJobs: [ERTMedical]
+  # Corvax-Contraband-end
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuits/Centcomm/ert_medic.rsi
   - type: Clothing
@@ -114,6 +132,12 @@
   name: ERT security uniform
   description: A special suit made for the elite security under CentComm.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: [CentralCommand]
+    allowedJobs: [ERTSecurity]
+  # Corvax-Contraband-end
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuits/Centcomm/ert_security.rsi
   - type: Clothing

Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/command.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: [ClothingUniformBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsCaptain, ClothingUniformBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpsuitCaptain
   name: captain's jumpsuit
   description: It's a blue jumpsuit with some gold markings denoting the rank of "Captain".
@@ -10,7 +10,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Command/captain.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBase]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfPersonnel, ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitHoP
   name: head of personnel's jumpsuit
   description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
@@ -41,7 +41,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Command/nanotrasen.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsCaptain, ClothingUniformBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpsuitCapFormal
   name: captain's formal suit
   description: A suit for special occasions.

Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/engineering.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: [ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBase]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefEngineer, ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitChiefEngineer
   name: chief engineer's jumpsuit
   description: It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of Chief Engineer.
@@ -8,7 +8,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Engineering/ce.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefEngineer, ClothingUniformBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpsuitChiefEngineerTurtle
   name: chief engineer's turtleneck
   description: A yellow turtleneck designed specifically for work in conditions of the engineering department.
@@ -19,7 +19,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Engineering/ce_turtle.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, ClothingUniformFoldableBase]
+  parent: [BaseCorvaxContraband431JobsStationEngineer, ClothingUniformBase, ClothingUniformFoldableBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitEngineering
   name: engineering jumpsuit
   description: If this suit was non-conductive, maybe engineers would actually do their damn job.
@@ -28,7 +28,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Engineering/engineering.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, ClothingUniformFoldableBase]
+  parent: [BaseCorvaxContraband431JobsStationEngineer, ClothingUniformBase, ClothingUniformFoldableBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitEngineeringHazard
   name: hazard jumpsuit
   description: Woven in a grungy, warm orange. Lets others around you know that you really mean business when it comes to work.
@@ -37,7 +37,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Engineering/engineering_hazard.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, ClothingUniformFoldableBase]
+  parent: [BaseCorvaxContraband431JobsAtmosphericTechnician, ClothingUniformBase, ClothingUniformFoldableBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitAtmos
   name: atmospheric technician jumpsuit
   description: I am at work. I can't leave work. Work is breathing. I am testing air quality.
@@ -46,7 +46,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Engineering/atmos.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, ClothingUniformFoldableBase]
+  parent: [BaseCorvaxContraband431JobsAtmosphericTechnician, ClothingUniformBase, ClothingUniformFoldableBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitAtmosCasual
   name: atmospheric technician's casual jumpsuit
   description: Might as well relax with a job as easy as yours.
@@ -55,7 +55,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Engineering/atmos_casual.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [BaseCorvaxContraband431JobsSeniorEngineerStationEngineer, ClothingUniformBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitSeniorEngineer
   name: senior engineer jumpsuit
   description: A sign of skill and prestige within the engineering department.

Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/medical.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: [ClothingUniformBase, ClothingUniformFoldableBase]
+  parent: [BaseCorvaxContraband431JobsChemist, ClothingUniformBase, ClothingUniformFoldableBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitChemistry
   name: chemistry jumpsuit
   description: There's some odd stains on this jumpsuit. Hm.
@@ -30,7 +30,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Medical/genetics.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBase]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefMedicalOfficer, ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitCMO
   name: chief medical officer's jumpsuit
   description: It's a jumpsuit worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
@@ -39,7 +39,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Medical/cmo.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsChiefMedicalOfficer, ClothingUniformBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpsuitCMOTurtle
   name: chief medical officer's turtleneck jumpsuit
   description: It's a turtleneck worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
@@ -50,7 +50,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Medical/cmo_turtle.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, ClothingUniformFoldableBase]
+  parent: [BaseCorvaxContraband431JobsMedicalDoctor, ClothingUniformBase, ClothingUniformFoldableBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitMedicalDoctor
   name: medical doctor jumpsuit
   description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel.
@@ -59,7 +59,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Medical/medical.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [BaseCorvaxContraband431JobsParamedic, ClothingUniformBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitParamedic
   name: paramedic jumpsuit
   description: It's got a plus on it, that's a good thing right?

Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/science.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: [ClothingUniformBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsResearchDirector, ClothingUniformBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpsuitResearchDirector
   name: research director's turtleneck
   description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
@@ -10,7 +10,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Science/rnd.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, ClothingUniformFoldableBase]
+  parent: [BaseCorvaxContraband431JobsScientist, ClothingUniformBase, ClothingUniformFoldableBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitScientist
   name: scientist jumpsuit
   description: It's made of a special fiber that increases perceived intelligence and decreases personal ethics. It has markings that denote the wearer as a scientist.
@@ -39,7 +39,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Science/roboticist.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [BaseCorvaxContraband431JobsScientistSeniorResearcher, ClothingUniformBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitSeniorResearcher
   name: senior researcher jumpsuit
   description: A sign of skill and prestige within the science department.

Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/security.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingUniformBase
+  parent: [BaseCorvaxContraband431JobsDetective, ClothingUniformBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitDetective
   name: hard-worn suit
   description: Someone who wears this means business.
@@ -10,7 +10,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Security/detective.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [BaseCorvaxContraband431JobsDetective, ClothingUniformBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitDetectiveGrey
   name: noir suit
   description: A hard-boiled private investigator's grey suit, complete with tie clip.
@@ -21,7 +21,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Security/detective_grey.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfSecurity, ClothingUniformBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpsuitHoS
   name: head of security's jumpsuit
   description: It's bright red and rather crisp, much like security's victims tend to be.
@@ -44,7 +44,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Security/hos.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfSecurity, ClothingUniformBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpsuitHoSAlt
   name: head of security's turtleneck
   description: It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security.
@@ -88,7 +88,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Security/hos_parade.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [BaseCorvaxContraband431JobsBrigmedic, ClothingUniformBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitBrigmedic
   name: brigmedic jumpsuit
   description: This uniform is issued to qualified personnel who have been trained. No one cares that the training took half a day.
@@ -139,7 +139,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: [ClothingUniformBase, BaseSecurityContraband, ClothingUniformFoldableBase]
+  parent: [BaseCorvaxContraband431DepartmentsSecurityJobsSecurityOfficer, ClothingUniformBase, BaseSecurityContraband, ClothingUniformFoldableBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitSec
   name: security jumpsuit
   description: A jumpsuit made of strong material, providing robust protection.
@@ -171,7 +171,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Security/security_blue.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband431DepartmentsSecurityJobsSecurityCadetSecurityOfficer, ClothingUniformBase, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingUniformJumpsuitSecGrey
   name: grey security jumpsuit
   description: A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood.
@@ -182,7 +182,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Security/security_grey.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband431DepartmentsSecurityJobsSecurityOfficer, ClothingUniformBase, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingUniformSecurityTrooper
   name: trooper uniform
   description: A formal uniform issued to the Nanotrasen Troopers, usually it comes with a car.
@@ -193,7 +193,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Security/security_trooper.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband431DepartmentsSecurityJobsWarden, ClothingUniformBase, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingUniformJumpsuitWarden
   name: warden's uniform
   description: A formal security suit for officers complete with Nanotrasen belt buckle.
@@ -216,7 +216,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Security/warden.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, BaseCommandContraband]
+  parent: [BaseCorvaxContraband431DepartmentsCommandJobsHeadOfSecurity, ClothingUniformBase, BaseCommandContraband] # Corvax-Contraband
   id: ClothingUniformJumpsuitHosFormal
   name: hos's formal suit
   description: A suit for special occasions.
@@ -227,7 +227,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Security/hosformal.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, BaseSecurityContraband]
+  parent: [BaseCorvaxContraband431DepartmentsSecurityJobsSecurityOfficerSeniorOfficer, ClothingUniformBase, BaseSecurityContraband] # Corvax-Contraband
   id: ClothingUniformJumpsuitSeniorOfficer
   name: senior officer jumpsuit
   description: A sign of skill and prestige within the security department.

Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/service.yml

@@ -34,7 +34,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Service/bartender_purple.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [BaseCorvaxContraband431JobsChaplain, ClothingUniformBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitChaplain
   name: chaplain's jumpsuit
   description: It's a black jumpsuit, often worn by religious folk.
@@ -45,7 +45,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Service/chaplain.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [BaseCorvaxContraband431JobsChef, ClothingUniformBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitChef
   name: chef uniform
   description: Can't cook without this.
@@ -117,7 +117,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Service/hydro.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, ClothingUniformFoldableBase]
+  parent: [BaseCorvaxContraband431JobsJanitor, ClothingUniformBase, ClothingUniformFoldableBase] # Corvax-Contraband
   id: ClothingUniformJumpsuitJanitor
   name: janitor jumpsuit
   description: The jumpsuit for the poor sop with a mop.

Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/ship_vs_ship.yml

@@ -15,7 +15,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/ShipVsShip/recruit_nt.rsi
 
 - type: entity
-  parent: [ ClothingUniformBase, BaseSyndicateContraband ]
+  parent: [ ClothingUniformBase] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingUniformJumpsuitRecruitSyndie
   name: syndicate recruit jumpsuit
   description: A dubious, dark-grey jumpsuit. As if passengers weren't dubious enough already.

Resources/Prototypes/Entities/Clothing/Uniforms/Jumpsuits/special.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: [UnsensoredClothingUniformBase, BaseSyndicateContraband]
+  parent: [UnsensoredClothingUniformBase] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingUniformJumpsuitPyjamaSyndicateBlack
   name: black syndicate pyjamas
   description: For those long nights in perma.
@@ -10,7 +10,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Special/pyjamasyndicateblack.rsi
 
 - type: entity
-  parent: [UnsensoredClothingUniformBase, BaseSyndicateContraband]
+  parent: [UnsensoredClothingUniformBase] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingUniformJumpsuitPyjamaSyndicatePink
   name: pink syndicate pyjamas
   description: For those long nights in perma.
@@ -21,7 +21,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Special/pyjamasyndicatepink.rsi
 
 - type: entity
-  parent: [UnsensoredClothingUniformBase, BaseSyndicateContraband]
+  parent: [UnsensoredClothingUniformBase] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingUniformJumpsuitPyjamaSyndicateRed
   name: red syndicate pyjamas
   description: For those long nights in perma.
@@ -32,7 +32,7 @@
     sprite: Clothing/Uniforms/Jumpsuits/Special/pyjamasyndicatered.rsi
 
 - type: entity
-  parent: [UnsensoredClothingUniformBase, BaseSyndicateContraband]
+  parent: [UnsensoredClothingUniformBase] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingUniformJumpsuitOperative
   name: operative jumpsuit
   description: Uniform for elite syndicate operatives performing tactical operations in deep space.
@@ -95,7 +95,7 @@
     relayAccent: true
 
 - type: entity
-  parent: [ClothingUniformBase, BaseSyndicateContraband]
+  parent: [ClothingUniformBase] # Corvax-Contraband BaseSyndicateContraband
   id: ClothingUniformJumpsuitSyndieFormal
   name: syndicate formal suit
   description: "The syndicate's uniform is made in an elegant style, it's even a pity to do dirty tricks in this."

Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml

@@ -85,7 +85,7 @@
 
 - type: entity
   id: BorgChassisSyndicateAssault
-  parent: BaseBorgChassisSyndicate
+  parent: [BaseCorvaxContraband436, BaseBorgChassisSyndicate] # Corvax-Contraband
   name: syndicate assault cyborg
   description: A lean, mean killing machine with access to a variety of deadly modules.
   components:

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -3413,7 +3413,7 @@
 - type: entity
   name: syndicat
   id: MobCatSyndy
-  parent: MobCatSpace
+  parent: [BaseCorvaxContraband435, MobCatSpace] # Corvax-Contraband
   description: Explosive kitten.
   components:
   - type: Sprite

Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

@@ -231,7 +231,7 @@
     - id: SheetSteel1
 
 - type: entity
-  parent: ProduceBaseRuminant
+  parent: [ProduceBaseRuminant]
   id: Nettle
   name: nettle
   description: Stingy little prick.
@@ -262,7 +262,7 @@
     grindableSolutionName: food
 
 - type: entity
-  parent: [ ProduceBase, BaseMajorContraband ]
+  parent: [BaseCorvaxContraband432JobsBotanist, ProduceBase, BaseMajorContraband] # Corvax-Contraband
   id: DeathNettle
   name: death nettle
   description: This nettle's out for blood.
@@ -1808,7 +1808,7 @@
 
 - type: entity
   name: fly amanita
-  parent: FoodProduceBase
+  parent: [BaseCorvaxContraband432JobsBotanist, FoodProduceBase] # Corvax-Contraband
   id: FoodFlyAmanita
   description: A delicious-looking mushroom like you see in those cartoons.
   components:
@@ -1841,7 +1841,7 @@
 
 - type: entity
   name: gatfruit
-  parent: [ FoodProduceBase, BaseSyndicateContraband, BaseSlicingRefinable ]
+  parent: [BaseCorvaxContraband434DepartmentsSecurity, FoodProduceBase, BaseSyndicateContraband, BaseSlicingRefinable] # Corvax-Contraband
   id: FoodGatfruit
   description: A delicious, gun-shaped fruit with a thick wooden stem.
   components:
@@ -2014,7 +2014,7 @@
   name: koibean
   description: These beans seem a little bit fishy.
   id: FoodKoibean
-  parent: ProduceBaseRuminant
+  parent: [ProduceBaseRuminant]
   components:
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/koibean.rsi
@@ -2419,7 +2419,7 @@
       Burger: Pea
 
 - type: entity
-  parent: FoodProduceBase
+  parent: [BaseCorvaxContraband432JobsBotanist, FoodProduceBase] # Corvax-Contraband
   id: FoodWorldPeas
   name: cluster of world peas
   description: It's rumored to bring peace to any who consume it.

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml

@@ -179,7 +179,7 @@
 
 - type: entity
   id: CigPackSyndicate
-  parent: [CigPackBase, BaseSyndicateContraband]
+  parent: [CigPackBase] # Corvax-Contraband BaseSyndicateContraband
   name: Interdyne herbals packet
   description: Elite cigarettes for elite syndicate agents. Infused with medicine for when you need to do more than calm your nerves.
   components:

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml

@@ -79,7 +79,7 @@
 
 - type: entity
   id: SecurityTechFabCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseMachineCircuitboard] # Corvax-Contraband
   name: security techfab machine board
   description: A machine printed circuit board for a security techfab.
   components:
@@ -96,7 +96,7 @@
 
 - type: entity
   id: AmmoTechFabCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseMachineCircuitboard] # Corvax-Contraband
   name: ammo techfab circuit board
   description: A machine printed circuit board for an ammo techfab.
   components:
@@ -258,7 +258,7 @@
 
 - type: entity
   id: ArtifactAnalyzerMachineCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [BaseCorvaxContraband431DepartmentsScience, BaseMachineCircuitboard] # Corvax-Contraband
   name: artifact analyzer machine board
   description: A machine printed circuit board for an artifact analyzer.
   components:

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml

@@ -64,7 +64,7 @@
       prototype: ComputerMedicalRecords
 
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, BaseComputerCircuitboard] # Corvax-Contraband
   id: CriminalRecordsComputerCircuitboard
   name: criminal records computer board
   description: A computer printed circuit board for a criminal records computer.
@@ -239,7 +239,7 @@
     stealGroup: CargoShuttleConsoleCircuitboard
 
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, BaseComputerCircuitboard] # Corvax-Contraband
   id: SurveillanceCameraMonitorCircuitboard
   name: surveillance camera monitor board
   description: A computer printed circuit board for a surveillance camera monitor.
@@ -331,7 +331,7 @@
     prototype: ComputerCrewMonitoring
 
 - type: entity
-  parent: [BaseComputerCircuitboard, BaseCommandContraband]
+  parent: [BaseCorvaxContraband433DepartmentsCommand, BaseComputerCircuitboard, BaseCommandContraband] # Corvax-Contraband
   id: IDComputerCircuitboard
   name: ID card computer board
   description: A computer printed circuit board for an ID card console.
@@ -358,7 +358,7 @@
       prototype: computerBodyScanner
 
 - type: entity
-  parent: [ BaseComputerCircuitboard, BaseCommandContraband ]
+  parent: [BaseCorvaxContraband433DepartmentsCommand, BaseComputerCircuitboard, BaseCommandContraband] # Corvax-Contraband
   id: CommsComputerCircuitboard
   name: communications computer board
   description: A computer printed circuit board for a communications console.

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/law_boards.yml

@@ -114,7 +114,7 @@
 
 - type: entity
   id: AntimovCircuitBoard
-  parent: [BaseSiliconLawboard, BaseSyndicateContraband]
+  parent: [BaseCorvaxContraband436, BaseSiliconLawboard, BaseSyndicateContraband] # Corvax-Contraband
   name: law board (Antimov)
   description: An electronics board containing the Antimov lawset.
   components:

Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/chimp_upgrade_kit.yml

@@ -1,6 +1,6 @@
 - type: entity
   name: C.H.I.M.P. handcannon upgrade chip
-  parent: [BaseItem, BaseSyndicateContraband]
+  parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem, BaseSyndicateContraband] # Corvax-Contraband
   id: WeaponPistolCHIMPUpgradeKit
   description: An experimental upgrade kit for the C.H.I.M.P.
   components:

Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: SingularityBeacon
-  parent: [BaseMachinePowered, BaseSyndicateContraband, BaseMachineDestructible]
+  parent: [BaseCorvaxContraband436, BaseMachinePowered, BaseSyndicateContraband, BaseMachineDestructible] # Corvax-Contraband
   name: singularity beacon
   description: A syndicate device that attracts the singularity. If it's loose and you're seeing this, run.
   components:

Resources/Prototypes/Entities/Objects/Devices/cartridges.yml

@@ -94,7 +94,7 @@
     - type: NetProbeCartridge
 
 - type: entity
-  parent: BasePDACartridge
+  parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, BasePDACartridge] # Corvax-Contraband
   id: LogProbeCartridge
   name: LogProbe cartridge
   description: A program for getting access logs from devices.
@@ -117,7 +117,7 @@
       - Forensics
 
 - type: entity
-  parent: BasePDACartridge
+  parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, BasePDACartridge] # Corvax-Contraband
   id: WantedListCartridge
   name: Wanted list cartridge
   description: A program to get a list of wanted persons.
@@ -139,7 +139,7 @@
     stealGroup: WantedListCartridge
 
 - type: entity
-  parent: BasePDACartridge
+  parent: [BaseCorvaxContraband431DepartmentsMedical, BasePDACartridge] # Corvax-Contraband
   id: MedTekCartridge
   name: MedTek cartridge
   description: A program that provides medical diagnostic tools.

Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml

@@ -1,6 +1,6 @@
 - type: entity
   name: forensic scanner
-  parent: [ BaseItem, BaseSecurityContraband ]
+  parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, BaseItem, BaseSecurityContraband] # Corvax-Contraband
   id: ForensicScanner
   description: A handheld device that can scan objects for fingerprints and fibers.
   components:

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -195,6 +195,12 @@
   name: technical assistant PDA
   description: Why isn't it yellow?
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [TechnicalAssistant]
+  # Corvax-Contraband-end
   - type: Pda
     id: TechnicalAssistantIDCard
   - type: Appearance
@@ -214,6 +220,12 @@
   name: medical intern PDA
   description: Why isn't it white?
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [MedicalIntern]
+  # Corvax-Contraband-end
   - type: Pda
     id: MedicalInternIDCard
   - type: Appearance
@@ -236,6 +248,12 @@
   name: security cadet PDA
   description: Why isn't it red?
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [SecurityCadet]
+  # Corvax-Contraband-end
   - type: Pda
     id: SecurityCadetIDCard
   - type: Appearance
@@ -255,6 +273,12 @@
   name: research assistant PDA
   description: Why isn't it purple?
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [ResearchAssistant]
+  # Corvax-Contraband-end
   - type: Pda
     id: ResearchAssistantIDCard
   - type: Appearance
@@ -274,6 +298,12 @@
   name: service worker PDA
   description: Why isn't it gray?
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [ServiceWorker]
+  # Corvax-Contraband-end
   - type: Pda
     id: ServiceWorkerIDCard
   - type: Appearance
@@ -288,7 +318,7 @@
     state: pda-internservice
 
 - type: entity
-  parent: BasePDA
+  parent: [BaseCorvaxContraband431JobsChef, BasePDA] # Corvax-Contraband
   id: ChefPDA
   name: chef PDA
   description: Covered in grease and flour.
@@ -306,7 +336,7 @@
     state: pda-cook
 
 - type: entity
-  parent: BasePDA
+  parent: [BaseCorvaxContraband431JobsBotanist, BasePDA] # Corvax-Contraband
   id: BotanistPDA
   name: botanist PDA
   description: Has an earthy scent.
@@ -330,6 +360,12 @@
   name: clown PDA
   description: Looks can be deceiving.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Clown]
+  # Corvax-Contraband-end
   - type: Pda
     id: ClownIDCard
     penSlot:
@@ -390,6 +426,12 @@
   name: mime PDA
   description: Suprisingly not on mute.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Mime]
+  # Corvax-Contraband-end
   - type: Pda
     id: MimeIDCard
     paiSlot:
@@ -443,7 +485,7 @@
 
 - type: entity
   name: chaplain PDA
-  parent: BasePDA
+  parent: [BaseCorvaxContraband431JobsChaplain, BasePDA] # Corvax-Contraband
   id: ChaplainPDA
   description: God's chosen PDA.
   components:
@@ -472,7 +514,7 @@
 
 - type: entity
   name: quartermaster PDA
-  parent: BasePDA
+  parent: [BaseCorvaxContraband431JobsQuartermaster, BasePDA] # Corvax-Contraband
   id: QuartermasterPDA
   description: PDA for the guy that orders the guns.
   components:
@@ -499,7 +541,7 @@
         - id: AstroNavCartridge
 
 - type: entity
-  parent: BasePDA
+  parent: [BaseCorvaxContraband431JobsCargoTechnician, BasePDA] # Corvax-Contraband
   id: CargoPDA
   name: cargo PDA
   description: PDA for the guys that order the pizzas.
@@ -517,7 +559,7 @@
     state: pda-cargo
 
 - type: entity
-  parent: BasePDA
+  parent: [BaseCorvaxContraband431JobsSalvageSpecialist, BasePDA] # Corvax-Contraband
   id: SalvagePDA
   name: salvage PDA
   description: Smells like ash.
@@ -545,7 +587,7 @@
         - id: AstroNavCartridge
 
 - type: entity
-  parent: BasePDA
+  parent: [BaseCorvaxContraband431JobsBartender, BasePDA] # Corvax-Contraband
   id: BartenderPDA
   name: bartender PDA
   description: Smells like beer.
@@ -568,6 +610,12 @@
   name: librarian PDA
   description: Smells like books.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Librarian]
+  # Corvax-Contraband-end
   - type: Pda
     id: LibrarianIDCard
     penSlot:
@@ -603,6 +651,12 @@
   name: lawyer PDA
   description: For lawyers to poach dubious clients.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Lawyer]
+  # Corvax-Contraband-end
   - type: Pda
     id: LawyerIDCard
     penSlot:
@@ -633,7 +687,7 @@
     - DoorBumpOpener
 
 - type: entity
-  parent: BasePDA
+  parent: [BaseCorvaxContraband431JobsJanitor, BasePDA] # Corvax-Contraband
   id: JanitorPDA
   name: janitor PDA
   description: Smells like bleach.
@@ -651,7 +705,7 @@
     state: pda-janitor
 
 - type: entity
-  parent: BasePDA
+  parent: [BaseCorvaxContraband431JobsCaptain, BasePDA] # Corvax-Contraband
   id: CaptainPDA
   name: captain PDA
   description: Surprisingly no different from your PDA.
@@ -675,7 +729,7 @@
     state: pda-captain
 
 - type: entity
-  parent: BasePDA
+  parent: [BaseCorvaxContraband431JobsHeadOfPersonnel, BasePDA] # Corvax-Contraband
   id: HoPPDA
   name: head of personnel PDA
   description: Looks like it's been chewed on.
@@ -700,7 +754,7 @@
     state: pda-hop
 
 - type: entity
-  parent: BasePDA
+  parent: [BaseCorvaxContraband431JobsChiefEngineer, BasePDA] # Corvax-Contraband
   id: CEPDA
   name: chief engineer PDA
   description: Looks like it's barely been used.
@@ -719,7 +773,7 @@
     state: pda-ce
 
 - type: entity
-  parent: BasePDA
+  parent: [BaseCorvaxContraband431JobsStationEngineer, BasePDA] # Corvax-Contraband
   id: EngineerPDA
   name: engineer PDA
   description: Rugged and well-worn.
@@ -738,7 +792,7 @@
     state: pda-engineer
 
 - type: entity
-  parent: BaseMedicalPDA
+  parent: [BaseCorvaxContraband431JobsChiefMedicalOfficer, BaseMedicalPDA] # Corvax-Contraband
   id: CMOPDA
   name: chief medical officer PDA
   description: Extraordinarily shiny and sterile.
@@ -791,7 +845,7 @@
     - DoorBumpOpener
 
 - type: entity
-  parent: BaseMedicalPDA
+  parent: [BaseCorvaxContraband431JobsParamedic, BaseMedicalPDA] # Corvax-Contraband
   id: ParamedicPDA
   name: paramedic PDA
   description: Shiny and sterile.
@@ -810,7 +864,7 @@
     state: pda-paramedic
 
 - type: entity
-  parent: BaseMedicalPDA
+  parent: [BaseCorvaxContraband431JobsChemist, BaseMedicalPDA] # Corvax-Contraband
   id: ChemistryPDA
   name: chemistry PDA
   description: It has a few discolored blotches here and there.
@@ -829,7 +883,7 @@
     state: pda-chemistry
 
 - type: entity
-  parent: BasePDA
+  parent: [BaseCorvaxContraband431JobsResearchDirector, BasePDA] # Corvax-Contraband
   id: RnDPDA
   name: research director PDA
   description: It appears surprisingly ordinary.
@@ -868,7 +922,7 @@
     state: pda-science
 
 - type: entity
-  parent: BaseSecurityPDA
+  parent: [BaseCorvaxContraband431JobsHeadOfSecurity, BaseSecurityPDA] # Corvax-Contraband
   id: HoSPDA
   name: head of security PDA
   description: Whosoever bears this PDA is the law.
@@ -897,7 +951,7 @@
         - id: LogProbeCartridge
 
 - type: entity
-  parent: BaseSecurityPDA
+  parent: [BaseCorvaxContraband431JobsWarden, BaseSecurityPDA] # Corvax-Contraband
   id: WardenPDA
   name: warden PDA
   description: The OS appears to have been jailbroken.
@@ -939,6 +993,12 @@
   name: CentComm PDA
   description: Light green sign of walking bureaucracy.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [CentralCommandOfficial]
+  # Corvax-Contraband-end
   - type: Pda
     id: CentcomIDCard
     penSlot:
@@ -1005,6 +1065,12 @@
   id: DeathsquadPDA
   suffix: Death Squad
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [DeathSquad]
+  # Corvax-Contraband-end
   - type: Pda
     id: CentcomIDCardDeathsquad
   - type: Tag #  Ignore Chameleon tags
@@ -1017,6 +1083,12 @@
   name: musician PDA
   description: It fills you with inspiration.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Musician]
+  # Corvax-Contraband-end
   - type: Pda
     id: MusicianIDCard
   - type: Appearance
@@ -1046,7 +1118,7 @@
     - DoorBumpOpener
 
 - type: entity
-  parent: BasePDA
+  parent: [BaseCorvaxContraband431JobsAtmosphericTechnician, BasePDA] # Corvax-Contraband
   id: AtmosPDA
   name: atmos PDA
   description: Still smells like plasma.
@@ -1102,7 +1174,7 @@
     - DoorBumpOpener
 
 - type: entity
-  parent: [ BasePDA, BaseSyndicateContraband ]
+  parent: [ BasePDA ] # Corvax-Contraband BaseSyndicateContraband
   id: SyndiPDA
   name: syndicate PDA
   description: Ok, time to be a productive member of- oh cool I'm a bad guy time to kill people!
@@ -1187,6 +1259,12 @@
   suffix: Leader
   description: Red for firepower.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [ERTLeader]
+  # Corvax-Contraband-end
   - type: Pda
     id: ERTLeaderIDCard
   - type: Appearance
@@ -1230,6 +1308,12 @@
   suffix: Engineer
   description: Red for firepower, it's well-worn.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [ERTEngineer]
+  # Corvax-Contraband-end
   - type: Pda
     id: ERTEngineerIDCard
 
@@ -1240,6 +1324,12 @@
   suffix: Janitor
   description: Red for firepower, it's squeaky clean.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [ERTJanitor]
+  # Corvax-Contraband-end
   - type: Pda
     id: ERTJanitorIDCard
 
@@ -1250,6 +1340,12 @@
   suffix: Medic
   description: Red for firepower, it's shiny and sterile.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [ERTMedical]
+  # Corvax-Contraband-end
   - type: Pda
     id: ERTMedicIDCard
 
@@ -1260,6 +1356,12 @@
   suffix: Security
   description: Red for firepower, it has tally marks etched on the side.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [ERTSecurity]
+  # Corvax-Contraband-end
   - type: Pda
     id: ERTSecurityIDCard
 
@@ -1269,6 +1371,12 @@
   name: CBURN PDA
   description: Smells like rotten flesh.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [CBURN]
+  # Corvax-Contraband-end
   - type: Pda
     id: CBURNIDcard
   - type: PdaBorderColor
@@ -1282,6 +1390,12 @@
   name: psychologist PDA
   description: Looks immaculately cleaned.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Psychologist]
+  # Corvax-Contraband-end
   - type: Pda
     id: PsychologistIDCard
   - type: Appearance
@@ -1301,6 +1415,12 @@
   name: tram driver PDA
   description: A serious driver will always arrive on time.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [TramDriver]
+  # Corvax-Contraband-end
   - type: Pda
     id: TramDriverIDCard
   - type: Appearance
@@ -1320,6 +1440,12 @@
   name: reporter PDA
   description: Smells like freshly printed press.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [Reporter]
+  # Corvax-Contraband-end
   - type: Pda
     id: ReporterIDCard
     penSlot:
@@ -1376,7 +1502,7 @@
     state: pda-boxer
 
 - type: entity
-  parent: BaseSecurityPDA
+  parent: [BaseCorvaxContraband431JobsDetective, BaseSecurityPDA] # Corvax-Contraband
   id: DetectivePDA
   name: detective PDA
   description: Smells like rain... pouring down the rooftops...
@@ -1404,7 +1530,7 @@
         - id: LogProbeCartridge
 
 - type: entity
-  parent: BaseMedicalPDA
+  parent: [BaseCorvaxContraband431JobsBrigmedic, BaseMedicalPDA] # Corvax-Contraband
   id: BrigmedicPDA
   name: brigmedic PDA
   description: I wonder whose pulse is on the screen? I hope it doesn't stop...
@@ -1461,7 +1587,7 @@
   - type: Unremoveable
 
 - type: entity
-  parent: BasePDA
+  parent: [BaseCorvaxContraband431JobsSeniorEngineerStationEngineer, BasePDA] # Corvax-Contraband
   id: SeniorEngineerPDA
   name: senior engineer PDA
   description: Seems to have been taken apart and put back together several times.
@@ -1485,6 +1611,12 @@
   name: senior researcher PDA
   description: Looks like it's been through years of chemical burns and explosions.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [SeniorResearcher]
+  # Corvax-Contraband-end
   - type: Pda
     id: SeniorResearcherIDCard
   - type: Appearance
@@ -1505,6 +1637,12 @@
   name: senior physician PDA
   description: Smells faintly like iron and chemicals.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [SeniorPhysician]
+  # Corvax-Contraband-end
   - type: Pda
     id: SeniorPhysicianIDCard
   - type: Appearance
@@ -1525,6 +1663,12 @@
   name: senior officer PDA
   description: Beaten, battered and broken, but just barely useable.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax431
+    allowedDepartments: []
+    allowedJobs: [SeniorOfficer]
+  # Corvax-Contraband-end
   - type: Pda
     id: SeniorOfficerIDCard
   - type: Appearance
@@ -1539,7 +1683,7 @@
     state: pda-seniorofficer
 
 - type: entity
-  parent: BasePDA
+  parent: [BaseCorvaxContraband431JobsCargoTechnician, BasePDA] # Corvax-Contraband
   id: SeniorCourierPDA
   name: senior courier PDA
   description: Smells like postage stamps and shuttle fuel.

Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml

@@ -55,7 +55,7 @@
 - type: entity
   name: pinpointer
   id: PinpointerNuclear
-  parent: [ PinpointerBase, BaseCommandContraband ]
+  parent: [BaseCorvaxContraband433DepartmentsCommand, PinpointerBase, BaseCommandContraband] # Corvax-Contraband
   components:
   - type: Pinpointer
     component: NukeDisk

Resources/Prototypes/Entities/Objects/Devices/radio.yml

@@ -28,7 +28,7 @@
 - type: entity
   name: security radio
   description: A handy security radio.
-  parent: [ RadioHandheld, BaseSecurityContraband ]
+  parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, RadioHandheld, BaseSecurityContraband] # Corvax-Contraband
   id: RadioHandheldSecurity
   components:
   - type: RadioMicrophone

Resources/Prototypes/Entities/Objects/Fun/darts.yml

@@ -186,7 +186,7 @@
         acts: [ "Destruction" ]
 
 - type: entity
-  parent: [ BaseItem, BaseSyndicateContraband ]
+  parent: BaseItem # Corvax-Contraband: the hypodart case also conceals its properties.
   id: HypoDartBox
   name: hypodart box
   suffix: HypoDart

Resources/Prototypes/Entities/Objects/Fun/pai.yml

@@ -111,7 +111,7 @@
       - state: base-inhand-right
 
 - type: entity
-  parent: [ PersonalAI, BaseSyndicateContraband]
+  parent: PersonalAI # Corvax-Contraband: do not inherit a marker for hidden properties.
   id: SyndicatePersonalAI
   name: syndicate personal ai device
   description: Your Syndicate pal who's fun to be with!

Resources/Prototypes/Entities/Objects/Magic/books.yml

@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: [ BaseItem, BaseMagicalContraband ]
+  parent: BaseItem # Corvax-Contraband: do not inherit a marker for hidden properties.
   id: BaseSpellbook
   name: spellbook
   components:
@@ -22,7 +22,7 @@
 # For the Wizard antagonist
 # Do not add discounts or price inflation
 - type: entity
-  parent: [ BaseItem, StorePresetSpellbook, BaseMagicalContraband ]
+  parent: [BaseItem, StorePresetSpellbook] # Corvax-Contraband: do not inherit a marker for hidden properties.
   id: WizardsGrimoire
   name: wizard's grimoire
   suffix: Wizard

Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml

@@ -306,7 +306,7 @@
 
 - type: entity
   id: BedsheetSyndie
-  parent: [ BedsheetBase, BaseSyndicateContraband ]
+  parent: BedsheetBase # Corvax-Contraband
   name: syndicate bedsheet
   description: It has a syndicate emblem and it has an aura of evil.
   components:

Resources/Prototypes/Entities/Objects/Misc/briefcases.yml

@@ -34,7 +34,7 @@
     size: Huge
 
 - type: entity
-  parent: [BriefcaseBase, BaseSyndicateContraband]
+  parent: [BriefcaseBase] # Corvax-Contraband BaseSyndicateContraband
   id: BriefcaseWeapon
   name: secure weapon case
   suffix: Gun, Empty

Resources/Prototypes/Entities/Objects/Misc/business_card.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: SyndicateBusinessCard
   name: syndicate business card
-  parent: [ Paper, BaseSyndicateContraband ]
+  parent: [BaseCorvaxContraband131, Paper, BaseSyndicateContraband] # Corvax-Contraband
   description: A black card with the syndicate's logo. There's something written on the back.
   components:
     - type: Sprite

Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml

@@ -2,7 +2,7 @@
   name: handcuffs
   description: Used to detain criminals and other assholes.
   id: Handcuffs
-  parent: [BaseItem, BaseSecurityCommandContraband]
+  parent: [BaseCorvaxContraband432DepartmentsSecurity, BaseItem, BaseSecurityCommandContraband] # Corvax-Contraband
   components:
   - type: Item
     size: Small

Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml

@@ -23,7 +23,7 @@
     sprite: Objects/Misc/Handy_Flags/NT_handy_flag.rsi
 
 - type: entity
-  parent: [BaseItem, BaseSyndicateContraband]
+  parent: [BaseCorvaxContraband131, BaseItem] # Corvax-Contraband BaseSyndicateContraband
   id: SyndieHandyFlag
   name: syndicate handheld flag
   description: "For truly rebellious patriots. Death to NT!"

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

@@ -1013,7 +1013,7 @@
     - NuclearOperative
 
 - type: entity
-  parent: [ IDCardStandard, BaseSyndicateContraband ]
+  parent: IDCardStandard # Corvax-Contraband
   id: SyndicateIDCard
   name: syndicate ID card
   components:

Resources/Prototypes/Entities/Objects/Misc/implanters.yml

@@ -220,7 +220,7 @@
 - type: entity
   id: UplinkImplanter
   name: uplink implanter
-  parent: BaseImplantOnlyImplanterSyndi
+  parent: [BaseCorvaxContraband436, BaseImplantOnlyImplanterSyndi] # Corvax-Contraband
   components:
   - type: Implanter
     implant: UplinkImplant

Resources/Prototypes/Entities/Objects/Misc/improvised_gun_parts.yml

@@ -1,7 +1,7 @@
 #The entire game mysteriously shits itself and dies if you uncomment the item size. I have no idea why.
 #TODO: Assimilate these into the same RSI.
 - type: entity
-  parent: BaseItem
+  parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem] # Corvax-Contraband
   id: ModularReceiver
   name: modular receiver
   description: A vital part used in the creation of firearms. #Could use a better description, but I'm not a gun nut so I can't really do that.
@@ -18,7 +18,7 @@
       - Metal
 
 - type: entity
-  parent: BaseItem
+  parent: [BaseCorvaxContraband433DepartmentsSecurity, BaseItem] # Corvax-Contraband
   id: RifleStock
   name: rifle stock
   description: A robust wooden stock, used in the creation of firearms. #Same as above

Resources/Prototypes/Entities/Objects/Misc/pen.yml

@@ -99,6 +99,12 @@
   id: CyberPen
   description: A high-tech pen straight from Cybersun's legal department, capable of refracting hard-light at impossible angles through its diamond tip in order to write. So powerful, it's even able to rewrite officially stamped documents should the need arise.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax432
+    allowedDepartments: []
+    allowedJobs: []
+  # Corvax-Contraband-end
   - type: Sprite
     state: overpriced_pen
   - type: Item
@@ -112,6 +118,12 @@
   id: PenCentcom
   description: In an attempt to keep up with the "power" of the cybersun bureaucracy, NT made a replica of cyber pen, in their corporate style.
   components:
+  # Corvax-Contraband-start
+  - type: Contraband
+    severity: Corvax432
+    allowedDepartments: [CentralCommand]
+    allowedJobs: [Magistrate, IAA]
+  # Corvax-Contraband-end
   - type: Sprite
     state: pen_centcom
   - type: Item

Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml

@@ -347,7 +347,7 @@
 
 - type: entity
   name: syndicate rubber stamp
-  parent: [RubberStampBase, BaseSyndicateContraband]
+  parent: [BaseCorvaxContraband131, RubberStampBase, BaseSyndicateContraband] # Corvax-Contraband
   id: RubberStampSyndicate
   categories: [ DoNotMap ]
   components:

Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml

@@ -94,7 +94,7 @@
 #Traitor implants
 
 - type: entity
-  parent: BaseSubdermalImplant
+  parent: [BaseCorvaxContraband435, BaseSubdermalImplant] # Corvax-Contraband
   id: StorageImplant
   name: storage implant
   description: This implant grants hidden storage within a person's body using bluespace technology.
@@ -122,7 +122,7 @@
           type: StorageBoundUserInterface
 
 - type: entity
-  parent: BaseSubdermalImplant
+  parent: [BaseCorvaxContraband435, BaseSubdermalImplant] # Corvax-Contraband
   id: FreedomImplant
   name: freedom implant
   description: This implant lets the user break out of hand restraints up to three times before ceasing to function anymore.
@@ -138,7 +138,7 @@
     targetUser: true
 
 - type: entity
-  parent: BaseSubdermalImplant
+  parent: [BaseCorvaxContraband435, BaseSubdermalImplant] # Corvax-Contraband
   id: RadioImplant
   name: radio implant
   description: This implant grants access to the Syndicate channel without a headset.
@@ -150,7 +150,7 @@
     - Syndicate
 
 - type: entity
-  parent: BaseSubdermalImplant
+  parent: [BaseCorvaxContraband436, BaseSubdermalImplant] # Corvax-Contraband
   id: UplinkImplant
   name: uplink implant
   description: This implant lets the user access a hidden Syndicate uplink at will.
@@ -168,7 +168,7 @@
         type: StoreBoundUserInterface
 
 - type: entity
-  parent: BaseSubdermalImplant
+  parent: [BaseCorvaxContraband435, BaseSubdermalImplant] # Corvax-Contraband
   id: EmpImplant
   name: EMP implant
   description: This implant creates an electromagnetic pulse when activated.
@@ -183,7 +183,7 @@
     disableDuration: 10
 
 - type: entity
-  parent: BaseSubdermalImplant
+  parent: [BaseCorvaxContraband435, BaseSubdermalImplant] # Corvax-Contraband
   id: ScramImplant
   name: scram implant
   description: This implant randomly teleports the user within a large radius when activated.
@@ -196,7 +196,7 @@
     targetUser: true
 
 - type: entity
-  parent: BaseSubdermalImplant
+  parent: [BaseCorvaxContraband435, BaseSubdermalImplant] # Corvax-Contraband
   id: DnaScramblerImplant
   name: DNA scrambler implant
   description: This implant lets the user randomly change their appearance and name once.
@@ -249,7 +249,7 @@
 #Nuclear Operative/Special Exclusive implants
 
 - type: entity
-  parent: BaseSubdermalImplant
+  parent: [BaseCorvaxContraband435, BaseSubdermalImplant] # Corvax-Contraband
   id: MicroBombImplant
   name: micro-bomb implant
   description: This implant detonates the user upon activation or upon death.
@@ -358,7 +358,7 @@
       targetUser: true
 
 - type: entity
-  parent: BaseSubdermalImplant
+  parent: [BaseCorvaxContraband435, BaseSubdermalImplant] # Corvax-Contraband
   id: FakeMindShieldImplant
   name: fake mindshield implant
   description: This implant allows the implanter to produce a fake signal that NT security huds use to identify individuals implanted with a mindshield.

Resources/Prototypes/Entities/Objects/Power/powersink.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: PowerSink
-  parent: [BaseMachine, BaseSyndicateContraband, BaseMachineDestructible]
+  parent: [BaseCorvaxContraband436, BaseMachine, BaseSyndicateContraband, BaseMachineDestructible] # Corvax-Contraband
   name: power sink
   description: Drains immense amounts of electricity from the grid.
   components:

Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml

@@ -62,7 +62,7 @@
     stealGroup: Bible
 
 - type: entity
-  parent: [Bible, BaseSyndicateContraband]
+  parent: Bible # Corvax-Contraband: do not inherit a marker for hidden properties.
   name: necronomicon
   description: "There's a note: Klatuu, Verata, Nikto -- Don't forget it again!"
   id: BibleNecronomicon