- add: seniors (#100)

* seniors base * second one * fuck * remove this one * fixes * waggier ghost * waggier fluff
2024-02-20 12:57:00 +00:00
parent 1a832a5200
commit 3bdf8417f9
122 changed files with 1202 additions and 110 deletions
--- a/Resources/Locale/ru-RU/job/job-description.ftl
+++ b/Resources/Locale/ru-RU/job/job-description.ftl
@@ -45,3 +45,8 @@ job-description-serviceworker = Изучите основы создания н
 job-description-warden = Патрулируйте бриг, убедитесь, что никто не ворует из арсенала, и следите за тем, чтобы ушлый клоун снова не сбежал раньше срока.
 job-description-zookeeper = Покажите всем членам экипажа веселую выставку милых животных и космических карпов. Доступно не на всех картах!
 job-description-inspector = Убедитесь, что станция выполнит свою цель. Решите проблемы и конфликты между отделами, чтобы все работало как часы.
+job-description-senior-engineer = Обучайте новых инженеров основам работы двигателя станции, ремонта, атмосферы и мощности.
+job-description-senior-researcher = Обучайте новых ученых основам печати предметов, исследования артефактов и аномальных объектов.
+job-description-senior-physician = Научите новых медиков основам ухода за ранеными, химии, диагностике больных и избавлению от мертвых.
+job-description-senior-officer = Научите новых офицеров основам обысков, предварительных арестов, тюремного заключения и тому, как правильно стрелять из огнестрельного оружия.
+job-description-senior-salvage-specialist = Покажите всем коллегам как профессионалы обчищают обломки и выполняют экспедиции.
--- a/Resources/Locale/ru-RU/job/job-names.ftl
+++ b/Resources/Locale/ru-RU/job/job-names.ftl
@@ -45,6 +45,11 @@ job-name-ertmedic = медик ОБР
 job-name-ertjanitor = уборщик ОБР
 job-name-boxer = боксёр
 job-name-zookeeper = зоотехник
+job-name-senior-engineer = бригадир
+job-name-senior-researcher = ведущий исследователь
+job-name-senior-physician = медицинский офицер
+job-name-senior-officer = ветеран СБ
+job-name-senior-salvage-specialist = охотник карго

 # Role timers - Make these alphabetical or I cut you
 JobAtmosphericTechnician = атмосферный техник
@@ -89,6 +94,11 @@ JobScientist = учёный
 JobSecurityCadet = кадет СБ
 JobSecurityOfficer = офицер СБ
 JobServiceWorker = сервисный работник
+JobSeniorSalvageSpecialist = охотник карго
+JobSeniorEngineer = бригадир
+JobSeniorOfficer = ветеран СБ
+JobSeniorPhysician = медицинский офицер
+JobSeniorResearcher = ведущий исследователь
 JobStationEngineer = инженер
 JobTechnicalAssistant = технический ассистент
 JobWarden = смотритель
--- a/Resources/Locale/ru-RU/locales-new/autotranslate-10.ftl
+++ b/Resources/Locale/ru-RU/locales-new/autotranslate-10.ftl
@@ -1,6 +1,6 @@
-ent-SpawnPointSeniorResearcher = Точка спавна старшего учёного
+ent-SpawnPointSeniorResearcher = Точка спавна ведущего исследователя
   .desc = ""
-ent-SpawnPointSeniorOfficer = Точка спавна старшего офицера
+ent-SpawnPointSeniorOfficer = Точка спавна ветерана СБ
   .desc = ""
 ent-SpawnPointBrigmedic = Точка спавна бригмедика
   .desc = ""
--- a/Resources/Locale/ru-RU/locales-new/autotranslate-18.ftl
+++ b/Resources/Locale/ru-RU/locales-new/autotranslate-18.ftl
@@ -26,5 +26,5 @@ ent-ParamedicPDA = ПДА парамедика
   .desc = Блестящие и стерильные. Имеет встроенный экспресс-анализатор здоровья.
 ent-BrigmedicPDA = ПДА парамедика
   .desc = Интересно, чей пульс на экране? Надеюсь, он не остановится... В ПДА встроен анализатор здоровья.
-ent-SeniorEngineerPDA = ПДА опытного инженера
+ent-SeniorEngineerPDA = ПДА бригадира
   .desc = Кажется, его несколько раз разбирали и собирали обратно.
--- a/Resources/Locale/ru-RU/locales-new/autotranslate-19.ftl
+++ b/Resources/Locale/ru-RU/locales-new/autotranslate-19.ftl
@@ -1,9 +1,11 @@
-ent-SeniorResearcherPDA = ПДА старшего научного сотрудника
+ent-SeniorResearcherPDA = ПДА ведущего исследователя
   .desc = Похоже, он пережил годы химических ожогов и взрывов.
-ent-SeniorPhysicianPDA = ПДА старшего врача
+ent-SeniorPhysicianPDA = ПДА медицинского офицера
   .desc = Слабо пахнет железом и химикатами. Имеет встроенный анализатор здоровья.
-ent-SeniorOfficerPDA = ПДА старшего офицера
+ent-SeniorOfficerPDA = ПДА ветерана СБ
   .desc = Избитые, потрепанные и сломанные, но едва пригодные для использования.
+ent-SeniorSalvagePDA = ПДА охотника карго
+   .desc = Потрепанный и воняющий кровью с потом, но пригодный для использования.
 ent-PinpointerUniversal = универсальный пинпоинтер
   .desc = Портативное устройство слежения, которое фиксируется на любом физическом объекте в выключенном состоянии.
 ent-HandheldStationMap = карта станции
--- a/Resources/Locale/ru-RU/locales-new/autotranslate-27.ftl
+++ b/Resources/Locale/ru-RU/locales-new/autotranslate-27.ftl
@@ -8,13 +8,15 @@ ent-ParamedicIDCard = ID карта парамедика
   .desc = { ent-IDCardStandard.desc }
 ent-BrigmedicIDCard = ID карта бригмедика
   .desc = { ent-IDCardStandard.desc }
-ent-SeniorEngineerIDCard = ID карта опытного инженера
+ent-SeniorEngineerIDCard = ID карта бригадира
   .desc = { ent-IDCardStandard.desc }
-ent-SeniorResearcherIDCard = ID карта старшего начного сотрудника
+ent-SeniorResearcherIDCard = ID карта ведущего исследователя
   .desc = { ent-IDCardStandard.desc }
-ent-SeniorPhysicianIDCard = ID карта старшего врача
+ent-SeniorPhysicianIDCard = ID карта медицинского офицера
   .desc = { ent-IDCardStandard.desc }
-ent-SeniorOfficerIDCard = ID карта старшего офицера
+ent-SeniorOfficerIDCard = ID карта ветерана СБ
+   .desc = { ent-IDCardStandard.desc }
+ent-SeniorSalvageSpecialistIDCard = ID карта охотника карго
   .desc = { ent-IDCardStandard.desc }
 ent-BikeHornImplanter = имплантат велосипедного гудка
   .desc = ""
--- a/Resources/Locale/ru-RU/locales-new/autotranslate-53.ftl
+++ b/Resources/Locale/ru-RU/locales-new/autotranslate-53.ftl
@@ -30,8 +30,6 @@ ent-PowerCellSlotHighItem = ""
   .desc = ""
 ent-FlaskBase = { ent-BaseItem }
   .desc = { ent-BaseItem.desc }
-ent-FoodMealHappyHonkClown = { ent-HappyHonk }
-   .desc = { ent-HappyHonk.desc }
 ent-BaseFoodCondiment = { ent-BaseItem }
   .desc = { ent-BaseItem.desc }
 ent-BaseVape = { ent-BaseItem.desc }
--- a/Resources/Locale/ru-RU/locales-new/autotranslate-6.ftl
+++ b/Resources/Locale/ru-RU/locales-new/autotranslate-6.ftl
@@ -6,9 +6,9 @@ ent-ClothingOuterCoatSyndieCapArmored = бронированный плащ си
   .desc = Бронированный плащ синдиката изготовлен из прочной ткани с позолоченными узорами.
 ent-ClothingOuterCoatAMG = бронированный медицинский халат
   .desc = Вариант медицинского халата с элементами пуленепробиваемого жилета выглядит странно, но ваше сердце защищено.
-ent-ClothingOuterCoatLabSeniorResearcher = лабораторный халат старшего научного сотрудника
+ent-ClothingOuterCoatLabSeniorResearcher = лабораторный халат ведущего исследователя
   .desc = Костюм, защищающий от незначительных разливов химических веществ. С фиолетовым воротником и отделкой на запястьях.
-ent-ClothingOuterCoatLabSeniorPhysician = лабораторный халат старшего врача
+ent-ClothingOuterCoatLabSeniorPhysician = лабораторный халат медицинского офицера
   .desc = Костюм, защищающий от незначительных разливов химических веществ. Со светло-голубыми рукавами и оранжевой отделкой на талии.
 ent-ClothingOuterHardsuitBasic = базовый скафандр
   .desc = Базовый универсальный защитный костюм, который защищает владельца от ужасов жизни в космосе. По крайней мере, лучше, чем отсутствие жесткого костюма.
--- a/Resources/Locale/ru-RU/locales-new/autotranslate-7.ftl
+++ b/Resources/Locale/ru-RU/locales-new/autotranslate-7.ftl
@@ -8,14 +8,16 @@ ent-ClothingUniformJumpskirtTacticalMaid = тактическая юбка го
   .desc = Предполагается, что у лучших горничных должны быть дизайнерские костюмы.
 ent-ClothingUniformJumpskirtOfLife = юбка жизни
   .desc = Юбка, которая символизирует радость и позитив нашей жизни.
-ent-ClothingUniformJumpskirtSeniorEngineer = юбка старшего инженера
+ent-ClothingUniformJumpskirtSeniorEngineer = юбка бригадира
   .desc = Знак мастерства и престижа в инженерном отделе.
-ent-ClothingUniformJumpskirtSeniorResearcher = юбка старшего научного сотрудника
+ent-ClothingUniformJumpskirtSeniorResearcher = юбка ведущего исследователя
   .desc = Знак мастерства и престижа в научном отделе.
-ent-ClothingUniformJumpskirtSeniorPhysician = юбка старшего врача
+ent-ClothingUniformJumpskirtSeniorPhysician = юбка медицинского офицера
   .desc = Знак мастерства и престижа в медицинском отделе.
-ent-ClothingUniformJumpskirtSeniorOfficer = юбка старшего офицера
+ent-ClothingUniformJumpskirtSeniorOfficer = юбка ветерана СБ
   .desc = Признак мастерства и престижа в отделе безопасности.
+ent-ClothingUniformJumpskirtSeniorSalvageSpecialist = юбка охотника карго
+   .desc = Знак мастерства и престижа в каргонии.
 ent-ClothingUniformJumpsuitDeathSquad = Униформа отряда смерти
   .desc = Усовершенствованный бронированный комбинезон, используемый спецназом в специальных операциях.
 ent-ClothingUniformJumpsuitJacketMonkey = обезьянья куртка бармена
--- a/Resources/Locale/ru-RU/locales-new/autotranslate-8.ftl
+++ b/Resources/Locale/ru-RU/locales-new/autotranslate-8.ftl
@@ -10,14 +10,16 @@ ent-ClothingUniformJumpsuitSyndieFormal = официальный костюм с
   .desc = Униформа синдиката выполнена в элегантном стиле, в таком даже жалко делать пакости.
 ent-ClothingUniformJumpsuitFlannel = фланелевый комбинезон
   .desc = Пахнет так, будто кто-то готовил на гриле'.
-ent-ClothingUniformJumpsuitSeniorEngineer = комбинезон опытного инженера
+ent-ClothingUniformJumpsuitSeniorEngineer = комбинезон бригадира
   .desc = Знак мастерства и престижа в инженерном отделе.
-ent-ClothingUniformJumpsuitSeniorResearcher = комбинезон старшего научного сотрудника
+ent-ClothingUniformJumpsuitSeniorResearcher = комбинезон ведущего исследователя
   .desc = Знак мастерства и престижа в научном отделе.
-ent-ClothingUniformJumpsuitSeniorPhysician = комбинезон старшего врача
+ent-ClothingUniformJumpsuitSeniorPhysician = комбинезон медицинского офицера
   .desc = Знак мастерства и престижа в медицинском отделе.
-ent-ClothingUniformJumpsuitSeniorOfficer = комбинезон старшего офицера
+ent-ClothingUniformJumpsuitSeniorOfficer = комбинезон ветерана СБ
   .desc = Признак мастерства и престижа в отделе безопасности.
+ent-ClothingUniformJumpsuitSeniorSalvageSpecialist = комбинезон охотника карго
+   .desc = Знак мастерства и престижа в каргонии.
 ent-ClothingUniformJumpsuitRecruitNT = комбинезон новобранца
   .desc = Стильный серый комбинезон с синей отделкой. Идеально подходит для достойного помощника.
 ent-ClothingUniformJumpsuitRecruitSyndie = комбинезон новобранца синдиката
--- a/Resources/Locale/ru-RU/locales-new/autotranslate-9.ftl
+++ b/Resources/Locale/ru-RU/locales-new/autotranslate-9.ftl
@@ -32,9 +32,11 @@ ent-SpawnPointResearchAssistant = Точка спавна научного ас
   .desc = ""
 ent-SpawnPointBoxer = Точка спавна боксёра
   .desc = ""
-ent-SpawnPointSeniorEngineer = Точка спавна опытного инженера
+ent-SpawnPointSeniorEngineer = Точка спавна бригадира
   .desc = ""
-ent-SpawnPointSeniorPhysician = Точка спавна старшего врача
+ent-SpawnPointSeniorPhysician = Точка спавна медицинского офицера
+   .desc = ""
+ent-SpawnPointSeniorSalvageSpecialist = Точка спавна охтника карго
   .desc = ""
 ent-SpawnPointParamedic = Точка спавна парамедика
   .desc = ""
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl
@@ -1,8 +1,5 @@
 ent-ClothingBackpackDuffelSurgeryFilled = хирургический вещмешок
    .desc = Большой вещевой мешок для хранения дополнительного медицинского снаряжения - похоже, этот мешок предназначен для хранения хирургических инструментов.
-ent-ClothingBackpackDuffelCBURNFilled = { ent-ClothingBackpackDuffelCBURN }
-    .desc = { ent-ClothingBackpackDuffelCBURN.desc }
-    .suffix = Заполненный
 ent-ClothingBackpackDuffelSyndicateFilledMedical = хирургический вещмешок синдиката
    .desc = Большой вещевой мешок с полным набором хирургических инструментов.
 ent-ClothingBackpackDuffelSyndicateFilledShotgun = набор "Бульдог"
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/startergear/satchel.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/startergear/satchel.ftl
@@ -16,8 +16,6 @@ ent-ClothingBackpackSatchelParamedicFilled = { ent-ClothingBackpackSatchelMedica
    .desc = { ent-ClothingBackpackSatchelMedical.desc }
 ent-ClothingBackpackSatchelCaptainFilled = { ent-ClothingBackpackSatchelCaptain }
    .desc = { ent-ClothingBackpackSatchelCaptain.desc }
-ent-ClothingBackpackSatchelChiefEngineerFilled = { ent-ClothingBackpackSatchelCE }
-    .desc = { ent-ClothingBackpackSatchelCE.desc }
 ent-ClothingBackpackSatchelResearchDirectorFilled = { ent-ClothingBackpackSatchelScience }
    .desc = { ent-ClothingBackpackSatchelScience.desc }
 ent-ClothingBackpackSatchelHOPFilled = { ent-ClothingBackpackSatchel }
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl
@@ -91,7 +91,7 @@ ent-RDIDCard = ID карта научного руководителя
 ent-HoSIDCard = ID карта главы службы безопасности
    .desc = { ent-IDCardStandard.desc }
    .suffix = { "" }
-ent-CentcomIDCard = ID карта старшего офицера
+ent-CentcomIDCard = ID карта ветерана СБ
    .desc = { ent-IDCardStandard.desc }
    .suffix = { "" }
 ent-ERTLeaderIDCard = ID карта ОБР
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/medkits.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/medkits.ftl
@@ -22,3 +22,6 @@ ent-MedkitRadiation = набор для выведения радиации
 ent-MedkitCombat = боевая аптечка
    .desc = Для любителей больших пушек среди нас.
    .suffix = { "" }
+ent-ExpandedMedkit = расширенная аптечка
+    .desc = Легкое хранилище в которое можно сложить многое!
+    .suffix = { "" }
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/clothing/belt/seniors_belts.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/clothing/belt/seniors_belts.ftl
@@ -0,0 +1,11 @@
+ent-ClothingBeltSeniorSecurityFilled = пояс ветерана СБ
+    .desc = Прошедший многое пояс офицера станции.
+    .suffix = { "" }
+
+ent-ClothingBeltSeniorPhysicianFilled = пояс медицинского офицера
+    .desc = Может вмещать различное медицинское снаряжение. На вид большой, но везде вмещается.
+    .suffix = { "" }
+
+ent-ClothingBeltUtilitySeniorEngineerFilled = пояс бригадира
+    .desc = Держит инструменты под рукой. Выглядит старым.
+    .suffix = { "" }
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/clothing/outerclothing/seniors_outer.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/clothing/outerclothing/seniors_outer.ftl
@@ -0,0 +1,7 @@
+ent-ClothingOuterHardsuitImprovedSpatio = скафандр охотника карго
+    .desc = Переживший многие экспедиции скафандр.
+    .suffix = { "" }
+
+ent-ClothingHeadHelmetHardsuitImprovedSpatio = шлем скафандра охотника карго
+    .desc = Переживший многие экспедиции шлем скафандра.
+    .suffix = { "" }
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/tools/seniors_tools.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/tools/seniors_tools.ftl
@@ -0,0 +1,19 @@
+ent-ImprovedCrowbar = улучшенный лом
+    .desc = Инструмент, которому сложно найти замену.
+    .suffix = { "" }
+
+ent-ImprovedWrench = улучшенный гаечный ключ
+    .desc = Символ инженерии, да еще и удобный, прямо у вас в руках!
+    .suffix = { "" }
+
+ent-ImprovedScrewdriver = улучшенная отвёртка
+    .desc = Настоящий станок скручивания панелей в маленькой отвертке!
+    .suffix = { "" }
+
+ent-ImprovedWirecutter = улучшенные кусачки
+    .desc = Перед этим оружием не устоит ни один провод, если вы не забыли желтую пару.
+    .suffix = { "" }
+
+ent-ImprovedWelder = улучшенный сварочный аппарат
+    .desc = Плавит всё что угодно и даже больше пока заправлен. В том числе и ваши глаза!
+    .suffix = { "" }
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/experimental_stunbaton.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/experimental_stunbaton.ftl
@@ -0,0 +1,3 @@
+ent-ExperimentalStunbaton = экспериментальная дубинка-шокер
+    .desc = Новейшая электрошоковая дубинка для обездвиживания людей. Медленее разряжается, дольше заряжается.
+    .suffix = { "" }
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -1214,6 +1214,7 @@
    whitelist:
    - Zookeeper
    - Scientist
+    - SeniorResearcher
    - ResearchDirector
    - Chef
    - ResearchAssistant
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -275,6 +275,7 @@
        - PillCanister
        - Radio
        - DiscreteHealthAnalyzer
+        - SurgeryTool
      components:
        - Hypospray
        - Injector
--- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
@@ -351,6 +351,18 @@
      - state: green
      - state: ce

+- type: entity
+  id: SpawnPointSeniorEngineer
+  parent: SpawnPointJobBase
+  name: seniorengineer
+  components:
+  - type: SpawnPoint
+    job_id: SeniorEngineer
+  - type: Sprite
+    layers:
+      - state: green
+      - state: seniorengineer
+
 - type: entity
  id: SpawnPointStationEngineer
  parent: SpawnPointJobBase
@@ -389,6 +401,18 @@
      - state: green
      - state: cmo

+- type: entity
+  id: SpawnPointSeniorPhysician
+  parent: SpawnPointJobBase
+  name: seniorphysician
+  components:
+  - type: SpawnPoint
+    job_id: SeniorPhysician
+  - type: Sprite
+    layers:
+      - state: green
+      - state: seniorphysician
+
 - type: entity
  id: SpawnPointMedicalDoctor
  parent: SpawnPointJobBase
@@ -439,6 +463,18 @@
      - state: green
      - state: rd

+- type: entity
+  id: SpawnPointSeniorResearcher
+  parent: SpawnPointJobBase
+  name: seniorresearcher
+  components:
+  - type: SpawnPoint
+    job_id: SeniorResearcher
+  - type: Sprite
+    layers:
+      - state: green
+      - state: seniorresearcher
+
 - type: entity
  id: SpawnPointScientist
  parent: SpawnPointJobBase
@@ -477,6 +513,18 @@
      - state: green
      - state: warden

+- type: entity
+  id: SpawnPointSeniorOfficer
+  parent: SpawnPointJobBase
+  name: seniorofficer
+  components:
+  - type: SpawnPoint
+    job_id: SeniorOfficer
+  - type: Sprite
+    layers:
+      - state: green
+      - state: seniorofficer
+
 - type: entity
  id: SpawnPointSecurityOfficer
  parent: SpawnPointJobBase
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -5,6 +5,9 @@
  id: BaseToolSurgery
  abstract: true
  components:
+  - type: Tag
+    tags:
+      - SurgeryTool
  - type: Sprite
  - type: StaticPrice
    price: 20
--- a/Resources/Prototypes/Maps/atlas.yml
+++ b/Resources/Prototypes/Maps/atlas.yml
@@ -29,21 +29,25 @@
            ServiceWorker: [ 1, 1 ]
            #engineering
            ChiefEngineer: [ 1, 1 ]
+            SeniorEngineer: [1, 1 ]
            AtmosphericTechnician: [ 2, 2 ]
            StationEngineer: [ 2, 2 ]
            TechnicalAssistant: [ 1, 3 ]
            #medical
            ChiefMedicalOfficer: [ 1, 1 ]
+            SeniorPhysician: [ 1, 1 ]
            Chemist: [ 1, 1 ]
            MedicalDoctor: [ 2, 2 ]
            MedicalIntern: [ 1, 3 ]
            #science
            ResearchDirector: [ 1, 1 ]
+            SeniorResearcher: [ 1, 1 ]
            Scientist: [ 2, 2 ]
            ResearchAssistant: [ 1, 3 ]
            Borg: [ 2, 2 ]
            #security
            HeadOfSecurity: [ 1, 1 ]
+            SeniorOfficer: [ 1, 1 ]
            Warden: [ 1, 1 ]
            SecurityOfficer: [ 3, 3 ]
            SecurityCadet: [ 1, 3 ]
--- a/Resources/Prototypes/Maps/bagel.yml
+++ b/Resources/Prototypes/Maps/bagel.yml
@@ -31,11 +31,13 @@
            ServiceWorker: [ 2, 2 ]
            #engineering
            ChiefEngineer: [ 1, 1 ]
+            SeniorEngineer: [ 1, 1 ]
            AtmosphericTechnician: [ 3, 3 ]
            StationEngineer: [ 4, 4 ]
            TechnicalAssistant: [ 4, 4 ]
            #medical
            ChiefMedicalOfficer: [ 1, 1 ]
+            SeniorPhysician: [ 1, 1 ]
            Chemist: [ 2, 2 ]
            MedicalDoctor: [ 3, 3 ]
            Paramedic: [ 1, 1 ]
@@ -45,6 +47,7 @@
            Scientist: [ 5, 5 ]
            ResearchAssistant: [ 4, 4 ]
            Borg: [ 2, 2 ]
+            SeniorResearcher: [ 1, 1 ]
            #security
            HeadOfSecurity: [ 1, 1 ]
            Warden: [ 1, 1 ]
@@ -52,6 +55,7 @@
            Detective: [ 1, 1 ]
            SecurityCadet: [ 4, 4 ]
            Lawyer: [ 2, 2 ]
+            SeniorOfficer: [ 1, 1 ]
            #supply
            Quartermaster: [ 1, 1 ]
            SalvageSpecialist: [ 3, 3 ]
--- a/Resources/Prototypes/Maps/box.yml
+++ b/Resources/Prototypes/Maps/box.yml
@@ -30,25 +30,29 @@
            ServiceWorker: [ 2, 2 ]
            #engineering
            ChiefEngineer: [ 1, 1 ]
+            SeniorEngineer: [ 1, 1 ]
            AtmosphericTechnician: [ 3, 3 ]
-            StationEngineer: [ 5, 5 ]
+            StationEngineer: [ 4, 4 ]
            TechnicalAssistant: [ 4, 4 ]
            #medical
            ChiefMedicalOfficer: [ 1, 1 ]
+            SeniorPhysician: [ 1, 1 ]
            Chemist: [ 2, 3 ]
-            MedicalDoctor: [ 4, 4 ]
+            MedicalDoctor: [ 3, 3 ]
            Paramedic: [ 1, 1 ]
            MedicalIntern: [ 4, 4 ]
            Psychologist: [ 1, 1 ]
            #science
            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 5, 5 ]
-            ResearchAssistant: [ 4, 4 ]
+            SeniorResearcher: [ 1, 1 ]        
+            Scientist: [ 4, 4 ]
+            ResearchAssistant: [ 4, 4 ] 
            Borg: [ 2, 2 ]
            #security
            HeadOfSecurity: [ 1, 1 ]
            Warden: [ 1, 1 ]
-            SecurityOfficer: [ 5, 5 ]
+            SeniorOfficer: [ 1, 1 ]
+            SecurityOfficer: [ 4, 4 ]
            Detective: [ 1, 1 ]
            SecurityCadet: [ 4, 4 ]
            Lawyer: [ 2, 2 ]
@@ -61,4 +65,4 @@
            Clown: [ 1, 1 ]
            Mime: [ 1, 1 ]
            Musician: [ 1, 1 ]
-
+            
--- a/Resources/Prototypes/Maps/cluster.yml
+++ b/Resources/Prototypes/Maps/cluster.yml
@@ -32,24 +32,28 @@
            ServiceWorker: [ 1, 1 ]
            #engineering
            ChiefEngineer: [ 1, 1 ]
+            SeniorEngineer: [ 1, 1 ]
            AtmosphericTechnician: [ 2, 2 ]
-            StationEngineer: [ 3, 3 ]
+            StationEngineer: [ 2, 2 ]
            TechnicalAssistant: [ 2, 2 ]
            #medical
            ChiefMedicalOfficer: [ 1, 1 ]
+            SeniorPhysician: [ 1, 1 ]
            Chemist: [ 1, 1 ]
-            MedicalDoctor: [ 2, 2 ]
+            MedicalDoctor: [ 1, 1 ]
            MedicalIntern: [ 2, 2 ]
            #science
            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 3, 3 ]
