From 3bdf8417f98d8d2c3f3ea20f0c4af57aab8cf07b Mon Sep 17 00:00:00 2001 From: rhailrake <49613070+rhailrake@users.noreply.github.com> Date: Tue, 20 Feb 2024 12:57:00 +0000 Subject: [PATCH] - add: seniors (#100) * seniors base * second one * fuck * remove this one * fixes * waggier ghost * waggier fluff --- .../Locale/ru-RU/job/job-description.ftl | 5 + Resources/Locale/ru-RU/job/job-names.ftl | 10 ++ .../ru-RU/locales-new/autotranslate-10.ftl | 4 +- .../ru-RU/locales-new/autotranslate-18.ftl | 2 +- .../ru-RU/locales-new/autotranslate-19.ftl | 8 +- .../ru-RU/locales-new/autotranslate-27.ftl | 10 +- .../ru-RU/locales-new/autotranslate-53.ftl | 2 - .../ru-RU/locales-new/autotranslate-6.ftl | 4 +- .../ru-RU/locales-new/autotranslate-7.ftl | 10 +- .../ru-RU/locales-new/autotranslate-8.ftl | 10 +- .../ru-RU/locales-new/autotranslate-9.ftl | 6 +- .../catalog/fills/backpacks/duffelbag.ftl | 3 - .../fills/backpacks/startergear/satchel.ftl | 2 - .../objects/misc/identification_cards.ftl | 2 +- .../objects/specific/medical/medkits.ftl | 3 + .../entities/clothing/belt/seniors_belts.ftl | 11 ++ .../clothing/outerclothing/seniors_outer.ftl | 7 + .../entities/objects/tools/seniors_tools.ftl | 19 +++ .../weapons/experimental_stunbaton.ftl | 3 + .../Prototypes/Catalog/uplink_catalog.yml | 1 + .../Entities/Clothing/Belt/belts.yml | 1 + .../Entities/Markers/Spawners/jobs.yml | 48 +++++++ .../Objects/Specific/Medical/surgery.yml | 3 + Resources/Prototypes/Maps/atlas.yml | 4 + Resources/Prototypes/Maps/bagel.yml | 4 + Resources/Prototypes/Maps/box.yml | 16 ++- Resources/Prototypes/Maps/cluster.yml | 14 +- Resources/Prototypes/Maps/core.yml | 4 + Resources/Prototypes/Maps/europa.yml | 12 +- Resources/Prototypes/Maps/fland.yml | 14 +- Resources/Prototypes/Maps/marathon.yml | 4 + Resources/Prototypes/Maps/meta.yml | 14 +- Resources/Prototypes/Maps/omega.yml | 14 +- Resources/Prototypes/Maps/origin.yml | 14 +- Resources/Prototypes/Maps/packed.yml | 14 +- Resources/Prototypes/Maps/saltern.yml | 14 +- .../Jobs/Engineering/senior_engineer.yml | 46 ++++++ .../Roles/Jobs/Medical/senior_physician.yml | 46 ++++++ .../Roles/Jobs/Science/senior_researcher.yml | 38 +++++ .../Roles/Jobs/Security/senior_officer.yml | 53 +++++++ .../Prototypes/Roles/Jobs/departments.yml | 4 + .../Prototypes/Roles/play_time_trackers.yml | 12 ++ .../White/Catalog/seniors_fills.yml | 43 ++++++ Resources/Prototypes/White/Economy/salary.yml | 1 - .../Clothing/OuterClothing/seniors_outer.yml | 31 ++++ .../White/Entities/Clothing/seniors_other.yml | 21 +++ .../Specific/Medical/expanded_medkit.yml | 11 ++ .../Entities/Objects/Tools/seniors_tools.yml | 134 ++++++++++++++++++ .../Weapons/experimental_stunbaton.yml | 25 ++++ Resources/Prototypes/White/Fluff/waggier.yml | 47 ++++++ .../Prototypes/White/Ghosts/custom_ghosts.yml | 10 ++ Resources/Prototypes/White/tags.yml | 3 + .../equipped-INNERCLOTHING-body-slim.png | Bin 0 -> 1767 bytes .../equipped-INNERCLOTHING-monkey.png | Bin 955 -> 20892 bytes .../equipped-INNERCLOTHING.png | Bin 1316 -> 1804 bytes .../Jumpskirt/senior_officer.rsi/icon.png | Bin 587 -> 738 bytes .../senior_officer.rsi/inhand-left.png | Bin 503 -> 460 bytes .../senior_officer.rsi/inhand-right.png | Bin 494 -> 470 bytes .../Jumpskirt/senior_officer.rsi/meta.json | 6 +- .../equipped-INNERCLOTHING-body-slim.png | Bin 0 -> 2397 bytes .../equipped-INNERCLOTHING-monkey.png | Bin 1030 -> 21225 bytes .../equipped-INNERCLOTHING.png | Bin 1459 -> 1772 bytes .../Jumpsuit/senior_officer.rsi/icon.png | Bin 473 -> 609 bytes .../senior_officer.rsi/inhand-left.png | Bin 503 -> 460 bytes .../senior_officer.rsi/inhand-right.png | Bin 494 -> 470 bytes .../Jumpsuit/senior_officer.rsi/meta.json | 58 ++++---- .../impspatio.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 2343 bytes .../OuterClothing/impspatio.rsi/icon.png | Bin 0 -> 320 bytes .../impspatio.rsi/inhand-left.png | Bin 0 -> 998 bytes .../impspatio.rsi/inhand-right.png | Bin 0 -> 1071 bytes .../OuterClothing/impspatio.rsi/meta.json | 26 ++++ .../impspatiohelm.rsi/equipped-head-light.png | Bin 0 -> 1400 bytes .../equipped-head-unshaded.png | Bin 0 -> 203 bytes .../impspatiohelm.rsi/equipped-head.png | Bin 0 -> 943 bytes .../impspatiohelm.rsi/icon-flash.png | Bin 0 -> 642 bytes .../impspatiohelm.rsi/icon-unshaded.png | Bin 0 -> 147 bytes .../OuterClothing/impspatiohelm.rsi/icon.png | Bin 0 -> 452 bytes .../impspatiohelm.rsi/light-overlay.png | Bin 0 -> 502 bytes .../OuterClothing/impspatiohelm.rsi/meta.json | 35 +++++ .../Ghosts/waggier-ghost.rsi/animated.png | Bin 0 -> 13950 bytes .../White/Ghosts/waggier-ghost.rsi/meta.json | 28 ++++ .../Tools/impcrowbar.rsi/equipped-BELT.png | Bin 0 -> 171 bytes .../Objects/Tools/impcrowbar.rsi/icon.png | Bin 0 -> 437 bytes .../Tools/impcrowbar.rsi/inhand-left.png | Bin 0 -> 217 bytes .../Tools/impcrowbar.rsi/inhand-right.png | Bin 0 -> 221 bytes .../Objects/Tools/impcrowbar.rsi/meta.json | 26 ++++ .../impscrewdriver.rsi/equipped-BELT.png | Bin 0 -> 202 bytes .../Objects/Tools/impscrewdriver.rsi/icon.png | Bin 0 -> 416 bytes .../Tools/impscrewdriver.rsi/inhand-left.png | Bin 0 -> 218 bytes .../Tools/impscrewdriver.rsi/inhand-right.png | Bin 0 -> 227 bytes .../Tools/impscrewdriver.rsi/meta.json | 26 ++++ .../Tools/impwelder.rsi/equipped-BELT.png | Bin 0 -> 170 bytes .../Objects/Tools/impwelder.rsi/icon.png | Bin 0 -> 700 bytes .../Tools/impwelder.rsi/inhand-left-flame.png | Bin 0 -> 201 bytes .../Tools/impwelder.rsi/inhand-left.png | Bin 0 -> 238 bytes .../impwelder.rsi/inhand-right-flame.png | Bin 0 -> 201 bytes .../Tools/impwelder.rsi/inhand-right.png | Bin 0 -> 249 bytes .../Objects/Tools/impwelder.rsi/meta.json | 87 ++++++++++++ .../Tools/impwelder.rsi/welder_flame.png | Bin 0 -> 296 bytes .../Objects/Tools/impwirecutter.rsi/icon.png | Bin 0 -> 469 bytes .../Tools/impwirecutter.rsi/inhand-left.png | Bin 0 -> 234 bytes .../Tools/impwirecutter.rsi/inhand-right.png | Bin 0 -> 235 bytes .../Objects/Tools/impwirecutter.rsi/meta.json | 22 +++ .../Tools/impwrench.rsi/equipped-BELT.png | Bin 0 -> 187 bytes .../Objects/Tools/impwrench.rsi/icon.png | Bin 0 -> 503 bytes .../Tools/impwrench.rsi/inhand-left.png | Bin 0 -> 193 bytes .../Tools/impwrench.rsi/inhand-right.png | Bin 0 -> 196 bytes .../Objects/Tools/impwrench.rsi/meta.json | 26 ++++ .../equipped-BELT.png | Bin 0 -> 296 bytes .../experimental_stunbaton.rsi/meta.json | 103 ++++++++++++++ .../off-inhand-left.png | Bin 0 -> 384 bytes .../off-inhand-right.png | Bin 0 -> 342 bytes .../on-inhand-left.png | Bin 0 -> 1045 bytes .../on-inhand-right.png | Bin 0 -> 888 bytes .../stunbaton_nocell.png | Bin 0 -> 414 bytes .../stunbaton_off.png | Bin 0 -> 374 bytes .../stunbaton_on.png | Bin 0 -> 1750 bytes .../White/Specific/expmedkit.rsi/icon.png | Bin 0 -> 942 bytes .../Specific/expmedkit.rsi/inhand-left.png | Bin 0 -> 375 bytes .../Specific/expmedkit.rsi/inhand-right.png | Bin 0 -> 364 bytes .../White/Specific/expmedkit.rsi/meta.json | 22 +++ Resources/migration.yml | 6 - 122 files changed, 1202 insertions(+), 110 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/clothing/belt/seniors_belts.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/clothing/outerclothing/seniors_outer.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/tools/seniors_tools.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/experimental_stunbaton.ftl create mode 100644 Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml create mode 100644 Resources/Prototypes/White/Catalog/seniors_fills.yml create mode 100644 Resources/Prototypes/White/Entities/Clothing/OuterClothing/seniors_outer.yml create mode 100644 Resources/Prototypes/White/Entities/Clothing/seniors_other.yml create mode 100644 Resources/Prototypes/White/Entities/Objects/Specific/Medical/expanded_medkit.yml create mode 100644 Resources/Prototypes/White/Entities/Objects/Tools/seniors_tools.yml create mode 100644 Resources/Prototypes/White/Entities/Objects/Weapons/experimental_stunbaton.yml create mode 100644 Resources/Prototypes/White/Fluff/waggier.yml create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-body-slim.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING-body-slim.png create mode 100644 Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/icon.png create mode 100644 Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/meta.json create mode 100644 Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/equipped-head-light.png create mode 100644 Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/equipped-head-unshaded.png create mode 100644 Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/equipped-head.png create mode 100644 Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/icon-flash.png create mode 100644 Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/icon-unshaded.png create mode 100644 Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/icon.png create mode 100644 Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/light-overlay.png create mode 100644 Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/meta.json create mode 100644 Resources/Textures/White/Ghosts/waggier-ghost.rsi/animated.png create mode 100644 Resources/Textures/White/Ghosts/waggier-ghost.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Tools/impcrowbar.rsi/equipped-BELT.png create mode 100644 Resources/Textures/White/Objects/Tools/impcrowbar.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Tools/impcrowbar.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Tools/impcrowbar.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Tools/impcrowbar.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/equipped-BELT.png create mode 100644 Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Tools/impwelder.rsi/equipped-BELT.png create mode 100644 Resources/Textures/White/Objects/Tools/impwelder.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Tools/impwelder.rsi/inhand-left-flame.png create mode 100644 Resources/Textures/White/Objects/Tools/impwelder.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Tools/impwelder.rsi/inhand-right-flame.png create mode 100644 Resources/Textures/White/Objects/Tools/impwelder.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Tools/impwelder.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Tools/impwelder.rsi/welder_flame.png create mode 100644 Resources/Textures/White/Objects/Tools/impwirecutter.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Tools/impwirecutter.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Tools/impwirecutter.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Tools/impwirecutter.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Tools/impwrench.rsi/equipped-BELT.png create mode 100644 Resources/Textures/White/Objects/Tools/impwrench.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Tools/impwrench.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Tools/impwrench.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Tools/impwrench.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/equipped-BELT.png create mode 100644 Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/off-inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/off-inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/on-inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/on-inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_nocell.png create mode 100644 Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_off.png create mode 100644 Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_on.png create mode 100644 Resources/Textures/White/Specific/expmedkit.rsi/icon.png create mode 100644 Resources/Textures/White/Specific/expmedkit.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Specific/expmedkit.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Specific/expmedkit.rsi/meta.json diff --git a/Resources/Locale/ru-RU/job/job-description.ftl b/Resources/Locale/ru-RU/job/job-description.ftl index 3ad99724a7..3f92748bc3 100644 --- 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 = Покажите всем коллегам как профессионалы обчищают обломки и выполняют экспедиции. diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl index def7de04c8..04b71f03ba 100644 --- 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 = смотритель diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-10.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-10.ftl index 7d2101c975..aa82e5e88f 100644 --- 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 = "" diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-18.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-18.ftl index 602796dc1e..9bf92a68e6 100644 --- 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 = Кажется, его несколько раз разбирали и собирали обратно. diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-19.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-19.ftl index a1c02e1d69..7f5bddeda8 100644 --- 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 = карта станции diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-27.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-27.ftl index bd3e6ba351..eb9eff115c 100644 --- 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 = "" diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-53.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-53.ftl index 9bbc8a303c..270e5f8d22 100644 --- 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 } diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-6.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-6.ftl index aa113e3c68..fea1222944 100644 --- 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 = Базовый универсальный защитный костюм, который защищает владельца от ужасов жизни в космосе. По крайней мере, лучше, чем отсутствие жесткого костюма. diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-7.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-7.ftl index 03fb38be2b..759e7ad1e7 100644 --- 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 = обезьянья куртка бармена diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-8.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-8.ftl index 50b29f87e4..3d7af70c72 100644 --- 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 = комбинезон новобранца синдиката diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-9.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-9.ftl index 18a459dca5..b8707d6e99 100644 --- 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 = "" diff --git 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 index cbc56a2c54..082710db4a 100644 --- 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 = набор "Бульдог" diff --git 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 index 37df47732c..3db1601641 100644 --- 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 } diff --git 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 index 17095e6617..037ebdfc78 100644 --- 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 карта ОБР diff --git 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 index 9db528d051..99791078b2 100644 --- 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 = { "" } diff --git 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 new file mode 100644 index 0000000000..4b1e4e0b81 --- /dev/null +++ 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 = { "" } diff --git 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 new file mode 100644 index 0000000000..34a3cff84c --- /dev/null +++ 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 = { "" } diff --git 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 new file mode 100644 index 0000000000..e862247762 --- /dev/null +++ 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 = { "" } diff --git 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 new file mode 100644 index 0000000000..e2731df62b --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/experimental_stunbaton.ftl @@ -0,0 +1,3 @@ +ent-ExperimentalStunbaton = экспериментальная дубинка-шокер + .desc = Новейшая электрошоковая дубинка для обездвиживания людей. Медленее разряжается, дольше заряжается. + .suffix = { "" } diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index a83ea523e8..3b34a9d3d2 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 221268d418..0d45aba212 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 47e248b826..da007de46a 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml index 13a1375caa..746fbd6c84 100644 --- 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 diff --git a/Resources/Prototypes/Maps/atlas.yml b/Resources/Prototypes/Maps/atlas.yml index ef7523c727..7b2ebcea1e 100644 --- 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 ] diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index 24ca17339f..36fbce1f1b 100644 --- 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 ] diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml index 50826fc5e0..ddf217580b 100644 --- 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 ] - + diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml index fe445b0081..d8c38d90c3 100644 --- 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 ] - + diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml index 6b85aca51d..0f3db804c4 100644 --- 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 ] diff --git a/Resources/Prototypes/Maps/europa.yml b/Resources/Prototypes/Maps/europa.yml index 5b824bd351..e4891b0509 100644 --- 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 ] diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml index 546fff12f2..e1d51755eb 100644 --- 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 ] diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml index be5d70b74e..c8071295ef 100644 --- 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 ] diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml index 2bee606e95..319c243612 100644 --- 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 ] diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml index f90c5f5b65..df187fd7d8 100644 --- 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 ] diff --git a/Resources/Prototypes/Maps/origin.yml b/Resources/Prototypes/Maps/origin.yml index 1281489891..2e38e56064 100644 --- 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 ] - + diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml index ab41b9c927..d93d1ec7dd 100644 --- 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 ] diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml index 345261c543..b41286688d 100644 --- 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 ] - + diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml new file mode 100644 index 0000000000..3ddc35b289 --- /dev/null +++ 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 diff --git a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml new file mode 100644 index 0000000000..e4b144669f --- /dev/null +++ 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 diff --git a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml new file mode 100644 index 0000000000..dab8bbd96e --- /dev/null +++ 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 diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml new file mode 100644 index 0000000000..22b51dbe9d --- /dev/null +++ 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 diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 462c5ef56c..a0d181cf66 100644 --- 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 diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index 3d9260afc9..4732ce17a7 100644 --- 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 diff --git a/Resources/Prototypes/White/Catalog/seniors_fills.yml b/Resources/Prototypes/White/Catalog/seniors_fills.yml new file mode 100644 index 0000000000..936ec33969 --- /dev/null +++ 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 diff --git a/Resources/Prototypes/White/Economy/salary.yml b/Resources/Prototypes/White/Economy/salary.yml index 28dd329789..71da497716 100644 --- 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 diff --git a/Resources/Prototypes/White/Entities/Clothing/OuterClothing/seniors_outer.yml b/Resources/Prototypes/White/Entities/Clothing/OuterClothing/seniors_outer.yml new file mode 100644 index 0000000000..aa7fc75b2d --- /dev/null +++ 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 diff --git a/Resources/Prototypes/White/Entities/Clothing/seniors_other.yml b/Resources/Prototypes/White/Entities/Clothing/seniors_other.yml new file mode 100644 index 0000000000..226352be63 --- /dev/null +++ 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 diff --git a/Resources/Prototypes/White/Entities/Objects/Specific/Medical/expanded_medkit.yml b/Resources/Prototypes/White/Entities/Objects/Specific/Medical/expanded_medkit.yml new file mode 100644 index 0000000000..32f06e8bde --- /dev/null +++ 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 diff --git a/Resources/Prototypes/White/Entities/Objects/Tools/seniors_tools.yml b/Resources/Prototypes/White/Entities/Objects/Tools/seniors_tools.yml new file mode 100644 index 0000000000..bf00b9f0e3 --- /dev/null +++ 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 diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/experimental_stunbaton.yml b/Resources/Prototypes/White/Entities/Objects/Weapons/experimental_stunbaton.yml new file mode 100644 index 0000000000..f9d243c749 --- /dev/null +++ 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 diff --git a/Resources/Prototypes/White/Fluff/waggier.yml b/Resources/Prototypes/White/Fluff/waggier.yml new file mode 100644 index 0000000000..4273dc47b3 --- /dev/null +++ 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 ] diff --git a/Resources/Prototypes/White/Ghosts/custom_ghosts.yml b/Resources/Prototypes/White/Ghosts/custom_ghosts.yml index c1299496e7..1cb0b2c83b 100644 --- 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 diff --git a/Resources/Prototypes/White/tags.yml b/Resources/Prototypes/White/tags.yml index e76a29fc03..fc6f00c9af 100644 --- 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 diff --git 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 new file mode 100644 index 0000000000000000000000000000000000000000..13d70bfc2bcf39678b0d9f63aa95ce0685f2d0b9 GIT binary patch literal 1767 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 oyH0k diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png index b3ecbd97129997ad4c081960cc16e9231023ace4..d76f9614feac972820741ab97ee730564daa4d72 100644 GIT binary patch delta 1768 zcmVdWl(zDA0VW8Go6gJ;6HTU@Q=EyK zIZUP`7|qDcL`{|@E}EF=G#Zy^HnaU<0^*{Xn}Nhf1|w0TqR!!rU0P^wya6m(Y7&_x#THJKwpz^!p|uz!4Mx0e_C500?jd1weo!C;$Q+ zFP#93W8YL(Mo&VL(V@0ATPNXsj|11bYIU;nNeQqnakkQGSCAN{LqY33-FWT32Jz69 zj7_vXrfIc1I5+jn@_Q@*O}=WXf)cY1xy74+jANW^>Eb0y?%~zgnsE%&56CaVQ~oqV z2rsXi>R`JbqJQ>{s!NLCkpKs0%u&eY$km9<-PnKFr>KkmG{YQa=Yu;w6G4cd-{L^d zG-sRp5fJtK7P$I77hzlh{yw=>sW{xGp0kzgmfYfvIFNaY8EZvJT?hAwysYDDKP`st zd*hR`35!7UoZD|^{8V$Gs?UhI5!NThQ9EGe>r68M`+q#-A6J0odmf?c%oe`O0#v>^ zc?jr>;v!I8xM#I(1X~JoFn4Vpd;!6~dU?LuMn*mhvd_9L=uAbkc?3s} zo`NAf94YBj@M&BF-yuRdODh6|91ciasmvzjmfpYECHuh#>lvByMcU(COk!(=2GOCaM#nMBdl14vbRG12Qs8~^xf!f%x=n8=HdC;YrZLb!Q@Fx(q{ z>4)IR$T0g)d+I#C9uXYTEIdwd4^bx>t?B|^lnBHv z0;O>xUZ_QQT!2sP@_=faj{hD{ztLMNzf&k$>@Ok6@ZG1^^N2JBN}Vx+k;iM4fL9(M zV)G?tXN*qd2l&Gq#I6%3ag*yibAJ_FQDZGVfUu=-BRcN=s)naN-V=eZiz88WyZ5Pa zdtZY%C>J1fVI*=g6r9^{=Nm!s!4GGDG%Aem38Vy|z^KRtpz_U2MlM9?!UUZC&%*Ns zv<4YZT<;@N-2_?-B~et{j`4DVL~4SR09i#2L`R0BG1`Rhi+Zs^AI1o~aev7$9j4k& zXTCrKG{xN+Q82X*BPn@0mc=!oq%?-Ds~4#$F+7x>RWu+qpY##14fX>)&N7|9qs4kG z-jR%OeGShSIDhdHv;=YN{OT~KB_-qNH+otTZztpV+9V+*K)TL^f=0Io413^^`?oYV z!DKSUC;9c&J`6yONg8V z;%shu$VJFTg1ROWL=({t1v0*ZHfpcBY;LlR)cQz&)Z&YAz`O zO3UliG8t|#gsR3O*0(4M7OuzD7?VB>;WjmX<^P$`J>Kd%JNBmk^Zg%hY7}5_xe;Db{H3WYWLx3YF00JBVFTnp=HEy-T{+G`H0000< KMNUMnLSTZq;7WM_ delta 1276 zcmVI z>mGzcp@-hQ?V->@51~leQz=q%=%FWj^4LOYd#D!`R-~Z2Ai8lER@m8uMF~SrigBkk zVR~@C=_E$Yi-|@0ejt-fUf%zE-+c2D^Zh}i(P%UpjYd;D$$weoDY zCf4uXZEXc$uTfGxuJ_G)Z`y$T0SNxk!ZepDL@_z~dL!l5*z6nY8<#j39%j^e! zeVKnK6hbP(kBl)toS<{%&zkkmt$=i~=uJF7KOc|){EL-wl9YwrY#?1MvRWvd8mEe1 ze_=OUwh+1XI;|Aujyk@2!%r2YHw%%;DBH- z$kx^t!C;X6g9C20w-X9oSWuUuQs1`iOY18o0HCL*2h%he9v&_`_Vn~9i`PS=^=nQ* zB9U-S(ZA7iG({cGD0SkDbuxW8-Qpu zifNk4`brfLkH^avEaH-ktH8f#+qTOR5|77~=c_3Ja`lC33$|^WXf)cCDv+xmjYhr2 z3;u)v%2iO)uCcST698O*d_M1;&tx*h<8humd4g%0-tq1DhOx7=6EIEFmHG4eJaRio z9Dfp5KA%_8R}NIND}neQH+tb`=~vSRu0&s>(P%UpjYgx|Kx`Vxd=l;L;N)J@KpDx7L?yG)g5y`jzqk! z%#E+Vy7EN$7yj3`-+8h8c6g|q1f{`K-G4Dx8lTdVlE+K$zen%mjix$8;G|*tYV40`1|;{ z?CAFkG#kGsp;|1eTswb2qhq)>{s4)g(H?jJeMx)VOo__$XLR6QuhQI6p0000WgrXoy#7WR- z9}-O%eXxj(Ac80%Vuh4Mu@Chj5sg{}Az6VR1_d#b{*Y!CQdy$Vn6=4t8_rg&7Ps@B zDV{&K4TP0%a7#;cR9S zjhi`aZNN%RJf6%KD-7bXp;swEBn23{x=idoA2YujjKajG*gMw4YI@Dg!f*`wcttLl zd*gY6rFn(BKYu2LND8pEUWNPhAvlib#`|c;UGu&Ip*#*jaj_zc=lVW>N0l|i=cS^A z0L%47qE4s74x1k*O)t>czM31HJ~NIATRz@s^H_<%VlPho1gtRiv+?Vo(+L!c?_C24 ztB|w;e!rhRW2n9iS*ZXzW!QUUA#(I`)E(Z3Lq{9X!+&C}JT{)jEnPAuB1I(xn2Mfu z*qv30mjixWY`y_SP7d^C3$Q)c$ty(ij<{v)nK{5zA`^?%zyLaNaQ`keoNI!yWCI#c zc`zMG2AB{+2>ON*`SJ<&E7y7J85w0&(8BdVI)r3^ot4{g>&`u>mGdD)qVRqj=P~uq zDnLzDIe$M`i!=q?%;D_A%^n|C=rpK3U`9*RC4e3LnzC~7+HGfgZ^B7!+FXLCPag4i zk8c8kkk4D{Gpt?pM}AfSXz_>7KR~HeLakOK5D4(L_iYg2aF~sdW-bYU%1Rd#8LCt& zxZQ5lTDG92^)cwOlFQ{BF4@I1Z2(ei@gk9SPA_^l=;AHG{K`v{Ad99Q) zb#SNAj4z8t09H}N$HohGyB(!ciMPue>iIkX1K(FNp{a-ud>?>%KK~$EuRjsLEEbbW z{S^bfUN3(4^)ss|ViJa|q9`#@sZ`5T$iVlX#3>t)$q$KHx(%TRX2BkY|Syo&;Jw?}b^pg{6wHoX7n&AGP zAPDg9?wHT#N;y+qLrI}f;H+HccDqH>G{)mGnx=8P-G6dcE>n0shJR)Nz%UGi5VYIv zz0oiXWpO0~wr$5k2&&a80G{XJI1a<%5XW&?EEb%fpJUs$(z~Ek0n;@11U=8&GxH~; zG9Y&^IV9+L9@T19xeBSeW;UDUfEZx2*(CFe#RAhb8I48=A(HViJ{3w=21s@%gh diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-left.png index d90b6f3c45fa00ee0e0fcbb15764e9dcbedc6158..a86cd5b0dcbdfd2d69034240f4b303012505f437 100644 GIT binary patch literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0p1o(uwhD!^cRpr>Iz&O>_%)r2R7=#&*=dVZs3cmDoaSVxYe>?RcUz33VtM_h&MIE|K|Nk!!+U;_B zU$Zp-tQ#L4Bu*swpVyHOVp0{*Y!vGFlXAc&=AVM*7t@zMp+~*H{yL&E)sl@R=jpZS zxndi#4?gV^JSA{*mu1AF=gLpaS~6vCCf_Z25@mKHx53`^?#r0+Bjub=gbXgkR|!tg zYh*HsVZX)N;C-TjKXFg5V#U6Gh2sqeOxgvWX>v0hZ&0p~zZU;buZUCNLLkikcn81z zdJN0rB_~{7&voGC^ViV}W?q+NJhR7Y!~DuzhckQh7}DY-Cm64{X_`}+>hS69flYT9 Yw;oHHu*N*S3g~GDPgg&ebxsLQ0A^#k)&Kwi delta 488 zcmX@Z{GEA%WIY=L1H-D!!h1l9v%n*=n1O-s2naJy)#j6CU|?M7>EaktG3V{gjai2r zWY|8e_hiqt-f~ibF;?$_;|dEamx5jFC+{uXz2gU0>!V9LwOk9GUq13)vQ%NJSZQ|Y z#n)Gwma_HKZ(+Zm@5T4&>5t+&pBP=>z|y4NJN0uxpn3h;=VyQK{RU)Je!f@n><(fu(tkX`ur2Eb* z&iMwdm3(SdG4Jg5Q{Jmgg;x~||CamoELBj_VgLR1Yf^8&8%}xs;K>t-Q>7Q`NS%G|y0G|-o zaB0D_svH{?*e6Bv+KBQWJ+$xt|NnEQ^=_yWRg_nmuFS8it?%jT;$-izZ`(?1Gn3d5 zZ$$-lNeMX@L&XAL1A9AHVr-IcJ?cdTq_@R+Gh3M4Bh)z1dtJw_w^?C#^{iCzCAqr@d8S z2#JgpIj}Kt_SWRshF#M_nO$?uzu!pvJN3eycd5*Ig$}cLo4#F~#A>mdYe99HgNRC` z`ire{an0BE#=hNrvg)8k=Gx^GRXjHTeV*et7s4TRF%H9-hEaktG3V{gjai2R zBv>CLUs|}7Zx)YGhc^=+WAkEXmgP1b)$Q*dJqq4&<>>MPVexpSX-x`UyIw8YJ~=4& zNc3XW?Y8%){0X%D7qdyGp#ugu9M&duU%t7ZK1Q(cv&jn497B!peW|;rgm+7qS;+>T ze}3WXpTpC$S)+TlTVMISv)lgH?QfOGZ{H2vw(fbicV)7;K%3&5>*5x>+SWbizOLEX zmU-Z!>7MoG-+%CT)||aPq3JsQnl7h=I@V>|LTD3b$-?C zo}Z5CJ+QajEqT4PHB+LZrm875a)#gX8*8pdtPAT{q!Fslu){9@jWq*<&S|HuQMPx) zyImO$WSBUKxNbjFCtQ9~nx&DW$ze|1@~K&so#3E|0FoL{L$Z5PJ;aq)nI7A;M0`P1 zvW|BZBZza(%y~IT&T~G)RjK62oc8)pi9m+rrS}XDdyoClyKzA1V*Dr0xeM=YdD&f4 Q4va$vPgg&ebxsLQ0KJ#mga7~l diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/meta.json index 7f498ead9b..a870478ccb 100644 --- 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 diff --git 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 new file mode 100644 index 0000000000000000000000000000000000000000..dc98387bcbb2d300d2bdd8280c27e73374dca384 GIT binary patch literal 2397 zcmaJ@dpK148XlxvQaYi8EF-rxGiJtZhG8&B%$OO9qK7fFFqq4pS>~c#N{AShN*lRW z6h$YMgw#<;oW#CV4wBME(amL>%^vO4`Qvof^Q`r|Jn#E{@Av(_-}9_YD#cq%V}k|^ z2GjD{N}?-9;^M2eT=6~6{%KG#=tG{tPyjCy5;FuK%#Fp100AEkBMPL043_k#PS61eRKSBL00A7*2Enwku>l-#NVEf*iE)TzL~H>tHW&=b#u0_KM_@2`tR3DK4Sapz zihu%EB%V(4`WjBLBEX{|h>u61#9}d0j79PUQ7AMHheO$5P#6qCfj|hQT!#OAViVxiR+0-22W;R+!JmkIii2ylf2lFeq}aqb>Aj$Uqd9(ImyXtXB@heM+s zu{fLq&cW8v*2{f~OX4x(IUpBW;&ISff5=5C%%B!e_Pqdt5|$%evqr^c!8p|KfD#~guzt1eMoMB zlE>q_LgEZOb($#y4YFsO+R!lr`KjlEg&F=ZLTVP7=o-ucV?wC5e%ve%;a}S=^ zHTG;>4d}v;ZPQhwkvzMqjjLkPqBo~irUa_14V=E@QDobeYfoXGATTfP3{ih{MSQpH zk?93dl&EQ}=aiH9uCUg(&vsW&RXMoITS=yDsOqS}*BQ19*Z)^@uu6W{c50Gk|HbBY zMtt3CAytFiIIXyc?^=4uv5CUj#v}EGE+qvO*t{{#neMm`ejzXyd+2n4QwY|(mSal3 z`GKhaSyCHD$IB*0=GG+dfTr>qtdq;K6Pm6yUXDjhsZ^+jADhsMsZa1tcNZUc^~cm) z^xk1+R&maQ=n`)=(>{&XWFhCu`owH}YL{zhkKSYFvJFaaY0Y0t_@k~rbhh>F@DfSu>Tq1aanVA z4|c)b2$eR(IlIQs`Zrq#<+&+Y?{(eFq)e~G(Z2GPeJnS@+qbDl7KX-V9|w=sVk#2t zdFHnd{`Sl4%Q3B-PrGkh-1DN>U+dDyn(c1YNIs5xJN7O(vRpr>QPkdX28 z@7_%hr~3AZapL=F_l@~g2Hl}OVU`t1CQ?qw@=NM#x@glB{2#sS*GcnM3GdH%)W^=f z?cX!p5FOB@e`(L!HY2cvX~?;%Y-M2Lg*jY$?){p3p+3D&2Teyd8XZ~}yw9&@sz0lz zqHk|m_8;`{PURg}YWkdukLy(V1mxAGb3^-xuDgrQ`o7v(Q1qE*j`d((VzBkcdHnTkdE}N>jwcLi8JwuB9<2;Jd-PL#sGZqS>raj58V}af zv|cH97$jP{=mW1yPB*!xJYq_lbRHtY;fU!WVAYp6dVs-jYg$i4eXn$Y zmL9quIHxfqitbm{goVEY?idjXgI$5GX&r}WTqH_zCCrK0=A$1|e&xsB+HK~JK@PP>y~uQMO)9mWO8YyNRR1etu? zsNfoN)8;#2+hy9pqCoLrM=sg_y4(!smWmyDo^b+x8h0yJ9o*SU&tNKHPL)=`zTc0@ zg^cIPsRtj7^i%ID)f#oPXUMWiOxHip%BRU$IlXPt{puc+m0-=_Xje&O@=RO+gN z4IZO((SG3fd3Wl84!5jl?5i5bVHOQ0Dy)5ehCuI7=SQUs3Y1yrxWa;OUgA`+Lz6EE z)xPzBxnjiK{uO1i&wEds(deW~?nLc6no04Y^M1xf!|5werk^~zrSQ{sSY$h8#dW1_ za?YoxVac0m%8sq76#iuuTXV`w7hiO&xjUt{G)kP2$4T8)&TXW~Zi1d8}pfRnUa1 z5anBT_H+H4eMZ!jhug!uAIC#xb{D#|`+{J8DjlN%&z4DDQ{u8;5Gy*?Qgd2rTXY5v zmlZ*VT>&ry?fVY0b}Z|K>ird?n12B_be;rp9AFvqlxx-S+!#jQMVN0Up73mi_uwzW|otzGS#2&$C;#}{oQ7zL|eUp z4I83T)(+?rw0+Ldbv1K7+8$WBZ8hn4xnw@ynmGGpWWd(1DllbI$#-xMzW|^N;lKa@ literal 0 HcmV?d00001 diff --git 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 index 37bfef9fbd78f31816401d6760090c9a34c75b70..24fb0f7d29731f514f2b02c2cab48e3bc84e852a 100644 GIT binary patch literal 21225 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 OWyp}Qz`Vf|r~MO;bc2-u delta 989 zcmV<310wwCr2&QrkT`z>xJg7oRCt{2nlWe-Q5eVnxg?s?5TPAvp!M2ouo1Q)lq&_QtOP`VTx0}YiHdgve)2MZ=mxI!(_qSZ7vm^_E{ z&Lpjn_nJh|@3(|}clrL```-87gM1Gl2!bF8f*}4+96T?_l>mPOfShS!WoOI&ZMdtO zDIO01U@rHO%cqDw0Azd4+V)=K69Ax3_Tb5f_gwle9`P}s7XXkseF^~B%FdP}+||wQ zbap^>N|hIt0Bc1OEd5NWj7+(VzRzEOKa@RCB?+oi!X~G_)aZ-hM+uyJxd;GIof7VJ zcA#H9Upx3VpgMmgMBFZ@Qbkjh4!%1joO`*5@S_BmzlI`@D*+aqnFWBFBzV22?ZIbC zWn@ZajQPAZrP>UtXWv3~O7^T*#}%BJ<!B$LUSK!D2NmkRqlu7r8M_v1)= zGMU8k@CdiRhW3D*Y2vYI0svOV#~pDcz|@2N005Q>`reRSlyx|=%lN9ylvIZ(A9 z0hOf8jgLFR0{YyWReyg!>+I-&N0#CD`?0;f4YOFpm)%{Y)9IF-02bG-US$B_k!9Ov z7K;FY*Kgi%>oz&48}>f7eL za3#Ph`=OyByt;P9PC}pT5e`69f<(4mlOBXM*2R}=QxP_Wphv4#3-KSTcKEw6OT_FHy`!$(*UVPaV^2L>a z>YHKTE?i*iU;s+?^U=}Uc(?vmD3C@O8NG%3i;KSvP5?d`>w*`vgz8AsG!_bl(9_dn z+YG}%DwPs($3-fY!i}3Z4{7_(oDu3wb0<~cPlK=T*tUuT4FX4w8yJy=in`l zN`ffd323HxvpCKq2+i8Sz`&8m-Nwd7TdLr1>k|Y)5ClOG{{p`No<53P>5&s!00000 LNkvXXu0mjfiIL)Q diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING.png index 463828936cf28902b758a952951ec5f994a56373..56496560636e310d24e19107630c8a91d0a688de 100644 GIT binary patch delta 1736 zcmV;(1~>V$3+xS$IDZD7Nkl=LyV) z+30F?dcQllHJDevz{r>iFU(= zCR`qUp>*Gb1lY51sYaF~tI_d5YYyJ;I*pHNfVM-Y(cV?gg3$PR3Z}xjRNHauO45{= z;D@xnaS4dF&aWx)Pb+|N@MOKU>?=F>6r-`;iH?1JXnzluv-TVu-4&GQ>3aHJGDL{Q zA3b%pJ>OvPMv>B0gToQL^Mf2 zGycimL0t6}0Jp%}d0YenU030RvK15MpAM@0Qwl(XEpzEd+G1!6qW;>geaQ8DuzhPS zwrtyt4u96Br!ax8^Et{j@x7TK9zV599Zq@O{m7{Ntja&70Gq3y!dL0Xa`yS~rfahA z_{(MJ>>9*R2Y!JwHy8d@9@G?dqyC74UqcQdl(OC7a05&u`aVKr>KBePw#E5aamT}y z0({tTI|B{3C-u=FH-5d83GfHL+WaYY@7<5pD}R=wepf(VldSiE==+epX^_Te4v)#O z{NlwO56W+X!`=`cKIlc{$p{WLHS=SjKge9*L(iE2tOi-XC^It2-XzAr3kMS*tb9Ku z0lKooa6EJ2NJ|?EUD@!mH?Y3vk9m8L^+&Rw!b2rrlovw{9TSOzZ};IJ3y7}VRe9CX`{VaUfG ziUSr4KybU=7#SIPrQhLQh(Mo(qh}zO(F6?nfZ#w7h`9Ky7Z(-lF|Y|zg^~b7E)a=4 zMQHqp@qXiZD-jwV=10CHB6`~_x2fL)$bSVydZ*_`#(e)GjoNlWaFO_ep9U{tQiYNL z@d(6{FcZM*hVl{+&j42B>B?0>T?($dDIVJNZ{cA?V;+&PRg5T6GU?j6+;8yade-=lIBP{?@9BBcN;(tgB zfD}hs0Hiof)d$c~BqqM?zF_;Suo2r9yvySe$r05W1tkG!@Z$IQGFMmz@VZ1G?qzv; z97W;rp(qw=C<(xC%m_p#hQy%X=t&rIgk3_=z-h*bo3g@szOtCdWVr+Ox7PAPhze(x z%+XOog0jSRxIxT%$30qx4sLx)gnv?co?=7wLF*hqpurO;8Byv0>UQQK*qV>di;p4f zXeEfFGvtDQRX*yfH8j?Pwe@~IHZ}cC?E+*wQl4g?Cnc+vpylNqUN2xZXz(pBA7Opr ze8zp9$H13EICkO0bWj$60-&`=pkp0-9yDLdhuiJa>jk=DDXuOofIILUxqt3_S($R* z5F0QG6(|Xyr=b`D-vV_aa=^;%A0Rj9A6_qT;^Zk<3F6rC%|6U6o5#4%%PcW1NpeD> zg%kqH4xrroJ73hw>agnr3vjRZE^~mB*9%w;;vg>K%&siKdqv$?U+D)`tX=x~M_Hqg zD3k=CWaRl%F80^N+m}ak*nj#j;In~?w|Tw5(POQ!5~3!7IG>C><`rudr-JMZ#pGf! zT2Lkz3$z828`@_Vp#9ugSubEUL`?#5zWtUT>sSn21Vh1u3QRl$Cieaf$LOhhQl9^} z_W`WN$#YjE*YD?U;(PXa@iR@n6SO|+QM#Wg2UM*YLfhE_IKnSvR)5xx#E5{XQxLp^ zg}JC&F~ldtlV61J=-q_xr6ho;)cUL~iv^G&bA?nFU}tiK5+jr$@|Bdxeu{|-B~)Wj zb^wVmC;Qa^>`agl7p2AN^Gqio{d>SnzAWkj?5Yegf;eN9>Zrn$0OBDeY66lGh#44b z5<)NsQvw*%)OHs}L_tH;3z*%3X8a6@Rj^m6iA6!%wop%0k0Fu e5I*I%!T$jviM!cxGPL;s0000c> delta 1421 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 Vj$5NhBxL{q002ovPDHLkV1h)`#@GM= diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-left.png index d90b6f3c45fa00ee0e0fcbb15764e9dcbedc6158..a86cd5b0dcbdfd2d69034240f4b303012505f437 100644 GIT binary patch literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0p1o(uwhD!^cRpr>Iz&O>_%)r2R7=#&*=dVZs3cmDoaSVxYe>?RcUz33VtM_h&MIE|K|Nk!!+U;_B zU$Zp-tQ#L4Bu*swpVyHOVp0{*Y!vGFlXAc&=AVM*7t@zMp+~*H{yL&E)sl@R=jpZS zxndi#4?gV^JSA{*mu1AF=gLpaS~6vCCf_Z25@mKHx53`^?#r0+Bjub=gbXgkR|!tg zYh*HsVZX)N;C-TjKXFg5V#U6Gh2sqeOxgvWX>v0hZ&0p~zZU;buZUCNLLkikcn81z zdJN0rB_~{7&voGC^ViV}W?q+NJhR7Y!~DuzhckQh7}DY-Cm64{X_`}+>hS69flYT9 Yw;oHHu*N*S3g~GDPgg&ebxsLQ0A^#k)&Kwi delta 488 zcmX@Z{GEA%WIY=L1H-D!!h1l9v%n*=n1O-s2naJy)#j6CU|?M7>EaktG3V{gjai2r zWY|8e_hiqt-f~ibF;?$_;|dEamx5jFC+{uXz2gU0>!V9LwOk9GUq13)vQ%NJSZQ|Y z#n)Gwma_HKZ(+Zm@5T4&>5t+&pBP=>z|y4NJN0uxpn3h;=VyQK{RU)Je!f@n><(fu(tkX`ur2Eb* z&iMwdm3(SdG4Jg5Q{Jmgg;x~||CamoELBj_VgLR1Yf^8&8%}xs;K>t-Q>7Q`NS%G|y0G|-o zaB0D_svH{?*e6Bv+KBQWJ+$xt|NnEQ^=_yWRg_nmuFS8it?%jT;$-izZ`(?1Gn3d5 zZ$$-lNeMX@L&XAL1A9AHVr-IcJ?cdTq_@R+Gh3M4Bh)z1dtJw_w^?C#^{iCzCAqr@d8S z2#JgpIj}Kt_SWRshF#M_nO$?uzu!pvJN3eycd5*Ig$}cLo4#F~#A>mdYe99HgNRC` z`ire{an0BE#=hNrvg)8k=Gx^GRXjHTeV*et7s4TRF%H9-hEaktG3V{gjai2R zBv>CLUs|}7Zx)YGhc^=+WAkEXmgP1b)$Q*dJqq4&<>>MPVexpSX-x`UyIw8YJ~=4& zNc3XW?Y8%){0X%D7qdyGp#ugu9M&duU%t7ZK1Q(cv&jn497B!peW|;rgm+7qS;+>T ze}3WXpTpC$S)+TlTVMISv)lgH?QfOGZ{H2vw(fbicV)7;K%3&5>*5x>+SWbizOLEX zmU-Z!>7MoG-+%CT)||aPq3JsQnl7h=I@V>|LTD3b$-?C zo}Z5CJ+QajEqT4PHB+LZrm875a)#gX8*8pdtPAT{q!Fslu){9@jWq*<&S|HuQMPx) zyImO$WSBUKxNbjFCtQ9~nx&DW$ze|1@~K&so#3E|0FoL{L$Z5PJ;aq)nI7A;M0`P1 zvW|BZBZza(%y~IT&T~G)RjK62oc8)pi9m+rrS}XDdyoClyKzA1V*Dr0xeM=YdD&f4 Q4va$vPgg&ebxsLQ0KJ#mga7~l diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json index 913d940881..069d5656fc 100644 --- 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 + } + ] } diff --git a/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..3c1c6e0065f87a9eeb5483dc4a9d058b0e31dcd8 GIT binary patch literal 2343 zcmV+?3E1|DP)Px-;Ymb6RCt{2nomp{S02YdE@6?4|KVbS4YjQ_#8B7-R0RnX1tr@`3G8a6h8~hb zrEGiHy>MtQsrJHUwY}uRX{AMqHiu-TWLG_;Y!2C`L@AYu5Tqp`{3!wl8yZ*}Gxk_s zLuLEfU3UasD{Uo@wl>1vg_z3bdx z_u%uoh{Xk}95x=$h3WRLGZb-hXLv#v{~KBh4xA52RSp}`l!DA4RH z-PFZj&;e(!|kMKk|_LItL#LwMYFnu2wVP0SOE z3v{+Os`D@VQ$Z{)Ff|?8h1t3MR!flj`Wlv&p7Ht3Fy6XqtQIp=TCrNp3`HO^DjQ#4 zUxSd$Xy$*d1N^lv$>XkKY+{~xLd0RUQ01_3clhBepNS_##wO|m)EN_?4_ zeM&qb^2dt}tS$TmtTPk=lJW@X_O65X0M&tNKD#=tPECJpVgA=T;L<5Ou*H>oB8w|g zlfM=z78kIXD-cuZyv8f#J~@5>u+w)VYSexJEanQ9S7R)$L`|Pvot2cBbEIK=1YDmK z5L0R5_hwaokGqO^LM&K+!5DC~z2Su;;9O4!V-xdg!z|_s^}BK(WXBzCZ!lo)%ec_8 zrSbz@{;-ZujvpW)rqmH|p=FE9AJ(a5E}gP-p=C=`{RJKHmv7{r{`BJ>wf6x!+Zz#6 zY2NEP2FOl`#RWe7xJSxO)bVsQbd%ZA5o-wuY3X4=F@yD)tlYYRUyp79|hGc*N# zc-(fDS2swADf({0jF?jSoh}4L*RYr? za`^ABdl;|uvAnubkfUIPR<@smqnqkV@NVlNH5P#EjH&6c8mtD+2P7lg(%13#-B>Uw ztC9jSl~$)DV2Hoq6u2`yVY>6;yT8^YDVv^b;wpzN=b6463w!oHkj<|ZdiXWJ3xFKu zJKGz%JN%I4)tGwS9ezk>d!xDv6bns3pSt`mug37!RkOSr1LV=r6!ht?Q&&$Z86qeSq#(=-|%|gm;D~OlP`UCFS?jbVxUU!6}f9rl3y^ib{Y{ zKHuv)#^bp#iz~a^_!Qz-f?_s=WCoAh4)}EQ>v90d`+Q|<4Dwz*61L>53dMww%&1#q zh2LSdaHQcaL-px$z|?ez^=Q>A?uFI)SS%>U=0mnq^g#Cr$Y*3cAsQk#f_yx?;nwVc zf%5_BXnO+-KgjFy z6jRe78sGKIadV5Dy?4UXP9DMlX$T`! z;q4vKT%mS_NOyv!ppWK8?@RXvM>k)b$?Xq(UKfL-n=k#}+~}n#=wqNep}8*YLv}-w z{72r*8UE4Ox|$zQ(o@CM2uVn$-}H7p7m^v4mYxCfak#6>nKKO*XZ{6tlcsiPKN3sI zUhVO1ABhc)Zr}E}?R@oMQgd}iV8Vp|fs1oJ9jXHWJ~+JH<4=CvZmSk(PmEMrxpc~o z-CUM8^{pijw^s;7UOxIh+TMWOTqb9PE3KOA((ZsPuPR4l3Y;z*>rr9n6UBf8u(b4y z`uduj8#!&#F#>eQfSoz_p@@_9sH__Txp#IWTznmR&vr;YuM2>Y@19U!Uqkjj0N~2K zjpD?BzMC);^f44c)dGYfQ9N!r_$b*TtHrF@AR~A@7slhZQ(s?$&+FoT1XVYw)cuC?VTuR@V12{Fak#5|F(tj^evrBLCRnSILL;fEx|R8CA79iL|A zTASwj3?)YuncB?kQ!M5RoGzOxP$=eZu)n|mjjMke*iuqqOH0oXQ)!MgyhTDx8ES*B z^!VaR)D%yMM8a#T@gVm~v5g1l@9%$p@wa_t@q~yH3oPaeW@eun?f_j5fNduz#y17) z`0ByrzP$%1PWaoG->QMvVy?(GzPJtmIDMi8r)yg z8?shG$Sc{^1H%qbJicGLfE|z^zg9sn3^`zDPQIABfPC1Qu7_>CfL<61f;)5a#nJ`j zfhnI>AzLq?7lx-mPENkEoWFjt3KTytKNN8?^u;P3_X|Bj9=(7b{0F{7j8ccEQ9l3x N002ovPDHLkV1i~jbOQhY literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/icon.png b/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bd845f0e2eab8c52787f3a3ee9c3c1ac812e2bf8 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv^#Gp`*8>L*B!<{6Nl}rP5SkRJ zP?YSgry^satL$NKaG>9HL6UMuszHdSrDpHjOrRFVk|4ie28U-i(tw=fo-U3d8WWQf zB%&GuXEsI(Mjp6&_Qsj3j0e;81iih5HQhM2OlzG!y?v?K0al))F0QUeg?JxWojP;q z(xpph9#lolnR)c`rAaemA20<+Tt0m{IC9wmRu`tzhYxW(yF6f8wpN;q`}ObJ!4~}#wLd1RSg+Nn;6^^oRe9)8fG-k zWa*k_#B40$JhPX#r*|T&O?d8&t(SmKo4Iw%!qTfEEe!2FKF<9-M?x5cerskw{kY&e P&`S)Su6{1-oD!MPx&ph-kQRCt{2+HYtRcO1v@cSJqzk|lMd(j|G)2C;P&0%6_EK<>fBNk<=5+`u8T zl1JJiePDgiCvFcS(!uQZVBLx`2SY4FWK%>2wa{)8+=?5d($yf6v^2ry?}gOC?LkNw z+AZ;NRd4&fo+Nqj`Q7Dvzuz~nkZRH@)&$Ytz0wk`V&D~9d+f6*l6ZpGq>idS3R96 z5bA0tomoJUTev-Y4@H*fdB1i(Dogl$E>f{P4n^jhnH*ZNoHv`P1&ADOBe9%iljnCv z#{9q>Gq?N*U29`ddjBA5{fL5h^MH$|F_~b!qgs6F*4SIRxEMnj|H1n^y%g1Ro~iGRh2J3 zf+m-p{l^NnOQUu@ohhKIYV|(BOs3BOfKXRE!9W{Op1Pr~_L`Z$f4OL^o2xg209?Hp zBpT}mp1g4~!@3lpr*oA(+e!fJ*;b;bbM=|#pN8p6pm*OcJ#smTLy-aac6I}KElKab zUHZheA8W4TM)QIo2!bF8f*=TjAPBX*&>IX-y9a1w%WPe?#H>UV;CY|G^Y))8KqK4b z>+;9Qvyl9)TmS5~-UAbr>4Ql06_8Xd|7OqW>K?({V4_d@~07*qoM6N<$g7&@UHUIzs literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/inhand-right.png b/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f9d91c922cae0b2b44a6987bbb891101adaec582 GIT binary patch literal 1071 zcmV+~1kn45P)Px&=}AOERCt{2+HXi3cO1v@_eo2*OQyBhB1xX8lxk-|2y<%&?LAoO`Uf9b_6N7Z zDn6OB6dyPlK4}M9ii0+f>LzvT*kF}W%GTn#K@@bg;O0glwl2$xB#H?$f6RsG;PyZw z8e``56P3ZXPDk*P>@C!d6N(c&R{Ni(XMO%+TmjCWBD`oK*vS)%vn-J#j@! z|I_l8?%cg~RevyU!qsD^xnT-LHqqQLg{#NTgK^VhWph<3zcz7*$zYV1e)^TkU=(fQ z(5m^D^?;#AV`zyaifkeriQ}v;Cmivj$i<9|{)r-+sCg%Q4KgZ~-y@r_+Y1Q!X0a$T zUk}C55)1j$Eh|9Bd!+=XqwKamrn9RI7-Q&B8O;q-%m*s5?$6IwTh=9&Klpcy`(p_z zN-X%a1aCP_?Au#}b$>qUMenk6mR$mY=_rGK8{tTtii0+s)#X$iT-YD<+XzfYv)Uk| zQu(cw&#)*m!5c9wij1}L*{b=M72xgmVM)_MxO(iIIyS&yn0B}~9})Kt!GaNNyhB>##_p!Vbuz2i<0iy{N??PwmeT9De4NA%wN zKj-Wqn6lmT3xXgBf*=TjAP9mW{4bf-0Mlh$65C03d;tuvk^NV>FOuhppI2>uu74L|Pk|ZF6aQvp%ZhbPgB`AJ zX}9$;=il(s*;P!3t9#qd0){Vvl+Lc=jm)uScKogIx_dy=nWCKkYHTgmU4So!l30{k pX0-&CA6oUsmUao&_6V9w{sq~Dd~B{nGnW7W002ovPDHLkV1ln01_}TG literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/meta.json b/Resources/Textures/White/Clothing/OuterClothing/impspatio.rsi/meta.json new file mode 100644 index 0000000000..1a55e703b4 --- /dev/null +++ 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 + } + ] +} diff --git a/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/equipped-head-light.png b/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/equipped-head-light.png new file mode 100644 index 0000000000000000000000000000000000000000..e9fb8a3e1f327636495e3dd6f92df1d3753523ee GIT binary patch literal 1400 zcmV-;1&8{HP)Px)GD$>1RCt{2ns00qWgN#p&)v#!q3Qw&>o(T0KOrcOh}lbuN-lZ7(vGp2O)7IWF?e>$x_^wW^}aYi}r4} zt!}+CdMNivF4yPo`g^|5_nzna^nMRmJlu#$&noJ!vs8cB>#ptwIM^D%<948aP8a$* zJ#GgFzYU-$V>JqvcE>+ViZoSa@y5I2TUGOpw=b5L*a3L~ay)Cn{B~3Y||T6K_fbbT|RWyrKm-9hm^wo%yj7@p8IQ>nroOX=Sgw`oz(nFYX5l z;+IWv?_*4AfbQ-u16GDdA{SqK!?R{Z=3E6}(03hx!rUyn@@lj@a=%dH7v^RG(3Mv+ zrhMSkd4QEbIk0g2&`m_LJ;0?Xd^N)+zX?!3bW%ij_poSJGtu2WH2K=eTeiedV^XEJ z!b{(c5HQ*U`fh~it?;I#Az1^0!{L!EfV+{X?ekf$DC;^Z*nYN>bsZH1zbj=RaLaJz zsj~g@a_u=#USena<>dhQ&t1@8medf)NV3lEM>1_*U{8iDQ9pE2PzB@wHz9ijW_P%> zE_pvuhuz90**G1U6y|1esD1P}a66_dIi~y>)IA5BfaBATK5V#hsWS@DP**^6%QXOo zLJ?X{{bjH@#__lv422@BdggKM*y-PHGb>BxK#0}c`h4+2(_=tvH*u1o7m?1!C!%d%rFeO3Qz@F_;cPsEXdNAdNH72h)HwVi{nz z0JE_SFk67xSO%Caz-%l7%oZ?)G|m839xMY)ApHiIaF-_|+02l}&bngJKRhsDw!SzT z5Sx$3X7T#h=-TV)6qpc401E6|Ka;DG>FfmAz}%c+NwEPy#TdUb13t-rDTHPApkMAyDr0q7fQu*s~4>S5JD8l z-@LzyFH=)gD0G$@843w{jZ7Xb1*-Kv!N3c4xkphp&I> z=?jvaF<+81<|~RKDH|HM0gm{licYl`=<|_kOd^MSX>zr5Ec}b6L*3h*`GzyphMxh0 zzU$gr07X%R5JLI#voD&35K-~2_sjGjz4}gtL?=kv5N6XS0RyF!Pmo5&TS_h3QP9ttA zWQP@eSGH*v5Bjcitg?&dmTUZKpb|sL(LEb;GW=n2SIy6#zcdIyLD2&7)(4GiGi)=2 zBuSC+4H+~3#l*OY&W%gU1K@R6pU|&KP$@65Yik6GCO)CtSgrKhXGDc0&%NjMLf?(Fcc zmOrEOYk44ofy`glX(f`7zFr)xB}_y zFv&$tYLPx&X-PyuRCt{2+ChjLRT#kWf3h-#u-}~m9m%#TxjL!FcJ?R+!jZJ)x?P5W-(qHU{8^7ml=b7~SRtX5I6Mrj{c+jG#&a4a!1w*E0@g0De)rn7qA{Dbx{Dt#3SBwKNasK8C z`5bgLY=Jq9h&QuPSXnfx{p3~?MR7zzPP&*F5=G_W-I{BGKGfR-oQy7)+`*d}O zP<4mKx5Jb@1>?6FFgyfd_!ppO+=t+6&pEvH`9^=O_g>zs&s|Hb*0&0H@He<;68{B+ z5JCtcgb+dqA%qa(ePy(JZ+t(X*BN@}8>lT7@tmwL=Q%mv9>YC>!Mg#CW{l_LNK(zr9@pxgfKdX5+hQ&o z`Vp=-%BVQOa~+=9mjLWq5_+58YQ=OlQ|1+I03!Q1N~0$(&0H? zee(rWobaP@2xgL0v(riYo1c%C`L1x5TXzzx`HXwYzov!z#v&E-@kdwq^uw>Lf-teu zNr8J0V(?DF-`nP+Fsgv;-Kyx94o!3HfaWt*MJdJO`Zrcj9$|Cq_O4d|+}o&9ifXmW z8_$M>3T#^B#;-sx2>_+LV>4;OO!yOfOYC|AZgi%ADYEt30Gzuv7@L^~a$1k;&fv=H zujH>>zMKxOb?n8Zd^=KfIvw`U{;2^@eR2JvzR)Rz5JCtcgb+dqA%qYU^A}%Fme?OY RFsuLo002ovPDHLkV1k*s&glRE literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/icon-flash.png b/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/icon-flash.png new file mode 100644 index 0000000000000000000000000000000000000000..6f33c4c29b3ff9987a65a32a062b4e1c2053b115 GIT binary patch literal 642 zcmV-|0)737P)Px%JV``BR9J=WmA`KiVI0Ok$FD98rUp=MXa|MbOMe8#Ns~fX#n_>%P25ZzJD3_* z9a{ed2NriV#)zhL(|9q8fQCjBj6y{i+E6P;xpOFJuLAGYXk6||E;qd2JkRq!@Avz@ zV8ezD8v-oMjiM-u@vrzLD@BT;82Nl&0=N_p_BE4SDO=*~z}0IZolY}7Jva$4JA0j6 zE;%_rlX!jk!nlajIEabg3e)K{Ku0_bj4UnPT|VsD;<)i1fKp|%C!rkha_3&wauQt= z*eebMeZE7isTm%RA|6-1csrSq6ea%K7R$k z?RG=0@UwQi(dy>pD*CaA( zhMktqnejkR@o(QXz>TJ9LIb7*VzJo%6f*I6@WuT0{a)--*;#CMzUV#FzI znw|ywMw0oN#IhV16z&M1RH<9OihGXX>T11{L<&eHSISbUQnw@?@Ol6IF%sc#KgTv~ c*!b`G0i7V_Yp}I8bN~PV07*qoM6N<$g7@Gi6aWAK literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/icon-unshaded.png b/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/icon-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..b6e9cb615de8c2ead98c0bc9d2b4077a1a3c5872 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}zMd|QArY;~ z2@Ml+q47_P;@mcpUSDcRn{Sh kgU3Q*S|&`_K@A3mL;r;5PWiYa252yYr>mdKI;Vst0NE)nq5uE@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/icon.png b/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b1692715e8a8b7e15e20778285f2e6cc2b5d71fe GIT binary patch literal 452 zcmV;#0XzPQP)Px$en~_@R9J=WmA^|uQ546&_Ug5S5XlSg;3OCq7t5{5e?VNE1P8Zv*Zzb4h6bUj zt-#f-$uXfI2pq2UFoF{8ou|GA@fWD)zEoP?2j24do_oHWbMCo7KtMnMLph&-l+xSQ z`MZ7tikaw2GnHB^v^4|8Ow=o7lbp=+V?s+PrS#IrpD1OMQ1;hKt+2wlzI)WJ1S=}% z6R0)}PaaJZr%xgawXw*)ZxcJ5;Oh1n0Px*)&~se$92fPc_Cjs5?EnBX+$n6Zg!!(gv3Yd|RlA{rfBh@)AEb0Gi#BEp$- z!RmaqU>p2t1~`aD?YaNBT;G5Y0;XvKn4bYIxoMgZLa=&v6B5zHz_|bY!4T(3YiaWC z4*}Sl%+4y<3gl8oXnatAFq}(H|8qggin90vph{5!uWu&TQBY!X`l0000Px$ut`KgR9J=Wlual^K>)}9^RbrNwc6UWr&aP?aIwXOb#asXaoEjaTk9fZNqgCRv?9;WjLWLG*oXGX<^4`?=GFWEX6F9}u(7eR`De(- ziAW?;G!BJaEynS1Ur+M=d1)h4wg5MKSqRqv1OOmBJvP_Y-W{R6{@#*sQ-Kc>djR%k s7Z#gisT|Uo7sxJaN@!zaWApF40j!RVg=Lw|s{jB107*qoM6N<$f>Q9`)c^nh literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/meta.json b/Resources/Textures/White/Clothing/OuterClothing/impspatiohelm.rsi/meta.json new file mode 100644 index 0000000000..894399d082 --- /dev/null +++ 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 + } + ] +} diff --git a/Resources/Textures/White/Ghosts/waggier-ghost.rsi/animated.png b/Resources/Textures/White/Ghosts/waggier-ghost.rsi/animated.png new file mode 100644 index 0000000000000000000000000000000000000000..f92a52500ec320c19b31b09bf90237aeda2a6262 GIT binary patch literal 13950 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Ghosts/waggier-ghost.rsi/meta.json b/Resources/Textures/White/Ghosts/waggier-ghost.rsi/meta.json new file mode 100644 index 0000000000..f804dae5b1 --- /dev/null +++ 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 + ] + ] + } + ] +} diff --git a/Resources/Textures/White/Objects/Tools/impcrowbar.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Tools/impcrowbar.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..83cd808b0879c2b259401f5abeaba028aa33e3a2 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|QaxQ9Ln`LH zy&A~dV8FwAfQ>ogpkw{TM#-23%*GuK2L(2&rkh>N0_A z=FN3~*Y*WIx7_~jt-DVR<6?~kRt{S;xh>vpwQ`y(_@1BP0W+@w*QJK*$990Ud%F6$ JtaD0e0sw`hI4l4F literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Tools/impcrowbar.rsi/icon.png b/Resources/Textures/White/Objects/Tools/impcrowbar.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e7bdf0435f585ef4d7c9ccaba7ac9f87e11438eb GIT binary patch literal 437 zcmV;m0ZRUfP)Px$Z%IT!R9J=Wl)Y-gU>HVEq?J0f%!OQ@??VMkZ5qN`8}nR)?k z##*RD(9nBO{Gp{4(?Pxvjf$x0(wrqfgq(-G&l^ZdNl8ihFKC7tXoeYV-oN+@F~H;9 zm|QkP6*K5|+EU^Hgt%o*`21ed{Lle#>^H1P2x-qdj-sHJ0)XfH)wK{0e4oj5j9%8M z=Ur+qGTlyFI@=eBigVcv4X*-#+jGNbZmwnAo=X!Q@PRXoU~|Ts;-S}3^Q=-+1iRk#bTYTCz+z6oGgw702s{|;kghO6@_}0su6;3N7oEhF4+W`(dyo#DcY#7SvLpm-V$ZNlLtvf?5i8 f{WMZiQj*{o>^HvFLJR}F00000NkvXXu0mjfw%EXE literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Tools/impcrowbar.rsi/inhand-left.png b/Resources/Textures/White/Objects/Tools/impcrowbar.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5e6dbc193e9b24a59245ed85fd3ec15196ff2f6b GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`@CW#WxB}_4 zv@|_Ez0i=5r#(g=4o~a`3bB?1`2{ol2LhQ3Y9N!+JzX3_B3j>0Gvqs9z`-o|~ zu&q@;k44ofy`glX(f`@CW#Wxc>kD zUr$djEiElHB;;w2(Z!XD@jxlok|4ie2B6%3nG0$lld?Ts977^n-%c~+J7B=U?D*lo zdHEVCuNG_9t9Ltcgw$^HFg&QQ;Cl2$yngQ6xah01_P+|PFRbXO+gzb{LcqV{E89<& zt3Y!;uv(^sml@jLzMDTItijKGy@2lpe{C1ef4|ueb6sS!?|qPwxok4>A@UEJ3V_(7NABr z_`o0Jbzf|*Z?^}(<#V;UiR>AvHyHgsOP#;H@RxK>w9IAadG9_}Ozp4;D{ZS~oL}Bq pc{8-UO*SE3uQ2x9-t!Cz8TP-61s^x(q^W?+^mO%eS?83{1ONwFNN)fD literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/icon.png b/Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2e83554827e88502f08f204608eca1691f5923e8 GIT binary patch literal 416 zcmV;R0bl-!P)Px$T1iAfR9J=W(myXlQ5eVZ?`?0-ZEso;;&xVDL(eSPcv| z5(Xykpdyh*)5M=fq+w`CPwV#f97Cf~M6ei~&vs7Ed7j^Ma=;1;w%8)LW zeGbYy_*ID=aslwGl9})V-K~Pz^$QDNYkojWPqDmx`Jv8t*>4vcbN#xvP0)+rI3FV% zX-6rKKtQ0J7!%1T0NaZx?JLb_kIUJuBsDm!Uuz_jeP1@r=dZ|RGmXGa0b0UA0EBJf zgxgRxkC3Q0RW%P`*YAyVMH=U%r<$6MO^%c3h*P+KAkh*35a3|{kX$zN`3t0PN<3C- zxFWz)`5NKGpbFme6T*pcnwLbKAV=p#M9^ZaKiZh8G2!kNKhYFm?fA}Go$l0LP2)}@lB;ITf>%RdY$|g^M2_bInBuW@a)*H#o71YA6oA{C#e#w zi{ZhYO}iMqjdn4={M*nW5qY;kb@w~IoZ5SKM}F39|MD5$&z+|)6&vu)p?q;<&%HUmaA)DnzhN+Y119i5<$`ObrW29_!&fAa&G%( U;`7fcV;M-Fr>mdKI;Vst0M{B;E&u=k literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/meta.json b/Resources/Textures/White/Objects/Tools/impscrewdriver.rsi/meta.json new file mode 100644 index 0000000000..479c9b2497 --- /dev/null +++ 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 + } + ] +} diff --git a/Resources/Textures/White/Objects/Tools/impwelder.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Tools/impwelder.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..cdd8229ce21cc386fd8810fb328fc0e6cccc6730 GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|emUKs7M+SzC{oH>NS%G}%0G|+7 zAg!gPWo~Y6Z*LzE5RjFXRV5|1N|^Tp0|WbqMV&xt#*!evUDvBZH@_ KpUXO@geCxI$0-f~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Tools/impwelder.rsi/icon.png b/Resources/Textures/White/Objects/Tools/impwelder.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e8f59d26580327b45754a05b6ad76cdf84d0bb10 GIT binary patch literal 700 zcmV;t0z>_YP)Px%c1c7*R9J=WmETKKVHn3hr)}r7xihUzw=$T>+F}=z6^Rfr=*NYS&_x7cUP#?{ z(~SjP2;yabK+v6cUde8vyqFd#f*}%{vrHjNWeeFa+tK-UA?KiBbdKaz``oihp96L3)cN0$j`Gpv^Q!{Db>|a1KZ|I|IP$Fz*iWjYh7*=@S{AS{)FIr8jk~LZ zly6*Qx4MNonLe=3y?O$`Sg(XzvC;Z?_K$T=SS=p*J8{W2v}BxyH?y3Y`HGf|)A)7~ zbux{XjMI6k6OY=2Te0DiZ7d9Rh<_sB{pS+jHZ?Yi8U;r;S~5;$Gz6#bQ5g-PCF2wv z-DI*^dge2fsx@vu%HURP^z}VFRD`7~h(u#zpsQ@e!&40a40M%^y+>`LXFkJ7TYy0N z3!~2?{3vg8f2@(2=?N(kjR~LE&%4Rj(vbxCynZyTiYzO}n#-@#yS!$c8{gUjpufL` zK)cG?Qqd5Y`8Y>sSAv=833CDxk}6W7C;<$*TEs|O0H4=SF2DZQRd?&fV*3HndU4YZ zBqUW_cRG1i*^mH2!B!DG<00Vnu$C_{K9x2EJ{UYlsahlQbk0<6yO~2NQIt}Zq7geB zc2>R@4n13{)(HEZX3_!{UxCi{_71uOhp}0y9iM|?6)8Gn$NA+*eGhI^O?GW z{Wu(U&iY)&{p;w>dhO+o@Ok~F^I38r5{-#nxsifsX1U;@Aey;y^`?NmJ^}D~{j|3Q zP3N@ifJbfOLO5*1nQYdW4|?IH<(1feV-ojP^u9ED%~-3Sr9JuamH0000|g zj`J4GF8Lq)^}f?4g+Rm4-(v(EKO|-!FggC$VjcJEu+y2{8uJ($!bP0sy+3O6W<~)g u!~X2i>T6l9v-jzp+&ftiP_gs*18^O2ZN`ppUXO@geCx;;6}p$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Tools/impwelder.rsi/inhand-left.png b/Resources/Textures/White/Objects/Tools/impwelder.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..7d09476c564075ab5a8e7b87ef40406c12e85fb6 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|emUKs7M+SzC{oH>NS%G|s0G|+7 zAg!pVsHUdo=k1-Io?ay-wn~`yg@nYP==5tqImVJ8zhDN3XE)M-oDxqL#}JR>$q5py ziy5o~4kRpKTBee`nT4&*BzduljG6}bsy2fSEm~ZU4H_GlGB{12@Y+qeC7Wl%Nn`Eg zWF=}1xZD^Ek20?_VhXZpVEksp6k)^SaGLQ=YKu3cQ2QLCCf2n_l%^amoFd4x dIF*HufkBU%yZ?!Aqao0K22WQ%mvv4FO#qZBL^%Ke literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Tools/impwelder.rsi/inhand-right-flame.png b/Resources/Textures/White/Objects/Tools/impwelder.rsi/inhand-right-flame.png new file mode 100644 index 0000000000000000000000000000000000000000..c077bc73777839c97c300437be511fe15c70a7d6 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Py!VDzYJ{5KXDVB6cUq=Rpjs4tz5?O(K{s5m4 zS0H`t{r{I@Vjq70{~E(^M(DA1aYPE&KIs)@wT$tDdpy7B+2L3bcd4)78&qol`;+0Jj=U%>V!Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Tools/impwelder.rsi/inhand-right.png b/Resources/Textures/White/Objects/Tools/impwelder.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..19c0f4f76c55953a39705a0b4c274b1b41512b43 GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|emUKs7M+SzC{oH>NS%G|s0G|+7 zAg!pVsHUdo=k1-Io?ay-wn~`yg@nYP==5tqImVJ8zhDN3XE)M-oO(|e#}En0w+AnY s+=|rQRx8(U?$b9FHZ(ZD=$S2pz#OjRgGbgc20Deo)78&qol`;+04&E_O8@`> literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Tools/impwelder.rsi/meta.json b/Resources/Textures/White/Objects/Tools/impwelder.rsi/meta.json new file mode 100644 index 0000000000..75778d91a9 --- /dev/null +++ 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 + } + ] +} diff --git a/Resources/Textures/White/Objects/Tools/impwelder.rsi/welder_flame.png b/Resources/Textures/White/Objects/Tools/impwelder.rsi/welder_flame.png new file mode 100644 index 0000000000000000000000000000000000000000..7814b7485199170ae34cacd3a4ecfe43995e1367 GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQYryHA+84w9GEfV$B6_Wn(<>s z!Ve&skdW}>$B7?5egGvrBz~NjaoNPu7pR`GB*-tA!Qt7BG$5y@DkP%BCAB!YD6^m> zGe3`kp<+&OSV2+g_bOFCU9!Sn=np2f6s_}>U~@8 nvn&@yOoVyeoJ&P`EEyQ?O<+FpeccaPpe_baS3j3^P6uG literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Tools/impwirecutter.rsi/icon.png b/Resources/Textures/White/Objects/Tools/impwirecutter.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6985e4f1d9ad457e2414f89064597b28234bb95f GIT binary patch literal 469 zcmV;`0V@89P)Px$k4Z#9R9J=Wl)p>EKorNn>DiDDK}8&F6D-&t6ohth5QI`YwNoj$I0^n0uI*S{ zq+1t3a4a}=D#bxWT)GvCg3=$0U_pnJ%6SekA!*W7QE>1+5XilE@ABT4?*-s+I2_J@ zN0<&I<0VF^X08bdfDj1)K-FDgMGU@Xf+!`CYxi%M8-P+v$6hgfL`yxR(sd&*y=nd z_%4xHf*qe!StgrfkyyffjGT3^wP9Bi0=ndYZo;K*#mvuAKnaF$eRBm>4MPcrzN~<) zfn>bI>IZd5ejfl}{Pqq2D4rJ0n=qM-u)5x!>jA*&12+#WSU2dCZXjPPz)(RHmqF?1 zQw<4(1n}J7#?zyQmHX<k44ofy`glX(f`NCfzVxB_Vz z85wPDZBtXzr;4(_ROI#5o1XRJU-$2ivb)+NdTHt|x3%W$ zi?T&8ZJ4-7ARK5;eRArONhkHz*l-&zJa;7R)hRw_n~H#DCwcx^-#1-!FJ@^q-pN=H W&amDvl;Jy2J%gvKpUXO@geCw55K}e) literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Tools/impwirecutter.rsi/inhand-right.png b/Resources/Textures/White/Objects/Tools/impwirecutter.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7898527e424aa84a30725f8f4fc09a311c0e3a52 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NCfzVxB_Vz z85wPDZBtXzr;4(_ROFxb80o7w)u~$M0_8YLg8YIR{zJgkQz1q`v0P6V$B>BDx7RlE zH5hQP1RPlM=fC{zm2O+6bT@kz=Wk|=TJGG^kzxOD>wd!IoEpyC8b}E(>5&qlKXkpDYl1^X<25qJ{>#jSLO*Aes{08JfB{AhkaWa Z(}HIV+a<4?>jEui@O1TaS?83{1ORvhTiXBt literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Tools/impwirecutter.rsi/meta.json b/Resources/Textures/White/Objects/Tools/impwirecutter.rsi/meta.json new file mode 100644 index 0000000000..570155bc01 --- /dev/null +++ b/Resources/Textures/White/Objects/Tools/impwirecutter.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "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 + } + ] +} diff --git a/Resources/Textures/White/Objects/Tools/impwrench.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Tools/impwrench.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..f262e9e08476357fd199bc9049cde16e782ce2b1 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|NPx$u}MThR9J=Wmc35GP#A`vLos4RqKmiC%1epmh;9{P|)X zfNZ_TTl;l_7h3>BxM?{6WHz)vgGj^)&(?e7uJQnwmc!F|lJRy#9)KU7a*Ej61ILXD zfESEkk+wjWhRSShV|Kng_*?r`=+aRB>nNEc@J{_u>C#Yp`sIZ4gC-%8X#9q=`!2bb zOIp~`M;pppB+w46|ISfB#qndh$Z*xJL$Ghs$8Q~>^- z1DxLe&h|1hu7!o0mV*#bZWWe>!<-%%AGOj=)q^g(yUlztsOM2_sZ&4V&)oWUy`D$8 zp9gwCmxg*QLqZ6WnxJrf63b!orw4RtsH1};&hBd1eV5}#CAO1nstM(Oo6=1+)W#B4 t$)JVyi)1k9Vr%iir)t*U>`E&|r5^w#2FYUqV>JK(002ovPDHLkV1j5D@O1zH literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Tools/impwrench.rsi/inhand-left.png b/Resources/Textures/White/Objects/Tools/impwrench.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..38bbee1d16dc932b22ad679894a382b20114e681 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`@CW#WxB}^d z{Cqh%IW;x4&r?lZYxZ^ng;-01{DK+&1A)v1HIPaEo-U3d5v^~p8S*hGa5x7t-TQw= zFYiV~*ysCg2iKV}G1zV2Wczd$ON#dk{mm^e|97mKG+F$^3`T|n55Kb1p5AM{e*2wy j3w|}+75*Y+%NQ=*^p>HP@o94i&}arvS3j3^P6k44ofy`glX(f`@CW#Wxc>kD zUrtW0AU|JCP3`kkQzp+pmw-~NB|(0{3_!X6G8fc9CIxxAIEF;DzP)D1$DqLB9LRC+ z|Cx78ZGE%;yIp?7k;d>rKHjOK^5XgY?f1`Zxpw|%$An+5&T{zn-_N@75 p->Lifcf1Rcm@iPU=K$N5moFEj^7udKo5YyG>tWuQtQ7gZzNuEV9VS>R|uJo89NpWI`fp#J{3<7UU_|Bl%nx)S?VFX2`C fJ3$79?v5IU=?bP0l+XkKwz_XW literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/meta.json new file mode 100644 index 0000000000..718f27265e --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/meta.json @@ -0,0 +1,103 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation and repainted by Kotovskiy (Discord User ID: 462526160773840908)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "stunbaton_off" + }, + { + "name": "stunbaton_nocell" + }, + { + "name": "stunbaton_on", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "on-inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/off-inhand-left.png b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/off-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1bdbde76535bb26b614826d707544bbbe0538d17 GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4Wgbdjv*CsZ*Oh%I^rPG`cOG*;SG+PW%6ph z`sw+qP5B9_sdr9Y(p8z--E^Z<|G^@6_Q_5h5@kj=RsO^ar#a~rzxSDShXZIj!-N~t z=hYbPFEah3Y`@{Ub$;)6wS!SV!@TQXEj2v3^p2vEw!V{HcQr)$^~LVJ z*41^kYnAS-_+$Qa)^~65pMS!Rs>Q$7;`=oz>$qE? zP>}wl>x>}lfWUxh;n%tHmait4&D;CSxzKQ%Qb{ZKR6f@g%glr(>3_Mi>$D9=?tku# z)vqf~w$6QDwNWw7g7a#@j!WB5>a|6;+NFYIz?U9-w{(o?B&Gg$>^Z8qADa zvaaub^_6F{pYFRMuth)p+#2`a?Jqs02yim+5`n^^^wnRgx;aH68vG4z@Hf{D5 zRIK=#_}uKZK+~1^*&I9V_k4LWDPw)-POu_4pOv8u8g;cf@jWr#FcylN5O_EjWJR g%mYRShOUG&!Vya+{9aaNe;j14r>mdKI;Vst0M9^+&Hw-a literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/on-inhand-left.png b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/on-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..176639dc2ef66234c7a2bd9f096b92b59648fa02 GIT binary patch literal 1045 zcmV+w1nT>VP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1FA_xK~#8N?cKj> zR6!KS@yn_hOsV84@(czn!1Qo$X6fDGOC$WkMq7bx{K)M(b8ygX|vas|m>=kxF zu^8t}X2K2Zy=&o|GrRNsG#j#k-~2guHpM-A8vp^gB=dK<5;bai;Efrn)T18mu{IinN--#%`Khr#$k z#kaEy$DTocI$f;t6YKoO-PwEet@*tle&*Aw6fO&-aRj^7t>uG!?a6z!=QoRUd(Pe6 zzBjt?ZbLoX3;BK#!j(Y2^5&m-;o^^nXk7WCD_>}gp)X&9Y5uryt&JDcu=qLG!+QQj z(k#GgO~aL!)1>^|MQA#IHoxwC0000000000000000Pw7D)*L>)!Ofy2DCw@<>WU&Q zekq$!QZdZ3fh@H2i%Z|Wv=4m%)js8RE}wEQ?=KB6y;*acxAgOk=if+p z=o`0cV6@Knn}7A_Pv?&Oa-*{!*R_kldj6d)#9AkTdA?lvgFims?dP9=uUZ6M^N(-m zCt)G9H3%70d^PV#!0|QF!Mz)2}J+^000000000000000#jw8Vl$&0SSS&o7 z9i@fPUJy3m-wfhw7P1N9`vz8a*W~*Lqz_(uV-DJ_HY$8>zh{~+;i=)Vr03>q6=A9K z&rTM&9j@K-Y@IJ^&#(5m`RR12b^ZsW#d+Lw>t%s7j^M6*Ew$(K-2R&LyL#9(u6)tg zL#Hu@s(UEMg==lRn1;pAxgOT@FOp^f0%K8x000000000000000007wEPsjayg(ztw zsw;{#;Zi2fRr!BR{C)sgXz44L{(fmQ3jO|yi=XnPwb`o8s`h;Q=lhdyn%~)KtaTEU znjhcJ&N{#PFFWYV*C;~M`KJlC2ci0W`-ps_{C0)QAi{Cv!&RSeACYgA-*wDsv?BK% zvD45Bo|Ah1xXqaLMd&L)QF{@pnzR`(#7V$OQ2ioM1ONa40000eRMY$g#ILIBa+p*X P00000NkvXXu0mjf-Lv~w literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/on-inhand-right.png b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/on-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ef7a8a9a0b419e3bf28726536142f23018eb6610 GIT binary patch literal 888 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qt-49vWqE{-7;ac}P!=7|`J94pjbAsoQH`AN;@c;oSaJ%Ue0NYaZkLZdCZrt5;dOOeD@dc+heC4 zFQ9nee7{EXhQ}Ek_m}LB(LX)m{gnMBXL2t+f7Tpfoh14*`_R+#y2loZC*IGm`Qodw zHQ(?-$K-~|3N?Z^SRh`3k{4v(xBFNAxZ3IdF!D{7PRlL@oddfT|Jtq@%~JioVXN)U zYK}GXaeEDRZ(BXPJNWea>8Vc7r+>KhBjVSCcE>CID$_oN&fakSr+GT-ytd0#a{Bgf zPKzJAtorIt`I@UczwEZ>+Rmie_h4zw)E7Tb{<@PZkgC4wF#8khXZl|^X}+u3e9e2g zg!7BILpuwu9-6&8;Lo(LALi9hpCWCrW_iK$ty}c>e^o1)Yu_zzEsx@AsgHFGQ`iIM zR*1|yy6%|M3hqNpe|G=>R>u(Ca_=7FgSqkgr*}M?UXX3)bFk{c>J2~3ru!bgYWw2e zPqiw$_Y53X|K~21E4iBgA!wi1mp@ysG_SkGu!p&!oZ(DRk79}agP0vz4}ISs&5z}N z|Fhh4C*$E)f6ry>ewlmz(eZQa$PQ`P|KM+cI{(zNMM$aPRGHi!`2$?JwNJ0z&(C$c z_I|zIzNgXIo5N>^e)*H~aOwV-I~f*vChPwMe))4WEcvSEh3vY&J1pP-`JitdaXLK5 zY5ULHPs)yeND)~2{?DghYic}OYVQA8#B-=`vErRy=U=BvewzDfdY`4M|E*hs-u??L z>hlcwc5-CT&KIc__WFCWiNSZnPpB(pCQW(Ac!h0qhYYj&E|8d~tDnm{r-UW|R(Yx( literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_nocell.png b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_nocell.png new file mode 100644 index 0000000000000000000000000000000000000000..cef544109df81fb87e3c5764e1e11376f94c570c GIT binary patch literal 414 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCim50(?ST^+aZP+2rW)ZvM~k-+|}W0fvtT!ZU;Qi}HEjq$#EKr}T&D7whwE zPFG5wnl!c8q&QY3w#1|)SvEOLB&^!5`dnXHcSyGtgH@n(D9}ju4U@8flvGKOU+{li zfI&ow;TBL8XMsm#F#`kNVGw3Kp1&dmD7e|v#WBRff9u4ze9a0xuChDchq9Lz*Zvoe zy_nT9P3PYY)q}I=Oulrat?tQur{Wp*mvfI)noF7<{CRD6h?di%w}z(C7Hjt?&C%!H z-un9OKY={13t#s{$C7?ic${vv!i$gs1GUjm?2FzjQaQvm6HBaq8 zG*9+{FD&QUPCl0{V3?O*6e+~Mra+M6I9EK&B0>90pVlxPH`&IN^Y7EFUWS^IZ=BbJ fc26^L`ogL|A@0EbkHsZG=QDV^`njxgN@xNARA;65 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_off.png b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_off.png new file mode 100644 index 0000000000000000000000000000000000000000..9c520eb1aa20769412270955fdbf51cb983cd615 GIT binary patch literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil=1AIbU^+aZP+2rW)ZvM~k-+|}W0fvvp!n0zvs|$JGBq=6Mik+08U2Dd( zZEDQa61|dmrTAFc*Z`4$YKv-bX@8&@@>ln-0aBtRL4Lviu>c0`o3*ci3OEZqB8wRq z_zr_GiL)Aoc%l3;c zo%K)VAKLP}=9;X^kquJw1RlvaYxV{F*rU(O-F`~;Va2Z^oeMvUMEO{w^2%2RoS3uZ zS%l)}_A5flJa;&h?8?xv%Uk@>LIrGrP@Va%7pJgTe~DWM4f*qD-N literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_on.png b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_on.png new file mode 100644 index 0000000000000000000000000000000000000000..6501b3502327cb9560d80931baa6d7ce392f837f GIT binary patch literal 1750 zcmV;{1}XW8P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D25U(~K~#8N?VMd` z6jv0-PYSI?RHRwjfN3NW5+6#miAV~em^Mahn|?rx=n|Dk4OCI+tB=0;Blh zpF1-VWq_C&Zz!zt0o`pretc`NkCrf}Mx|T1-rl%o>3w3oc>&P$v4F z&h$r~{#Hl-J6tCN#rf2b{&iDFYiyA1>pa2IlhB6Sc;m>B^m}A|Tz4j&`ugKvCBA-` zF<=bmawGW5mE%*thre7ovOY_{{GRUkMFVnz-?c80Z3J$oY(N?4XU;MYeX;iElvZ-u7Q!(&t%_ez^?Xwc5=h4 z_TYtnPx}Bnxjt8){SZH{OTWAAn0x%rnVGMz{A1|;t@~Nin@w=*)(p%fdf~#t>(Fxj z=(}}YKaIl1htv2P%8!Bl&HZe1_h$In(VtB0feU}@)sJt9v*xa5xH*!B>BQTf`brZp z&^*9ex?14goqKTq@qPH>>d0#_`O3z+j*$e4Q-A&z`ct>3VCwM{od4?PivEtfYallH zJ+=Pf#=~r9$4(f#I|gG*WANp*-#z13mH-ia>UIj|=jP#3;!+Ksl8)#D{t{AT{e`&& zxR|)8RbQAtF**Tr3v+NKc_pjw%zK=<>%*6l1h@sycWJ@2zMJ`cmnWecYRxa*d?Zw3 zt@+{1M@nw69DHgb1w*q##>_XNFPlG+nt#LdBfdp1ruBvSn0S@=%Ag#) ziQZ>gUp8N5??*fjV$G*BA1QhuYd)>{i03`PRPX}R`jqA)o(DV_JIHYUbS;A$53XuA zz_fmEtan9!4TEq0{6@Qe4j(lf$TY?jruFx3dPli_pyz-Wp5KtUF7s9GnAU&kx!TNq zfv@UC1a8Uz)B3`A)d>i623XV+I017@^L)t+ruF~&&&-o}2741$e-pM?EM#Cc0H0$; zFnLvSK5qJAn@(hXz9|dYlbs}1us$EnC{(Ty7C-tFh?t7#8y_El)x%_Gf;c{(-1M_O z(V3H+4O|DNEhc!-_rJI6j~{giF@p|A8g0KY26-*A(6k}&>c94-(2CfCO| zQGfmwzu{tieqt#Bm#^jMXFw&JkC!99STaHNi)jWn4$ZHo`uw1%)(>!5K&4;OcR?0)1WrJt>+>BVJwBisZ^9N!w9)cl zfz<(gQOjS)R}y3ia7-5kNJjp@KhmK2d|D|~)ma}Obyk_rtAue*JwCwV;AXz462^7h zZWBOAA@j3U!qoqtA9e5&(^@;|ZoaM(?WmIJ{Z0bjdi9f4|KD%T*F;}qA3J;GEZevJ zgpvCEN<-;$0De`AzoBA%eDdEU4Bq&~^Z)asjjBS@XjY$}DSscuF=*Hs4guPBl=HY1Vvo1U3%MH(8%wZ3OyJUi5rxzB+s-K$wrU zk`{IN>cO)4w)d;W(?n}NEk%vA=F{VO53uIb;%R7E)yGF2TbieyK+gfD>+>UxFy1CW sErH9^Eoupz0MqsPk;dMHEma1<|ARh3Yk&}t6#xJL07*qoM6N<$g2{__VE_OC literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Specific/expmedkit.rsi/icon.png b/Resources/Textures/White/Specific/expmedkit.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..fe418608117a49e1f266b80767549f55a5251538 GIT binary patch literal 942 zcmV;f15x~mP)Px&Xh}ptR9J=Wl}|_&DrD#KlNDc;eCq*~3 zjLn#AA`}XN%|!@kZ8Bk&1W`!b(2EdzkV0=lEg=*NrG(l_9I22}P)OE*vp<|3(%(3f z`Qw^Pd+-a({^s}I`+dLf&2Qd={}@e;I!;edHw_I9dFJP)r>ZKh>!PYEfWMxYoM`ww z38hg-Nq+gfndav0S45(-ZQGs@0!4YDapm_F%uhc9z`A|Q_mkNNZLLRJ3C0c&4=3`( zR=~DxuTUtkvHk>rZ@>S}w^_Gu;kqu}A9nkD4<9^a;--bHju3)VAN2x|efuo{FG<9q zxJ@BMFxbyTB1jH!tn-+EAA-zq(0>AwBC{aM{d$DcX11J;zKE%x;m4gVH-h6LQ@}P*B$v(({^i^;)gQ zTCK+TYJcPm8K3qQq*kC=4V%YT`zh*Ml&2Jm`W661eT$;Lg;Cm!h>-F7?u0U+=I(^l z7c$prnK}zVc}k)5#cPzWDIxn)v71EA-3cWWhu8{8$mSBnvzvGP^`&diWA|keGJf9` zkOV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DJ`=I$j(er;^IsJGC}&dIMa#}b5lWVLoQ_nS3ei9$pD-c8)PG; z?{WYD0F+5YK~zYI?UXSN!XOlep*GBoC%{m5L!+}X=>@QGfrj)3#2fV5O4{N5Z*kP& zeJtMx1ej1t5dN0#Gf)t1)oByA3!{yBLSZzi1Qf<$S!Wc!A(bZzzar*V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DJ`=I$j(er;^IsJGC}&dIMa#}b5lWVLoQ_nS3ei9$pD-c8)PG; z?{WYD0EtONK~zYI?Uc(6fFKY=`4wOZ8tlMMR6Ls)Vh6Nf+wMgO!^Sg*9Zvh0z@DB` z5=nm<==@>r)x_NE@xv~}ohcM-jU?NY(iwe$k_R1=9c8KL?X!n zMKrzuMQDFQ0Tkf^7C;d+LID&(BNl2!*yaUL1dX_4?E)HAPk8}&ofx{a-q1Aw0000< KMNUMnLSTZ3*OcM_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Specific/expmedkit.rsi/meta.json b/Resources/Textures/White/Specific/expmedkit.rsi/meta.json new file mode 100644 index 0000000000..4cfef646a8 --- /dev/null +++ b/Resources/Textures/White/Specific/expmedkit.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by QuizzyQuin", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/migration.yml b/Resources/migration.yml index 30274a5fee..2dde4c549b 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -88,12 +88,6 @@ GeneratorUranium: PortableGeneratorSuperPacman GeneratorPlasmaMachineCircuitboard: PortableGeneratorPacmanMachineCircuitboard GeneratorUraniumMachineCircuitboard: PortableGeneratorSuperPacmanMachineCircuitboard -# 2023-12-10 -SpawnPointSeniorResearcher: null -SpawnPointSeniorOfficer: null -SpawnPointSeniorEngineer: null -SpawnPointSeniorPhysician: null - # 2023-12-12 #No this is not the CMO hardsuit, their prototype IDs were just confusingly similar ClothingOuterHardsuitMedic: ClothingOuterHardsuitSyndieMedic