+            SeniorResearcher: [ 1 , 1 ]
+            Scientist: [ 2, 2 ]
            ResearchAssistant: [ 2, 2 ]
            Borg: [ 1, 1 ]
            #security
            HeadOfSecurity: [ 1, 1 ]
            Warden: [ 1, 1 ]
+            SeniorOfficer: [ 1, 1 ]
            Detective: [ 1, 1 ]
-            SecurityOfficer: [ 3, 3 ]
+            SecurityOfficer: [ 2, 2 ]
            SecurityCadet: [ 2, 2 ]
            #supply
            Quartermaster: [ 1, 1 ]
@@ -60,4 +64,4 @@
            Clown: [ 1, 1 ]
            Mime: [ 1, 1 ]
            Musician: [ 1, 1 ]
-
+            
--- a/Resources/Prototypes/Maps/core.yml
+++ b/Resources/Prototypes/Maps/core.yml
@@ -33,22 +33,26 @@
            ServiceWorker: [ 3, 3 ]
            #engineering
            ChiefEngineer: [ 1, 1 ]
+            SeniorEngineer: [ 1, 1 ]
            StationEngineer: [ 4, 4 ]
            AtmosphericTechnician: [ 2, 2 ]
            TechnicalAssistant: [ 2, 2 ]
            #medical
            ChiefMedicalOfficer: [ 1, 1 ]
+            SeniorPhysician: [ 1, 1 ]
            MedicalDoctor: [ 3, 4 ]
            Chemist: [ 1, 2 ]
            MedicalIntern: [ 2, 2 ]
            Paramedic: [ 1, 2 ]
            #science
            ResearchDirector: [ 1, 1 ]
+            SeniorResearcher: [ 1, 1 ]
            Scientist: [ 3, 3 ]
            ResearchAssistant: [ 1, 1 ]
            Borg: [ 1, 2 ]
            #security
            HeadOfSecurity: [ 1, 1 ]
+            SeniorOfficer: [ 1, 1 ]
            SecurityOfficer: [ 4, 4 ]
            Warden: [ 1, 1 ]
            Lawyer: [ 1, 1 ]
--- a/Resources/Prototypes/Maps/europa.yml
+++ b/Resources/Prototypes/Maps/europa.yml
@@ -31,26 +31,30 @@
            ServiceWorker: [ 3, 4 ]
            #engineering
            ChiefEngineer: [ 1, 1 ]
-            StationEngineer: [ 3, 3 ]
+            StationEngineer: [ 2, 2 ]
            AtmosphericTechnician: [ 2, 2 ]
            TechnicalAssistant: [ 1, 1 ]
+            SeniorEngineer: [ 1, 1 ]
            #medical
            ChiefMedicalOfficer: [ 1, 1 ]
-            MedicalDoctor: [ 2, 3 ]
+            MedicalDoctor: [ 1, 2 ]
            Chemist: [ 1, 2 ]
            MedicalIntern: [ 1, 1 ]
            Paramedic: [ 1, 2 ]
+            SeniorPhysician: [ 1, 1 ]
            #science
            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 2, 3 ]
+            Scientist: [ 1, 2 ]
            ResearchAssistant: [ 1, 1 ]
+            SeniorResearcher: [ 1, 1 ] 
            #security
            HeadOfSecurity: [ 1, 1 ]
-            SecurityOfficer: [ 3, 3 ]
+            SecurityOfficer: [ 2, 2 ]
            Warden: [ 1, 1 ]
            Lawyer: [ 1, 1 ]
            SecurityCadet: [ 3, 3 ]
            Detective: [ 1, 1 ]
+            SeniorOfficer: [ 1, 1 ]
            #supply
            CargoTechnician: [ 3, 3 ]
            Quartermaster: [ 1, 1 ]
--- a/Resources/Prototypes/Maps/fland.yml
+++ b/Resources/Prototypes/Maps/fland.yml
@@ -30,24 +30,28 @@
            ServiceWorker: [ 2, 2 ]
            #engineering
            ChiefEngineer: [ 1, 1 ]
+            SeniorEngineer: [ 1, 1 ]
            AtmosphericTechnician: [ 3, 3 ]
-            StationEngineer: [ 5, 5 ]
+            StationEngineer: [ 4, 4 ]
            TechnicalAssistant: [ 4, 4 ]
            #medical
            ChiefMedicalOfficer: [ 1, 1 ]
+            SeniorPhysician: [ 1, 1 ]
            Chemist: [ 3, 3 ]
-            MedicalDoctor: [ 6, 6 ]
+            MedicalDoctor: [ 5, 5 ]
            Paramedic: [ 2, 2 ]
            MedicalIntern: [ 4, 4 ]
            #science
            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 5, 5 ]
-            ResearchAssistant: [ 6, 6 ]
+            SeniorResearcher: [ 1, 1 ]        
+            Scientist: [ 4, 4 ]
+            ResearchAssistant: [ 6, 6 ] 
            Borg: [ 2, 2 ]
            #security
            HeadOfSecurity: [ 1, 1 ]
            Warden: [ 1, 1 ]
-            SecurityOfficer: [ 8, 8 ]
+            SeniorOfficer: [ 1, 1 ]
+            SecurityOfficer: [ 7, 7 ]
            Detective: [ 1, 1 ]
            SecurityCadet: [ 4, 4 ]
            Lawyer: [ 2, 2 ]
--- a/Resources/Prototypes/Maps/marathon.yml
+++ b/Resources/Prototypes/Maps/marathon.yml
@@ -31,11 +31,13 @@
            ServiceWorker: [ 2, 2 ]
            #engineering
            ChiefEngineer: [ 1, 1 ]
+            SeniorEngineer: [ 1, 1 ]
            AtmosphericTechnician: [ 3, 3 ]
            StationEngineer: [ 4, 4 ]
            TechnicalAssistant: [ 3, 3 ]
            #medical
            ChiefMedicalOfficer: [ 1, 1 ]
+            SeniorPhysician: [ 1, 1 ]
            Chemist: [ 2, 2 ]
            MedicalDoctor: [ 4, 4 ]
            MedicalIntern: [ 3, 3 ]
@@ -43,6 +45,7 @@
            Paramedic: [ 1, 1 ]
            #science
            ResearchDirector: [ 1, 1 ]
+            SeniorResearcher: [ 1, 1 ]
            Scientist: [ 4, 4 ]
            ResearchAssistant: [ 3, 3 ]
            Borg: [ 2, 2 ]
@@ -53,6 +56,7 @@
            Detective: [ 1, 1 ]
            SecurityCadet: [ 4, 4 ]
            Lawyer: [ 2, 2 ]
+            SeniorOfficer: [ 1, 1 ]
            #supply
            Quartermaster: [ 1, 1 ]
            SalvageSpecialist: [ 3, 3 ]
--- a/Resources/Prototypes/Maps/meta.yml
+++ b/Resources/Prototypes/Maps/meta.yml
@@ -30,24 +30,28 @@
            ServiceWorker: [ 2, 2 ]
            #engineering
            ChiefEngineer: [ 1, 1 ]
+            SeniorEngineer: [ 1, 1 ]
            AtmosphericTechnician: [ 3, 3 ]
-            StationEngineer: [ 5, 7 ]
+            StationEngineer: [ 4, 6 ]
            TechnicalAssistant: [ 3, 6 ]
            #medical
            ChiefMedicalOfficer: [ 1, 1 ]
+            SeniorPhysician: [ 1, 1 ]
            Chemist: [ 3, 3 ]
-            MedicalDoctor: [ 5, 5 ]
+            MedicalDoctor: [ 4, 4 ]
            MedicalIntern: [ 3, 6 ]
            Paramedic: [ 1, 1 ]
            #science
            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 5, 7 ]
-            ResearchAssistant: [ 3, 6 ]
+            SeniorResearcher: [ 1, 1 ]        
+            Scientist: [ 4, 6 ]
+            ResearchAssistant: [ 3, 6 ] 
            Borg: [ 2, 2 ]
            #security
            HeadOfSecurity: [ 1, 1 ]
            Warden: [ 1, 1 ]
-            SecurityOfficer: [ 5, 7 ]
+            SeniorOfficer: [ 1, 1 ]
+            SecurityOfficer: [ 4, 6 ]
            Detective: [ 1, 1 ]
            SecurityCadet: [ 3, 6 ]
            Lawyer: [ 2, 2 ]
--- a/Resources/Prototypes/Maps/omega.yml
+++ b/Resources/Prototypes/Maps/omega.yml
@@ -31,22 +31,26 @@
            ServiceWorker: [ 2, 2 ]
            #engineering
            ChiefEngineer: [ 1, 1 ]
+            SeniorEngineer: [ 1, 1 ]
            AtmosphericTechnician: [ 2, 2 ]
-            StationEngineer: [ 3, 3 ]
+            StationEngineer: [ 2, 2 ]
            TechnicalAssistant: [ 2, 2 ]
            #medical
            ChiefMedicalOfficer: [ 1, 1 ]
+            SeniorPhysician: [ 1, 1 ]
            Chemist: [ 2, 2 ]
-            MedicalDoctor: [ 3, 3 ]
+            MedicalDoctor: [ 2, 2 ]
            MedicalIntern: [ 2, 2 ]
            #science
            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 4, 4 ]
-            ResearchAssistant: [ 2, 2 ]
+            SeniorResearcher: [ 1, 1 ]        
+            Scientist: [ 3, 3 ]
+            ResearchAssistant: [ 2, 2 ] 
            #security
            HeadOfSecurity: [ 1, 1 ]
            Warden: [ 1, 1 ]
-            SecurityOfficer: [ 4, 4 ]
+            SeniorOfficer: [ 1, 1 ]
+            SecurityOfficer: [ 3, 3 ]
            Detective: [ 1, 1 ]
            SecurityCadet: [ 2, 2 ]
            Lawyer: [ 1, 1 ]
--- a/Resources/Prototypes/Maps/origin.yml
+++ b/Resources/Prototypes/Maps/origin.yml
@@ -31,26 +31,30 @@
            ServiceWorker: [ 3, 4 ]
            #engineering
            ChiefEngineer: [ 1, 1 ]
+            SeniorEngineer: [ 1, 1 ]
            AtmosphericTechnician: [ 3, 3 ]
-            StationEngineer: [ 6, 6 ]
+            StationEngineer: [ 5, 5 ]
            TechnicalAssistant: [ 2, 3 ]
            #medical
            ChiefMedicalOfficer: [ 1, 1 ]
+            SeniorPhysician: [ 1, 1 ]
            Chemist: [ 2, 3 ]
            Paramedic: [ 1, 1 ]
-            MedicalDoctor: [ 6, 6 ]
+            MedicalDoctor: [ 5, 5 ]
            Psychologist: [ 1, 1 ]
            MedicalIntern: [ 1, 2 ]
            #science
            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 6, 6 ]
+            SeniorResearcher: [ 1, 1 ]
+            Scientist: [ 5, 5 ]
            ResearchAssistant: [ 4, 4 ]
            Borg: [ 2, 2 ]
            #security
            HeadOfSecurity: [ 1, 1 ]
            Warden: [ 1, 1 ]
+            SeniorOfficer: [ 1, 1 ]
            Detective: [ 1, 1 ]
-            SecurityOfficer: [ 7, 7 ]
+            SecurityOfficer: [ 6, 6 ]
            SecurityCadet: [ 2, 4 ]
            #supply
            Quartermaster: [ 1, 1 ]
@@ -63,4 +67,4 @@
            Musician: [ 2, 2 ]
            Boxer: [ 1, 1 ]
            Reporter: [ 1, 1 ]
-
+            
--- a/Resources/Prototypes/Maps/packed.yml
+++ b/Resources/Prototypes/Maps/packed.yml
@@ -29,23 +29,27 @@
            ServiceWorker: [ 2, 2 ]
            #engineering
            ChiefEngineer: [ 1, 1 ]
+            SeniorEngineer: [ 1, 1 ]
            AtmosphericTechnician: [ 2, 2 ]
-            StationEngineer: [ 4, 4 ]
+            StationEngineer: [ 3, 3 ]
            TechnicalAssistant: [ 3, 3 ]
            #medical
            ChiefMedicalOfficer: [ 1, 1 ]
+            SeniorPhysician: [ 1, 1 ]
            Chemist: [ 2, 2 ]
-            MedicalDoctor: [ 3, 3 ]
+            MedicalDoctor: [ 2, 2 ]
            MedicalIntern: [ 2, 2 ]
            Paramedic: [ 1, 1 ]
            #science
            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 4, 4 ]
-            ResearchAssistant: [ 2, 2 ]
+            SeniorResearcher: [ 1, 1 ]        
+            Scientist: [ 3, 3 ]
+            ResearchAssistant: [ 2, 2 ] 
            #security
            HeadOfSecurity: [ 1, 1 ]
            Warden: [ 1, 1 ]
-            SecurityOfficer: [ 4, 4 ]
+            SeniorOfficer: [ 1, 1 ]
+            SecurityOfficer: [ 3, 3 ]
            Detective: [ 1, 1 ]
            SecurityCadet: [ 2, 2 ]
            Lawyer: [ 1, 1 ]
--- a/Resources/Prototypes/Maps/saltern.yml
+++ b/Resources/Prototypes/Maps/saltern.yml
@@ -31,22 +31,26 @@
            #engineering
            ChiefEngineer: [ 1, 1 ]
            AtmosphericTechnician: [ 2, 2 ]
-            StationEngineer: [ 4, 4 ]
+            SeniorEngineer: [1, 1 ]
+            StationEngineer: [ 3, 3 ]
            TechnicalAssistant: [ 4, 4 ]
            #medical
            ChiefMedicalOfficer: [ 1, 1 ]
+            SeniorPhysician: [ 1, 1 ]
            Chemist: [ 2, 2 ]
-            MedicalDoctor: [ 3, 3 ]
+            MedicalDoctor: [ 2, 2 ]
            MedicalIntern: [ 4, 4 ]
            #science
            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 4, 4 ]
+            SeniorResearcher: [1, 1 ]
+            Scientist: [ 3, 3 ]
            ResearchAssistant: [ 2, 2 ]
            Borg: [ 2, 2 ]
            #security
            HeadOfSecurity: [ 1, 1 ]
            Warden: [ 1, 1 ]
-            SecurityOfficer: [ 4, 4 ]
+            SeniorOfficer: [ 1, 1 ]
+            SecurityOfficer: [ 3, 3 ]
            SecurityCadet: [ 4, 4 ]
            #supply
            Quartermaster: [ 1, 1 ]
@@ -57,4 +61,4 @@
            Clown: [ 1, 1 ]
            Mime: [ 1, 1 ]
            Musician: [ 1, 1 ]
-
+            
--- a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml
@@ -0,0 +1,46 @@
+- type: job
+  id: SeniorEngineer
+  name: job-name-senior-engineer
+  description: job-description-senior-engineer
+  playTimeTracker: JobSeniorEngineer
+  requirements:
+    - !type:RoleTimeRequirement
+      role: JobAtmosphericTechnician
+      time: 21600 #6 hrs
+    - !type:RoleTimeRequirement
+      role: JobStationEngineer
+      time: 21600 #6 hrs
+    - !type:DepartmentTimeRequirement
+      department: Engineering
+      time: 216000 # 60 hrs
+  startingGear: SeniorEngineerGear
+  icon: "JobIconSeniorEngineer"
+  supervisors: job-supervisors-ce
+  canBeAntag: false
+  special:
+    - !type:AddImplantSpecial
+      implants: [ MindShieldImplant ]
+  access:
+  - Maintenance
+  - Engineering
+  - External
+  - Atmospherics
+
+- type: startingGear
+  id: SeniorEngineerGear
+  equipment:
+    head: ClothingHeadHatBeretEngineering
+    jumpsuit: ClothingUniformJumpsuitSeniorEngineer
+    back: ClothingBackpackEngineeringFilled
+    shoes: ClothingShoesBootsMag
+    id: SeniorEngineerPDA
+    eyes: ClothingEyesGlassesMeson
+    belt: ClothingBeltUtilitySeniorEngineerFilled
+    ears: ClothingHeadsetEngineering
+    gloves: ClothingHandsGlovesColorYellow
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerClothingSkirt: ClothingUniformJumpskirtSeniorEngineer
+  satchel: ClothingBackpackSatchelEngineeringFilled
+  duffelbag: ClothingBackpackDuffelEngineeringFilled
--- a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
@@ -0,0 +1,46 @@
+- type: job
+  id: SeniorPhysician
+  name: job-name-senior-physician
+  description: job-description-senior-physician
+  playTimeTracker: JobSeniorPhysician
+  requirements:
+    - !type:RoleTimeRequirement
+      role: JobChemist
+      time: 21600 #6 hrs
+    - !type:RoleTimeRequirement
+      role: JobMedicalDoctor
+      time: 21600 #6 hrs
+    - !type:DepartmentTimeRequirement
+      department: Medical
+      time: 216000 # 60 hrs
+  startingGear: SeniorPhysicianGear
+  icon: "JobIconSeniorPhysician"
+  supervisors: job-supervisors-cmo
+  canBeAntag: false
+  special:
+    - !type:AddImplantSpecial
+      implants: [ MindShieldImplant ]
+  access:
+  - Medical
+  - Maintenance
+  - Chemistry
+
+- type: startingGear
+  id: SeniorPhysicianGear
+  equipment:
+    head: ClothingHeadHatBeretBrigmedic
+    jumpsuit: ClothingUniformJumpsuitSeniorPhysician
+    back: ClothingBackpackMedicalFilled
+    shoes: ClothingShoesColorBlack
+    outerClothing: ClothingOuterCoatLabSeniorPhysician
+    id: SeniorPhysicianPDA
+    ears: ClothingHeadsetMedical
+    belt: ClothingBeltSeniorPhysicianFilled
+    mask: ClothingMaskSterile
+    gloves: ClothingHandsGlovesLatex
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerClothingSkirt: ClothingUniformJumpskirtSeniorPhysician
+  satchel: ClothingBackpackSatchelMedicalFilled
+  duffelbag: ClothingBackpackDuffelMedicalFilled
--- a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml
@@ -0,0 +1,38 @@
+- type: job
+  id: SeniorResearcher
+  name: job-name-senior-researcher
+  description: job-description-senior-researcher
+  playTimeTracker: JobSeniorResearcher
+  requirements:
+    - !type:DepartmentTimeRequirement
+      department: Science
+      time: 216000 #60 hrs
+  startingGear: SeniorResearcherGear
+  icon: "JobIconSeniorResearcher"
+  supervisors: job-supervisors-rd
+  canBeAntag: false
+  special:
+    - !type:AddImplantSpecial
+      implants: [ MindShieldImplant ]
+  access:
+  - Research
+  - Maintenance
+
+- type: startingGear
+  id: SeniorResearcherGear
+  equipment:
+    head: ClothingHeadHatBeretRND
+    jumpsuit: ClothingUniformJumpsuitSeniorResearcher
+    back: ClothingBackpackScienceFilled
+    shoes: ClothingShoesColorBlack
+    outerClothing: ClothingOuterCoatLabSeniorResearcher
+    id: SeniorResearcherPDA
+    ears: ClothingHeadsetScience
+    gloves: ClothingHandsGlovesColorYellow
+    belt: ClothingBeltUtilityFilled
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerClothingSkirt: ClothingUniformJumpskirtSeniorResearcher
+  satchel: ClothingBackpackSatchelScienceFilled
+  duffelbag: ClothingBackpackDuffelScienceFilled
--- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
@@ -0,0 +1,53 @@
+- type: job
+  id: SeniorOfficer
+  name: job-name-senior-officer
+  description: job-description-senior-officer
+  playTimeTracker: JobSeniorOfficer
+  requirements:
+    - !type:RoleTimeRequirement
+      role: JobWarden
+      time: 21600 #6 hrs
+    - !type:RoleTimeRequirement
+      role: JobDetective
+      time: 7200 #2 hrs
+    - !type:RoleTimeRequirement
+      role: JobSecurityOfficer
+      time: 21600 #6 hrs
+    - !type:DepartmentTimeRequirement
+      department: Security
+      time: 216000 # 60 hrs
+  startingGear: SeniorOfficerGear
+  icon: "JobIconSeniorOfficer"
+  supervisors: job-supervisors-hos
+  canBeAntag: false
+  access:
+  - Security
+  - Brig
+  - Maintenance
+  - Service
+  - External
+  - Medical
+  special:
+  - !type:AddImplantSpecial
+    implants: [ MindShieldImplant ]
+
+- type: startingGear
+  id: SeniorOfficerGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitSeniorOfficer
+    back: ClothingBackpackSecurityFilled
+    shoes: ClothingShoesBootsCombatFilled
+    eyes: ClothingEyesGlassesSecurity
+    head: ClothingHeadHatBeretSecurity
+    outerClothing: ClothingOuterArmorBasic
+    id: SeniorOfficerPDA
+    ears: ClothingHeadsetSecurity
+    belt: ClothingBeltSeniorSecurityFilled
+    pocket1: WeaponPistolMk58Nonlethal
+    gloves: ClothingHandsGlovesCombat
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerClothingSkirt: ClothingUniformJumpskirtSeniorOfficer
+  satchel: ClothingBackpackSatchelSecurityFilled
+  duffelbag: ClothingBackpackDuffelSecurityFilled
--- a/Resources/Prototypes/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -55,6 +55,7 @@
  roles:
  - AtmosphericTechnician
  - ChiefEngineer
+  - SeniorEngineer
  - StationEngineer
  - TechnicalAssistant

@@ -69,6 +70,7 @@
  - MedicalIntern
  - Psychologist
  - Paramedic
+  - SeniorPhysician

 - type: department
  id: Security
@@ -79,6 +81,7 @@
  - HeadOfSecurity
  - SecurityCadet
  - SecurityOfficer
+  - SeniorOfficer
  - Detective
  - Warden

@@ -88,6 +91,7 @@
  color: "#D381C9"
  roles:
  - ResearchDirector
+  - SeniorResearcher
  - Scientist
  - ResearchAssistant

--- a/Resources/Prototypes/Roles/play_time_trackers.yml
+++ b/Resources/Prototypes/Roles/play_time_trackers.yml
@@ -121,6 +121,18 @@
 - type: playTimeTracker
  id: JobSecurityOfficer

+- type: playTimeTracker
+  id: JobSeniorEngineer
+
+- type: playTimeTracker
+  id: JobSeniorOfficer
+
+- type: playTimeTracker
+  id: JobSeniorPhysician
+
+- type: playTimeTracker
+  id: JobSeniorResearcher
+
 - type: playTimeTracker
  id: JobServiceWorker

--- a/Resources/Prototypes/White/Catalog/seniors_fills.yml
+++ b/Resources/Prototypes/White/Catalog/seniors_fills.yml
@@ -0,0 +1,43 @@
+# Officer
+- type: entity
+  id: ClothingBeltSeniorSecurityFilled
+  parent: ClothingBeltSecurity
+  suffix: Filled
+  components:
+    - type: StorageFill
+      contents:
+        - id: GrenadeFlashBang
+        - id: TearGasGrenade
+        - id: ExperimentalStunbaton
+        - id: Handcuffs
+        - id: Handcuffs
+
+# Physician
+- type: entity
+  id: ClothingBeltSeniorPhysicianFilled
+  parent: ClothingBeltMedical
+  suffix: Filled
+  components:
+    - type: StorageFill
+      contents:
+        - id: Scalpel
+        - id: Retractor
+        - id: Cautery
+        - id: Drill
+        - id: Saw
+        - id: Hemostat
+
+# Engineer
+- type: entity
+  id: ClothingBeltUtilitySeniorEngineerFilled
+  parent: ClothingBeltUtility
+  suffix: Filled
+  components:
+    - type: StorageFill
+      contents:
+        - id: ImprovedCrowbar
+        - id: ImprovedWrench
+        - id: ImprovedScrewdriver
+        - id: ImprovedWirecutter
+        - id: ImprovedWelder
+        - id: Multitool
--- a/Resources/Prototypes/White/Economy/salary.yml
+++ b/Resources/Prototypes/White/Economy/salary.yml
@@ -11,7 +11,6 @@
    Quartermaster: 600
    CargoTechnician: 200
    SalvageSpecialist: 300
-    SeniorSalvageSpecialist: 400
    Bartender: 200
    Botanist: 200
    Boxer: 150
--- a/Resources/Prototypes/White/Entities/Clothing/OuterClothing/seniors_outer.yml
+++ b/Resources/Prototypes/White/Entities/Clothing/OuterClothing/seniors_outer.yml
@@ -0,0 +1,31 @@
+- type: entity
+  parent: ClothingOuterHardsuitSpatio
+  id: ClothingOuterHardsuitImprovedSpatio
+  name: improved spationaut hardsuit
+  components:
+    - type: Sprite
+      sprite: White/Clothing/OuterClothing/impspatio.rsi
+    - type: Clothing
+      sprite: White/Clothing/OuterClothing/impspatio.rsi
+    - type: Armor
+      modifiers:
+        coefficients:
+          Blunt: 0.85
+          Slash: 0.85
+          Piercing: 0.85
+          Radiation: 0.45
+          Caustic: 0.85
+    - type: ClothingSpeedModifier
+      walkModifier: 0.95
+      sprintModifier: 0.95
+    - type: ToggleableClothing
+      clothingPrototype: ClothingHeadHelmetHardsuitImprovedSpatio
+
+- type: entity
+  parent: ClothingHeadHelmetHardsuitSpatio
+  id: ClothingHeadHelmetHardsuitImprovedSpatio
+  noSpawn: true
+  name: Improved spationaut hardsuit helmet
+  components:
+    - type: Sprite
+      sprite: White/Clothing/OuterClothing/impspatiohelm.rsi
--- a/Resources/Prototypes/White/Entities/Clothing/seniors_other.yml
+++ b/Resources/Prototypes/White/Entities/Clothing/seniors_other.yml
@@ -0,0 +1,21 @@
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitSeniorSalvageSpecialist
+  name: senior cargo jumpsuit
+  description: A sign of skill and prestige within the security department.
+  components:
+    - type: Sprite
+      sprite: Clothing/Uniforms/Jumpsuit/tacticool.rsi
+    - type: Clothing
+      sprite: Clothing/Uniforms/Jumpsuit/tacticool.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtSeniorSalvageSpecialist
+  name: senior cargo jumpskirt
+  description: A sign of skill and prestige within the security department.
+  components:
+    - type: Sprite
+      sprite: Clothing/Uniforms/Jumpskirt/tacticool_s.rsi
+    - type: Clothing
+      sprite: Clothing/Uniforms/Jumpskirt/tacticool_s.rsi
--- a/Resources/Prototypes/White/Entities/Objects/Specific/Medical/expanded_medkit.yml
+++ b/Resources/Prototypes/White/Entities/Objects/Specific/Medical/expanded_medkit.yml
@@ -0,0 +1,11 @@
+- type: entity
+  name: expanded medkit
+  parent: Medkit
+  id: ExpandedMedkit
+  components:
+    - type: Storage
+      capacity: 40
+      sprite: White/Specific/expmedkit.rsi
+    - type: Sprite
+      sprite: White/Specific/expmedkit.rsi
+      state: icon
--- a/Resources/Prototypes/White/Entities/Objects/Tools/seniors_tools.yml
+++ b/Resources/Prototypes/White/Entities/Objects/Tools/seniors_tools.yml
@@ -0,0 +1,134 @@
+- type: entity
+  id: ImprovedCrowbar # OK
+  parent: Crowbar
+  name: improved crowbar
+  components:
+    - type: StaticPrice
+      price: 1000
+    - type: Tool
+      speed: 2
+    - type: MeleeWeapon
+      damage:
+        types:
+          Blunt: 12
+          Structural: 7
+    - type: Sprite
+      sprite: White/Objects/Tools/impcrowbar.rsi
+    - type: Item
+      sprite: White/Objects/Tools/impcrowbar.rsi
+
+- type: entity
+  id: ImprovedWrench # OK
+  parent: Wrench
+  name: improved wrench
+  components:
+    - type: StaticPrice
+      price: 500
+    - type: Tool
+      speed: 2
+    - type: Sprite
+      sprite: White/Objects/Tools/impwrench.rsi
+    - type: Item
+      sprite: White/Objects/Tools/impwrench.rsi
+    - type: MeleeWeapon
+      attackRate: 1.5
+      damage:
+        types:
+          Blunt: 9
+
+- type: entity
+  name: improved screwdriver
+  parent: BaseItem
+  id: ImprovedScrewdriver
+  description: "Industrial grade torque in a small screwdriving package."
+  components:
+    - type: StaticPrice
+      price: 500
+    - type: EmitSoundOnLand
+      sound:
+        path: /Audio/Items/screwdriver_drop.ogg
+    - type: Tag
+      tags:
+        - Screwdriver
+    - type: Sprite
+      sprite: White/Objects/Tools/impscrewdriver.rsi
+      state: icon
+    - type: Item
+      sprite: White/Objects/Tools/impscrewdriver.rsi
+    - type: UseDelay
+    - type: MeleeWeapon
+      attackRate: 1
+      damage:
+        types:
+          Piercing: 7
+      soundHit:
+        path: "/Audio/Weapons/bladeslice.ogg"
+    - type: Tool
+      speed: 2
+      qualities:
+        - Screwing
+      useSound:
+        collection: Screwdriver
+    - type: PhysicalComposition
+      materialComposition:
+        Steel: 100
+
+- type: entity
+  id: ImprovedWirecutter
+  parent: BaseItem
+  name: improved wirecutter
+  description: This kills the wire.
+  components:
+    - type: StaticPrice
+      price: 500
+    - type: Item
+      sprite: White/Objects/Tools/impwirecutter.rsi
+    - type: Sprite
+      sprite: White/Objects/Tools/impwirecutter.rsi
+      state: icon
+    - type: EmitSoundOnLand
+      sound:
+        path: /Audio/Items/wirecutter_drop.ogg
+    - type: Tag
+      tags:
+        - PlantSampleTaker
+        - Wirecutter
+    - type: UseDelay
+    - type: MeleeWeapon
+      damage:
+        types:
+          Piercing: 5
+      attackRate: 2 #open and close that shit on their arm like hell! because you sure aren't doing any damage with this
+      soundHit:
+        path: "/Audio/Items/wirecutter.ogg"
+    - type: Tool
+      speed: 2
+      qualities:
+        - Cutting
+      useSound:
+        path: /Audio/Items/wirecutter.ogg
+    - type: PhysicalComposition
+      materialComposition:
+        Steel: 100
+
+- type: entity
+  id: ImprovedWelder
+  parent: BaseWelder
+  name: improved welder
+  description: ""
+  components:
+    - type: SolutionContainerManager
+      solutions:
+        Welder:
+          reagents:
+            - ReagentId: WeldingFuel
+              Quantity: 300
+          maxVol: 300
+    - type: Sprite
+      sprite: White/Objects/Tools/impwelder.rsi
+    - type: Item
+      sprite: White/Objects/Tools/impwelder.rsi
+    - type: StaticPrice
+      price: 700
+    - type: Tool
+      speed: 1.5
--- a/Resources/Prototypes/White/Entities/Objects/Weapons/experimental_stunbaton.yml
+++ b/Resources/Prototypes/White/Entities/Objects/Weapons/experimental_stunbaton.yml
@@ -0,0 +1,25 @@
+- type: entity
+  name: experimental stun baton
+  parent: Stunbaton
+  id: ExperimentalStunbaton
+  description: Meowk!
+  components:
+  - type: Clothing
+    sprite: White/Objects/Weapons/experimental_stunbaton.rsi
+  - type: Sprite
+    sprite: White/Objects/Weapons/experimental_stunbaton.rsi
+  - type: Stunbaton
+    energyPerUse: 100
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 10
+    bluntStaminaDamageFactor: 2.0
+    angle: 70
+  - type: StaminaDamageOnHit
+    damage: 80
+  - type: Battery
+    maxCharge: 2000
+    startingCharge: 2000
+  - type: StaticPrice
+    price: 1000
--- a/Resources/Prototypes/White/Fluff/waggier.yml
+++ b/Resources/Prototypes/White/Fluff/waggier.yml
@@ -0,0 +1,47 @@
+- type: entity
+  parent: ClothingHeadHatBeretSecurity
+  id: ClothingHeadHatBeretWaggier
+  name: security beret
+  description: "На нем вышито слово Waggier... Наверное это название фирмы?"
+
+- type: entity
+  name: experimental stun baton
+  parent: ExperimentalStunbaton
+  id: ExperimentalStunbatonWaggier
+  description: "Литая сталь. Прочный пластик. Дубинка Ветерана-СБ Регины Хьюи"
+
+- type: loadout
+  id: WaggierBeretLoadout
+  entity: ClothingHeadHatBeretWaggier
+  sponsorOnly: true
+  whitelistJobs: [ Detective, HeadOfSecurity, SecurityCadet, SecurityOfficer, Warden, SeniorOfficer ]
+
+- type: loadout
+  id: WaggierUniformLoadout
+  entity: ClothingUniformJumpsuitSeniorOfficer
+  sponsorOnly: true
+  whitelistJobs: [ Detective, HeadOfSecurity, SecurityCadet, SecurityOfficer, Warden ]
+
+- type: loadout
+  id: WaggierUniformSkirtLoadout
+  entity: ClothingUniformJumpskirtSeniorOfficer
+  sponsorOnly: true
+  whitelistJobs: [ Detective, HeadOfSecurity, SecurityCadet, SecurityOfficer, Warden ]
+
+- type: loadout
+  id: WaggierShoesLoadout
+  entity: ClothingShoesBootsCombatFilled
+  sponsorOnly: true
+  whitelistJobs: [ Detective, HeadOfSecurity, SecurityCadet, SecurityOfficer, Warden ]
+
+- type: loadout
+  id: WaggierGlovesLoadout
+  entity: ClothingHandsGlovesCombat
+  sponsorOnly: true
+  whitelistJobs: [ Detective, HeadOfSecurity, SecurityCadet, SecurityOfficer, Warden ]
+
+- type: loadout
+  id: WaggierStunBatonLoadout
+  entity: ExperimentalStunbatonWaggier
+  sponsorOnly: true
+  whitelistJobs: [ Detective, HeadOfSecurity, SecurityCadet, SecurityOfficer, Warden, SeniorOfficer ]
--- a/Resources/Prototypes/White/Ghosts/custom_ghosts.yml
+++ b/Resources/Prototypes/White/Ghosts/custom_ghosts.yml
@@ -364,3 +364,13 @@
  sprite: White/Ghosts/joulerk-ghost.rsi
  ghostName: ЛЕРК
  ghostDescription: Летающее бирюзовое существо, напоминающее кота, с пушистым телом, грациозными движениями и глазами, сверкающими с загадочным блеском.
+
+#waggier
+- type: customGhost
+  id: waggier-ghost
+  ckey: waggier
+  sprite: White/Ghosts/waggier-ghost.rsi
+  alpha: 0.9
+  ghostName: Ветеранка СБ
+  ghostDescription: Вы нарушили правила действующего закона.... "перечисление статей"
+  size: 0.6, 0.6
--- a/Resources/Prototypes/White/tags.yml
+++ b/Resources/Prototypes/White/tags.yml
@@ -16,6 +16,9 @@
 - type: Tag
  id: socks

+- type: Tag
+  id: SurgeryTool
+
 - type: Tag
  id: underwearb

--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-body-slim.png
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-body-slim.png
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/meta.json
@@ -1,7 +1,7 @@
 {
  "version": 1,
  "license": "CC-BY-SA-3.0",
-  "copyright": "Edit by Nairodian (github) of secskirt taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7779930358ba4776575975690d2c952f0d05c6cc",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
  "size": {
    "x": 32,
    "y": 32
@@ -18,6 +18,10 @@
      "name": "equipped-INNERCLOTHING-monkey",
      "directions": 4
    },
+    {
+      "name": "equipped-INNERCLOTHING-body-slim",
+      "directions": 4
+    },
    {
      "name": "inhand-left",
      "directions": 4
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING-body-slim.png
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING-body-slim.png
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING.png
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING.png
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/icon.png
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/icon.png
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json
@@ -1,30 +1,34 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Edit by Nairodian (github) of secred_s taken from tgstation at pull request https://github.com/tgstation/tgstation/pull/2984",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14",
+    "size": {
+        "x": 32,
+        "y": 32
    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-INNERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-INNERCLOTHING-monkey",
+            "directions": 4
+        },
+        {
+            "name": "equipped-INNERCLOTHING-body-slim",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
--- a/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/equipped-OUTERCLOTHING.png
+++ b/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/equipped-OUTERCLOTHING.png
--- a/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/icon.png
+++ b/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/icon.png
--- a/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/inhand-left.png
+++ b/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/inhand-left.png
--- a/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/inhand-right.png
+++ b/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/inhand-right.png
--- a/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/meta.json
+++ b/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+    "copyright": "Original by Emisse, modified by EmoGarbage404, repainted by Danza (Discord User ID: 466953759570788372) special for White Dream",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
--- a/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/equipped-head-light.png
+++ b/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/equipped-head-light.png
--- a/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/equipped-head-unshaded.png
+++ b/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/equipped-head-unshaded.png
--- a/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/equipped-head.png
+++ b/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/equipped-head.png
--- a/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/icon-flash.png
+++ b/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/icon-flash.png
--- a/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/icon-unshaded.png
+++ b/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/icon-unshaded.png
--- a/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/icon.png
+++ b/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/icon.png
--- a/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/light-overlay.png
+++ b/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/light-overlay.png
--- a/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/meta.json
+++ b/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Original by Emisse, modified by EmoGarbage404, repainted by Danza (Discord User ID: 466953759570788372) special for White Dream",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-unshaded"
+    },
+    {
+      "name": "icon-flash"
+    },
+    {
+      "name": "light-overlay"
+    },
+    {
+      "name": "equipped-head",
+      "directions": 4
+    },
+    {
+      "name": "equipped-head-light",
+      "directions": 4
+    },
+    {
+      "name": "equipped-head-unshaded",
+      "directions": 4
+    }
+  ]
+}
--- a/Resources/Textures/White/Ghosts/waggier-ghost.rsi/animated.png
+++ b/Resources/Textures/White/Ghosts/waggier-ghost.rsi/animated.png
--- a/Resources/Textures/White/Ghosts/waggier-ghost.rsi/meta.json
+++ b/Resources/Textures/White/Ghosts/waggier-ghost.rsi/meta.json
@@ -0,0 +1,28 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by dosharus",
+  "size": {
+    "x": 128,
+    "y": 128
+  },
+  "states": [
+    {
+      "name": "animated",
+        "delays": [
+            [
+                0.15,
+                0.15,
+                0.15,
+                0.15,
+                0.15,
+                0.15,
+                0.15,
+                0.15,
+                0.15,
+                0.15
+            ]
+        ]
+    }
+  ]
+}
--- a/Resources/Textures/White/Objects/Tools/impcrowbar.rsi/equipped-BELT.png
+++ b/Resources/Textures/White/Objects/Tools/impcrowbar.rsi/equipped-BELT.png
--- a/Resources/Textures/White/Objects/Tools/impcrowbar.rsi/icon.png
+++ b/Resources/Textures/White/Objects/Tools/impcrowbar.rsi/icon.png
--- a/Resources/Textures/White/Objects/Tools/impcrowbar.rsi/inhand-left.png
+++ b/Resources/Textures/White/Objects/Tools/impcrowbar.rsi/inhand-left.png
--- a/Resources/Textures/White/Objects/Tools/impcrowbar.rsi/inhand-right.png
+++ b/Resources/Textures/White/Objects/Tools/impcrowbar.rsi/inhand-right.png
--- a/Resources/Textures/White/Objects/Tools/impcrowbar.rsi/meta.json
+++ b/Resources/Textures/White/Objects/Tools/impcrowbar.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for White Dream",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
+    ]
+}
--- a/Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/equipped-BELT.png
+++ b/Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/equipped-BELT.png
--- a/Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/icon.png
+++ b/Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/icon.png
--- a/Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/inhand-left.png
+++ b/Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/inhand-left.png
--- a/Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/inhand-right.png
+++ b/Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/inhand-right.png
--- a/Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/meta.json
+++ b/Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for White Dream",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
+    ]
+}
--- a/Resources/Textures/White/Objects/Tools/impwelder.rsi/equipped-BELT.png
+++ b/Resources/Textures/White/Objects/Tools/impwelder.rsi/equipped-BELT.png
--- a/Resources/Textures/White/Objects/Tools/impwelder.rsi/icon.png
+++ b/Resources/Textures/White/Objects/Tools/impwelder.rsi/icon.png
--- a/Resources/Textures/White/Objects/Tools/impwelder.rsi/inhand-left-flame.png
+++ b/Resources/Textures/White/Objects/Tools/impwelder.rsi/inhand-left-flame.png
--- a/Resources/Textures/White/Objects/Tools/impwelder.rsi/inhand-left.png
+++ b/Resources/Textures/White/Objects/Tools/impwelder.rsi/inhand-left.png
--- a/Resources/Textures/White/Objects/Tools/impwelder.rsi/inhand-right-flame.png
+++ b/Resources/Textures/White/Objects/Tools/impwelder.rsi/inhand-right-flame.png
--- a/Resources/Textures/White/Objects/Tools/impwelder.rsi/inhand-right.png
+++ b/Resources/Textures/White/Objects/Tools/impwelder.rsi/inhand-right.png
--- a/Resources/Textures/White/Objects/Tools/impwelder.rsi/meta.json
+++ b/Resources/Textures/White/Objects/Tools/impwelder.rsi/meta.json
@@ -0,0 +1,87 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation and repainted by Danza (Discord User ID: 466953759570788372) special for White Dream",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "welder_flame",
+      "delays": [
+        [
+          0.2,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left-flame",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right-flame",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    }
+  ]
+}
--- a/Resources/Textures/White/Objects/Tools/impwelder.rsi/welder_flame.png
+++ b/Resources/Textures/White/Objects/Tools/impwelder.rsi/welder_flame.png
--- a/Resources/Textures/White/Objects/Tools/impwirecutter.rsi/icon.png
+++ b/Resources/Textures/White/Objects/Tools/impwirecutter.rsi/icon.png
--- a/Show More
+++ b/Show More