diff --git a/Resources/Locale/en-US/_LostParadise/GhostRoles/delta.ftl b/Resources/Locale/en-US/_LostParadise/GhostRoles/delta.ftl index 5ba62021b3e..ea447e3ca37 100644 --- a/Resources/Locale/en-US/_LostParadise/GhostRoles/delta.ftl +++ b/Resources/Locale/en-US/_LostParadise/GhostRoles/delta.ftl @@ -1,7 +1,7 @@ ghost-role-information-delta-commander-name = Командир ОСН "Дельта" ghost-role-information-delta-commander-description = Возглавьте элитный отряд NanoTrasen и выполните поставленную боевую задача. ghost-role-information-delta-operator-name = Оперативник ОСН "Дельта" -ghost-role-information-delta-operator-description = Оперативник "Дельта", сделайте все в лучшем виде. NanoTrasen надеется на вас. И помните: Вы клин авангарда. +ghost-role-information-delta-operator-description = Оперативник "Дельта", сделайте все в лучшем виде. НаноТрейзен надеется на вас. И помните: Вы клин авангарда. ghost-role-information-delta-medic-name = Медик ОСН "Дельта" ghost-role-information-delta-medic-description = Верните всех ребят вашего отряда домой живыми. И даже больше. ghost-role-information-delta-engineer-name = Инженер ОСН "Дельта" diff --git a/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl b/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl index 5153f1d927f..5be8f04035b 100644 --- a/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl @@ -24,3 +24,13 @@ job-description-expeditor = Исследуйте врата и помогайт LPPJobSecurityEnginer = Полевой Инженер job-name-security-enginer = Полевой Инженер job-description-security-enginer = Не дайте бригу пропасть во тьме. Ремонтируйте постройки, а также устройте перестройки. Приносите разруху и разрушения во время штурма! +job-name-delta-commander = Командир ОСН "Дельта" +job-description-delta-commander = Возглавьте элитный отряд НаноТрейзен и выполните поставленную боевую задача. +job-name-delta-operator = Оперативник ОСН "Дельта" +job-description-delta-operator = Оперативник "Дельта", сделайте все в лучшем виде. NanoTrasen надеется на вас. И помните: Вы клин авангарда. +job-name-delta-medic = Медик ОСН "Дельта" +job-description-delta-medic = Верните всех ребят вашего отряда домой живыми. И даже больше. +job-name-delta-engineer = Инженер ОСН "Дельта" +job-description-delta-engineer = Стройте укрепления и вскрывайте инженерные заграждения. Кстати, вы любимчик среди КПБ, киборгов и операторов мехов. +job-name-delta-pyrotech = Штурмовик ОСН "Дельта" +job-description-delta-pyrotech = Прикройте отряд тяжелым вооружением и возглавьте огневую группу. diff --git a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/mobs/player/humanoid.ftl b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/mobs/player/humanoid.ftl new file mode 100644 index 00000000000..11d92be6a73 --- /dev/null +++ b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/mobs/player/humanoid.ftl @@ -0,0 +1,15 @@ +ent-LPPRandomHumanoidSpawnerDeltaCommander = Командир ОСН "Дельта" + .suffix = Отряд "Дельта", Броня EVA + .desc = { "" } +ent-LPPRandomHumanoidSpawnerDeltaEngineer = Инженер ОСН "Дельта" + .suffix = Отряд "Дельта", Броня EVA + .desc = { "" } +ent-LPPRandomHumanoidSpawnerDeltaMedic = Медик ОСН "Дельта" + .suffix = Отряд "Дельта", Броня EVA + .desc = { "" } +ent-LPPRandomHumanoidSpawnerDeltaOperator = Оператор ОСН "Дельта" + .suffix = Отряд "Дельта", Броня EVA + .desc = { "" } +ent-LPPRandomHumanoidSpawnerDeltaPyrotech = Штурмовик ОСН "Дельта" + .suffix = Отряд "Дельта", Броня EVA + .desc = { "" } diff --git a/Resources/Locale/ru-RU/_LostParadise/startgear/backpack.ftl b/Resources/Locale/ru-RU/_LostParadise/startgear/backpack.ftl new file mode 100644 index 00000000000..ee5394ec57a --- /dev/null +++ b/Resources/Locale/ru-RU/_LostParadise/startgear/backpack.ftl @@ -0,0 +1,10 @@ +ent-LPPClothingBackpackDeltaLeaderFilled = Рюкзак Командира ОСН "Дельта" + .desc = Вместительный рюкзак с множеством карманов, который носят Командиры Интергаллактического Разведывательного Центра НаноТрейзен. +ent-LPPClothingBackpackDeltaEngineerFilled = Рюкзак Инженера ОСН "Дельта" + .desc = Вместительный рюкзак с множеством карманов, который носят Инженеры Интергаллактического Разведывательного Центра НаноТрейзен. +ent-LPPClothingBackpackDeltaMedicFilled = Рюкзак Медика ОСН "Дельта" + .desc = Вместительный рюкзак с множеством карманов, который носят Медики Интергаллактического Разведывательного Центра НаноТрейзен. +ent-LPPClothingBackpackDeltaOperatorFilled = Рюкзак Оператора ОСН "Дельта" + .desc = Вместительный рюкзак с множеством карманов, который носят Операторы Интергаллактического Разведывательного Центра НаноТрейзен. +ent-LPPClothingBackpackDeltaPyrotechFilled = Рюкзак Штурмовика ОСН "Дельта" + .desc = Вместительный рюкзак с множеством карманов, который носят Штурмовики Интергаллактического Разведывательного Центра НаноТрейзен. diff --git a/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl b/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl index 0f4b693468d..5a5728c3755 100644 --- a/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl @@ -120,19 +120,19 @@ ghost-role-information-remilia-name = Ремилия, фамильяр свящ ghost-role-information-remilia-description = Слушайтесь и повинуйтесь священнику. Ешьте фрукты. Громко кричите людям в уши и списывайте это на эхолокацию. ghost-role-information-cerberus-name = Цербер, злой фамильяр ghost-role-information-cerberus-description = Слушайте своего хозяина. Сейте хаос. -ghost-role-information-ert-leader-name = ОБР Лидер +ghost-role-information-ert-leader-name = Лидер ОБР ghost-role-information-ert-leader-description = Руководите командой специалистов для решения проблем станции. -ghost-role-information-ert-janitor-name = ОБР Уборщик +ghost-role-information-ert-janitor-name = Уборщик ОБР ghost-role-information-ert-janitor-description = Оказывайте содействие в попытках навести чистоту для решения проблем станции. -ghost-role-information-ert-chaplain-name = ОБР Священник +ghost-role-information-ert-chaplain-name = Священник ОБР ghost-role-information-ert-chaplain-description = Оказывайте помощь в разрешении моральных проблем экипажа станции. -ghost-role-information-ert-engineer-name = ОБР Инженер +ghost-role-information-ert-engineer-name = Полевой Инженер ОБР ghost-role-information-ert-engineer-description = Оказывайте содействие в инженерных работах для решения проблем станции. -ghost-role-information-ert-security-name = ОБР Офицер безопасности +ghost-role-information-ert-security-name = Полевой Офицер ОБР ghost-role-information-ert-security-description = Оказывайте содействие в обеспечении безопасности для решения проблем станции. -ghost-role-information-ert-medical-name = ОБР Медик +ghost-role-information-ert-medical-name = Полевой Врач ОБР ghost-role-information-ert-medical-description = Оказывайте содействие в медицинской помощи для решения проблем станции. -ghost-role-information-cburn-agent-name = РХБЗЗ Оперативник +ghost-role-information-cburn-agent-name = Офицер РХБЗЗ ghost-role-information-cburn-agent-description = Высококвалифицированный агент Центком, способный справиться с любыми угрозами. ghost-role-information-centcom-official-name = Представитель Центком ghost-role-information-centcom-official-description = Инспектируйте станцию, пишите служебные характеристики на руководителей, орудуйте факсом. @@ -146,7 +146,7 @@ ghost-role-information-loneop-rules = Вы [color=red][bold]Командный ghost-role-information-hellspawn-name = Адское отродье ghost-role-information-BreadDog-rules = Ты - съедобная собака, сделанная из хлеба. Твоя задача - найти свое место в этом мире, где все хотят тебя съесть. ghost-role-information-hellspawn-description = Несите смерть всем, кто не повинуется великой богине Нар'Си. -ghost-role-information-Death-Squad-name = Оперативник Эскадрона смерти +ghost-role-information-Death-Squad-name = Оперативник Эскадрона Смерти ghost-role-information-space-ninja-rules = Вы элитный наемник клана Пауков. От вас не требуется следовать своим целям, но ваша ЧЕСТЬ НИНДЗЯ требует, чтобы вы старались. ghost-role-information-Death-Squad-description = Приготовьтесь к массированному наступлению на станцию. Ваша задача как тяжеловооружённого оперативника - уничтожить всё живое на своём пути. И никаких свидетелей. ghost-role-information-SyndiCat-name = СиндиКот diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl index 731d23600ec..c4fc4fe1bab 100644 --- a/Resources/Locale/ru-RU/job/job-names.ftl +++ b/Resources/Locale/ru-RU/job/job-names.ftl @@ -42,9 +42,9 @@ job-name-chef = Шеф-повар job-name-clown = Клоун job-name-ertleader = Лидер ОБР job-name-ertchaplain = Священник ОБР -job-name-ertengineer = Инженер ОБР -job-name-ertsecurity = Офицер Безопасности ОБР -job-name-ertmedic = Медик ОБР +job-name-ertengineer = Полевой Инженер ОБР +job-name-ertsecurity = Полевой Офицер ОБР +job-name-ertmedic = Полевой Врач ОБР job-name-ertjanitor = Уборщик ОБР job-name-boxer = Боксёр job-name-zookeeper = Зоотехник @@ -78,13 +78,13 @@ JobChiefEngineer = Старший Инженер JobChiefMedicalOfficer = Главный Врач JobClown = Клоун JobDetective = Детектив -JobERTEngineer = Инженер ОБР +JobERTEngineer = Полевой Инженер ОБР JobBrigmedic = Полевой Врач JobERTChaplain = Священник ОБР JobERTJanitor = Уборщик ОБР JobERTLeader = Лидер ОБР -JobERTMedical = Медик ОБР -JobERTSecurity = Офицер Безопасности ОБР +JobERTMedical = Полевой Врач ОБР +JobERTSecurity = Полевой Офицер ОБР JobHeadOfPersonnel = Глава Персонала JobHeadOfSecurity = Глава Службы Безопасности JobJanitor = Уборщик diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/back/backpack.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/back/backpack.ftl index 056b814f53e..d3da47c2c2e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/back/backpack.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/back/backpack.ftl @@ -3,8 +3,8 @@ ent-LPPClothingSatchelSmugglerAbstract = { ent-ClothingBackpackSatchel } .suffix = Контрабандист ent-LPPClothingBackpackBlueshieldFilled = { ent-LPPClothingBackpackBlueshield } .desc = { ent-LPPClothingBackpackBlueshield.desc } -ent-LPPClothingBackpackIIC = Рюкзак ИРЦ "Дельта" - .desc = Вместительный рюкзак с множеством карманов, который носят штурмовики и офицеры Интергаллактического Разведывательного Центра Нанотрейзен +ent-LPPClothingBackpackIIC = Рюкзак ОСН "Дельта" + .desc = Вместительный рюкзак с множеством карманов, который носят штурмовики и операторы Интергаллактического Разведывательного Центра НаноТрейзен. ent-LPPClothingBackpackHop = Рюкзак Главы Персонала .desc = Сотканный из дорогих тканей рюкзак. ent-LPPJetpackNightGuardCape = Джетпак НайтГарда @@ -14,7 +14,7 @@ ent-LPPClothingBackpackPG = Рюкзак ПГ .desc = Рюкзак, чтобы вместить все что нужно солдату... ent-LPPBlackClothingBackpackPG = Чёрный рюкзак ПГ .desc = Рюкзак для всех потребностей ПГ. Ночных потребностей. -ent-LPPClothingBackpackSecurityEngineer = Рюкзак полевого инженера +ent-LPPClothingBackpackSecurityEngineer = Рюкзак Полевого Инженера .desc = Свет инженерного отдела продолжает борьбу... Все еще не заляпан кровью... ent-LPPClothingBackpackBlueshield = Рюкзак офицера "Синий Щит" .desc = Говорят, он пуленепробиваемый. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/back/satchel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/back/satchel.ftl index b5a33586336..16b52450885 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/back/satchel.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/back/satchel.ftl @@ -3,7 +3,7 @@ ent-LPPClothingBackpackSatchelHop = Сумка Главы Персонала ent-LPPClothingSatchelSmuggler = { ent-ClothingBackpackSatchel } .desc = { ent-ClothingBackpackSatchel.desc } .suffix = Контрабандист -ent-LPPClothingSatchelSecurityEngineer = Сумка полевого инженера +ent-LPPClothingSatchelSecurityEngineer = Сумка Полевого Инженера .desc = Свет инженерного отдела продолжает борьбу... Все еще не заляпан кровью... ent-LPPClothingBackpackSatchelBlueshield = Сумка офицера "Синий Щит" .desc = Удобно сбрасывать винтовочные магазины. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/belt/belts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/belt/belts.ftl index 17dc57dd210..fa70be02021 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/belt/belts.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/belt/belts.ftl @@ -6,8 +6,8 @@ ent-LPPClothingBeltFlamingo = Надувной фламинго .desc = Хаппи хаппи хаппи. ХАППИ ХАППИ ХАППИ ХАППИ ХАППИ ХАППИ ХАППИ ХАППИ ХАППИ. ent-LPPClothingBeltNPZWebbing = РПС НПЗ .desc = Плотная дюратканевая РПС в расцветке войск НПЗ. -ent-LPPClothingMilitaryWebbingSecEng = РПС полевого инженера - .desc = Ременно-плечевая система тактических ремней для полевого инженера. +ent-LPPClothingMilitaryWebbingSecEng = РПС Полевого Инженера + .desc = Ременно-плечевая система тактических ремней для Полевого Инженера. .suffix = СБ ent-LPPClothingBeltMaximumWebbing = Разгрузочный жилет "Хомяк" .desc = Комплект из карманов, сумок и прочей лабуды предоставляет кучу места для ваших всевозможных вещей, что вы сюда запихнёте. Выглядит крайне громоздко однако. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/ears/headsets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/ears/headsets.ftl index f1d9bbd148b..26b40030687 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/ears/headsets.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/ears/headsets.ftl @@ -1,2 +1,2 @@ -ent-LPPClothingHeadsetSecurityEngineer = Гарнитура полевого инженера +ent-LPPClothingHeadsetSecurityEngineer = Гарнитура Полевого Инженера .desc = Это используется элитными силами безопасности. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/eyes/hud/hud.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/eyes/hud/hud.ftl index ff99ec3a363..de4e361ce86 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/eyes/hud/hud.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/eyes/hud/hud.ftl @@ -8,7 +8,7 @@ ent-LPPBlueHudGlasses = Синие солнцезащитные очки с ви .desc = Полезно как для безопасности, так и для каргонии. ent-LPPChemistHudGlasses = Химические очки-анализаторы .desc = Пара эффектных очков, используемых для защиты от разливов химических веществ. Оснащён анализатором для сканирования реагентов. -ent-LPPClothingEyesHudSecEng = Визор полевого инженера +ent-LPPClothingEyesHudSecEng = Визор Полевого Инженера .desc = Модель визора представляющая собой совмещение оптического мезонного сканера и визора службы безопасности. Защищает глаза. ent-LPPNPZEyehud = Визор НПЗ .desc = Визор спецслужб НПЗ, со встроенными дополнительными элементами, такими как защита от ярких вспышек, а так же, в связи с последними сотруднечискими мерами между НПЗ и НТ, встроенной базой данных НаноТрайзен для определения должностей и преступников на объектах корпорации. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl index 6d6ee3158ef..5862f38fd0a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl @@ -2,7 +2,7 @@ ent-LPPClothingHeadHelmetHardsuitNightGuard = Шлем экзоскелета н .desc = Обычно он приходит ночью. Обычно. ent-LPPHardsuitHelmetAssaultParamedic = Шлем ZhP-26lp .desc = { ent-ClothingHeadHardsuitWithLightBase.desc } -ent-LPPClothingHeadHelmetHardsuitIIC = Шлем скафандра ИРЦ +ent-LPPClothingHeadHelmetHardsuitIIC = Шлем экзоскелета ИРЦ .desc = Шлем, обеспечивающий защиту от жары и давления. ent-LPPClothingHeadHelmetHardsuitSWAT = Защитный шлем спецназа .desc = Бронированный шлем скафандра для обеспечения безопасности. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl index 19081a971ce..9fa638c3728 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl @@ -1,7 +1,7 @@ ent-LPPArmorMovement = Силовая броня .desc = Костюм, защищающий от опасных сред с низким давлением. ent-LPPClothingOuterHardsuitIIC = Скафандр ИРЦ "Дельта" - .desc = Защитный костюм "Дельта", который носят штурмовики и офицеры Интергаллактического Разведывательного Центра НаноТрейзен. + .desc = Защитный костюм "Дельта", который носят оперативники Интергаллактического Разведывательного Центра НаноТрейзен. ent-LPPClothingOuterHardsuitNightGuard = Скафандр НайтГарда .desc = Обычно он приходит по ночам. Обычно. ent-LPPClothingOuterHardsuitSWAT = Тактический cкафандр FPA-56 - "Rhino" @@ -22,14 +22,14 @@ ent-LPPClothingOuterHardsuitChrono = Скафандр ALT-4f - "Click" ent-LPPClothingOuterHardsuitBlueshield = Скафандр NT-443bs - "Bodyguard" .desc = Воронёный скафандр офицера "Синий Щит". .suffix = Синий Щит -ent-LPPClothingOuterHardsuitIICPyrotech = Пиротехнический скафандр IIC 'Дельта' - .desc = Защитный костюм "Дельта", используемый штурмовиками и офицерами Центра межзвездной разведки НаноТрейзен. -ent-LPPClothingOuterHardsuitIICMedic = Медицинский скафандр IIC 'Дельта' - .desc = Защитный костюм "Дельта", используемый штурмовиками и офицерами Центра межзвездной разведки НаноТрейзен. -ent-LPPClothingOuterHardsuitIICCommand = Командирский скафандр IIC 'Дельта' - .desc = Защитный костюм "Дельта", используемый штурмовиками и офицерами Центра межзвездной разведки НаноТрейзен. -ent-LPPClothingOuterHardsuitIICEngineer = Инженерный скафандр IIC "Дельта" - .desc = Защитный костюм "Дельта", используемый штурмовиками и офицерами Центра межзвездной разведки НаноТрейзен. +ent-LPPClothingOuterHardsuitIICPyrotech = Пиротехнический скафандр ИРЦ "Дельта" + .desc = Защитный костюм "Дельта", используемый штурмовиками Интергаллактического Разведывательного Центра НаноТрейзен. +ent-LPPClothingOuterHardsuitIICMedic = Медицинский скафандр ИРЦ "Дельта" + .desc = Защитный костюм "Дельта", используемый медиками Интергаллактического Разведывательного Центра НаноТрейзен. +ent-LPPClothingOuterHardsuitIICCommand = Командирский скафандр ИРЦ "Дельта" + .desc = Защитный костюм "Дельта", используемый командирами Интергаллактического Разведывательного Центра НаноТрейзен. +ent-LPPClothingOuterHardsuitIICEngineer = Инженерный скафандр ИРЦ "Дельта" + .desc = Защитный костюм "Дельта", используемый инженерами Интергаллактического Разведывательного Центра НаноТрейзен. ent-LPPClothingOuterHardsuitRND = Скафандр RHS-14s - "Lambda" .desc = Защитный скафандр, разработанный головастиками из отдела НИО, лёгкий для производства, а так же предоставляющий, в целом, хорошую защиту от разных внешних факторов, что можно встретить при работе в НИО. ent-LPPClothingOuterHardsuitScienceNPZ = Скафандр NPZ-34r - "Gelehrt" diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/devices/TacticalShop.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/devices/TacticalShop.ftl index 6744369740d..135e95ee01b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/devices/TacticalShop.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/devices/TacticalShop.ftl @@ -1,11 +1,11 @@ -ent-LPPERTUplinkShop = Планшет планирования операций - .desc = Планшет офицеров ДСО с доступом в блюспейс хранилища сектора +ent-LPPERTUplinkShop = Планшет планирования операций ОБР + .desc = Планшет лидера ОБР с доступом в блюспейс хранилища сектора .suffix = ОБР -ent-LPPCBURNUplinkShop = Планшет планирования операций - .desc = Планшет офицеров ДСО с доступом в блюспейс хранилища сектора +ent-LPPCBURNUplinkShop = Планшет планирования операций РХБЗЗ + .desc = Планшет лидера отряда РХБЗЗ с доступом в блюспейс хранилища сектора .suffix = РХБЗЗ -ent-LPPDeltaUplinkShop = Планшет планирования операций - .desc = Планшет офицеров ДСО с доступом в блюспейс хранилища сектора +ent-LPPDeltaUplinkShop = Планшет планирования операций отряда "Дельта" + .desc = Планшет командира отряда "Дельта" с доступом в блюспейс хранилища сектора. .suffix = Дельта ent-LPPHOSUplinkShop = Планшет закупа СБ .desc = Планшет для смотрителя СБ, позволяющий закупиться снаряжением под себя. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/devices/pda.ftl index 83e47fbceea..e796ff96f2c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/devices/pda.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/devices/pda.ftl @@ -8,3 +8,18 @@ ent-LPPExpeditorPDA = КПК Исследователя .desc = Потёртый, поцарапанный, но все еще работает. ent-LPPSecPilotPDA = КПК Пилота СБ .desc = Выглядит новеньким и пахнет космосом. +ent-LPPDeltaCommanderPDA = КПК Командира ОСН "Дельта" + .desc = Красный значит мощный. + .suffix = Командир +ent-LPPDeltaEngineerPDA = КПК Инженера ОСН "Дельта" + .suffix = Инженер + .desc = Красный значит мощный. Он изрядно потрёпан. Имеет встроенный газоанализатор. +ent-LPPDeltaMedicPDA = КПК Медика ОСН "Дельта" + .suffix = Врач + .desc = Красный значит мощный. Он блестит и стерилен. Имеет встроенный анализатор здоровья. +ent-LPPDeltaOperatorPDA = КПК Оперативника ОСН "Дельта" + .suffix = Оперативник + .desc = Красный значит мощный. На боку нацарапаны метки подсчёта. +ent-LPPDeltaPyrotechPDA = КПК Штурмовика ОСН "Дельта" + .suffix = Штурмовик + .desc = Красный значит мощный. Он выглядит обгоревшим. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/misc/identification_cards.ftl index e5380dfe936..a0678c0b712 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/misc/identification_cards.ftl @@ -8,3 +8,13 @@ ent-LPPExpeditorIDCard = ID карта Исследователя .desc = { ent-IDCardStandard.desc } ent-LPPSecPilotIDCard = ID карта Пилота СБ .desc = { ent-IDCardStandard.desc } +ent-LPPDeltaCommanderIDCard = ID карта Командира ОСН "Дельта" + .desc = { ent-IDCardStandard.desc } +ent-LPPDeltaEngineerIDCard = ID карта Инженера ОСН "Дельта" + .desc = { ent-IDCardStandard.desc } +ent-LPPDeltaMedicIDCard = ID карта Медика ОСН "Дельта" + .desc = { ent-IDCardStandard.desc } +ent-LPPDeltaOperatorIDCard = ID карта Оперативника ОСН "Дельта" + .desc = { ent-IDCardStandard.desc } +ent-LPPDeltaPyrotechIDCard = ID карта Штурмовика ОСН "Дельта" + .desc = { ent-IDCardStandard.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/weapons/guns/rifles/rifles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/weapons/guns/rifles/rifles.ftl index 7861e64a762..9f618c3899a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/weapons/guns/rifles/rifles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/weapons/guns/rifles/rifles.ftl @@ -2,7 +2,7 @@ ent-WeaponRifleVulcan = Вулкан .desc = Одна из первых винтовок, модифицированных для использования в космосе. Эта винтовка была создана, для проделывания дырок в каргонских "боевых мехах". Использует патрон .30 винтовочный. ent-WeaponRifleJackdaw = CAWS-25 Галка .desc = Начало конца сопровождается пением галки. Использует патрон .25 безгильзовый - .suffix = Эскадрон смерти + .suffix = Эскадрон Смерти ent-WeaponRifleTenebra = Тьма .desc = Минималистичная винтовка массового производства в дизайне буллпап. использует патрон .20 винтовочный. .suffix = Наёмник diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl index 680806dc7ab..abf033e66c7 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl @@ -122,7 +122,7 @@ ent-ClothingOuterHardsuitDeathsquad = Тактический скафандр NT На нём виднеется аббревиатура "NTIA-DAP". Броня скафандра укреплена сверхпрочным сплавом, помимо этого он почти ничего не весит. ent-ClothingOuterHardsuitCBURN = Тактический скафандр NT-444-CBRN -"Jophiel" .desc = - Тактический скафандр предназначенный для ОБР катергии CBURN, имеет логотип НаноТрейзен и серийный номер. + Тактический скафандр предназначенный для ОБР категории РХБЗЗ, имеет логотип НаноТрейзен и серийный номер. Броня скафандра укреплена простым, но прочным сплавом, помимо этого он почти ничего не весит. ent-ClothingOuterHardsuitClown = Пустотный скафандр клоуна .desc = Обычный пустотный скафандр, украшенный специальной расцветкой. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl index c8edcb266ad..2333d3b89d2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl @@ -1,4 +1,4 @@ -ent-ClothingUniformJumpsuitDeathSquad = Униформа Эскадрона смерти +ent-ClothingUniformJumpsuitDeathSquad = Униформа Эскадрона Смерти .desc = Усовершенствованный бронированный комбинезон, используемый спецподразделениями при проведении специальных операций. ent-ClothingUniformJumpsuitAncient = Старинный комбинезон .desc = Ужасно поношенный и потрёпанный серый комбинезон. Он выглядит так, будто его не стирали более десяти лет. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl index f97b89a2e37..cf63491d657 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl @@ -85,11 +85,11 @@ ent-SpawnPointERTLeader = Лидер ОБР .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointERTChaplain = Священник ОБР .desc = { ent-SpawnPointJobBase.desc } -ent-SpawnPointERTEngineer = Инженер ОБР +ent-SpawnPointERTEngineer = Полевой Инженер ОБР .desc = { ent-SpawnPointJobBase.desc } -ent-SpawnPointERTMedical = Медик ОБР +ent-SpawnPointERTMedical = Полевой Врач ОБР .desc = { ent-SpawnPointJobBase.desc } -ent-SpawnPointERTSecurity = Офицер безопасности ОБР +ent-SpawnPointERTSecurity = Полевой Офицер ОБР .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointERTJanitor = Уборщик ОБР .desc = { ent-SpawnPointJobBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl index 442b88944c7..072455a74f4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl @@ -1,49 +1,49 @@ -ent-RandomHumanoidSpawnerDeathSquad = Агент Эскадрона смерти - .suffix = Роль ОБР, Эскадрон смерти +ent-RandomHumanoidSpawnerDeathSquad = Агент Эскадрона Смерти + .suffix = Роль ОБР, Эскадрон Смерти .desc = { "" } -ent-RandomHumanoidSpawnerERTLeader = ОБР лидер +ent-RandomHumanoidSpawnerERTLeader = Лидер ОБР .suffix = Роль ОБР, Базовый .desc = { "" } -ent-RandomHumanoidSpawnerERTLeaderEVA = ОБР лидер +ent-RandomHumanoidSpawnerERTLeaderEVA = Лидер ОБР .suffix = Роль ОБР, Броня EVA .desc = { ent-RandomHumanoidSpawnerERTLeader.desc } ent-RandomHumanoidSpawnerERTLeaderEVALecter = { ent-RandomHumanoidSpawnerERTLeaderEVA } .suffix = Роль ОБР, Лектер, EVA .desc = { ent-RandomHumanoidSpawnerERTLeaderEVA.desc } -ent-RandomHumanoidSpawnerERTChaplain = ОБР священник +ent-RandomHumanoidSpawnerERTChaplain = Священник ОБР .suffix = Роль ОБР, Базовый .desc = { ent-RandomHumanoidSpawnerERTLeader.desc } -ent-RandomHumanoidSpawnerERTChaplainEVA = ОБР священник +ent-RandomHumanoidSpawnerERTChaplainEVA = Священник ОБР .suffix = Роль ОБР, Окруж. среда EVA .desc = { ent-RandomHumanoidSpawnerERTChaplain.desc } -ent-RandomHumanoidSpawnerERTJanitor = ОБР уборщик +ent-RandomHumanoidSpawnerERTJanitor = Уборщик ОБР .suffix = Роль ОБР, Базовый .desc = { ent-RandomHumanoidSpawnerERTLeader.desc } -ent-RandomHumanoidSpawnerERTJanitorEVA = ОБР уборщик +ent-RandomHumanoidSpawnerERTJanitorEVA = Уборщик ОБР .suffix = Роль ОБР, Окруж. среда EVA .desc = { ent-RandomHumanoidSpawnerERTJanitor.desc } -ent-RandomHumanoidSpawnerERTEngineer = ОБР инженер +ent-RandomHumanoidSpawnerERTEngineer = Полевой Инженер ОБР .suffix = Роль ОБР, Базовый .desc = { ent-RandomHumanoidSpawnerERTLeader.desc } -ent-RandomHumanoidSpawnerERTEngineerEVA = ОБР инженер +ent-RandomHumanoidSpawnerERTEngineerEVA = Полевой Инженер ОБР .suffix = Роль ОБР, Окруж. среда EVA .desc = { ent-RandomHumanoidSpawnerERTEngineer.desc } -ent-RandomHumanoidSpawnerERTSecurity = ОБР офицер безопасности +ent-RandomHumanoidSpawnerERTSecurity = Полевой Офицер ОБР .suffix = Роль ОБР, Базовый .desc = { ent-RandomHumanoidSpawnerERTLeader.desc } -ent-RandomHumanoidSpawnerERTSecurityEVA = ОБР офицер безопасности +ent-RandomHumanoidSpawnerERTSecurityEVA = Полевой Офицер ОБР .suffix = Роль ОБР, Броня EVA .desc = { ent-RandomHumanoidSpawnerERTSecurity.desc } ent-RandomHumanoidSpawnerERTSecurityEVALecter = { ent-RandomHumanoidSpawnerERTSecurityEVA } .suffix = Роль ОБР, Лектер, EVA .desc = { ent-RandomHumanoidSpawnerERTSecurityEVA.desc } -ent-RandomHumanoidSpawnerERTMedical = ОБР медик +ent-RandomHumanoidSpawnerERTMedical = Полевой Врач ОБР .suffix = Роль ОБР, Базовый .desc = { ent-RandomHumanoidSpawnerERTLeader.desc } -ent-RandomHumanoidSpawnerERTMedicalEVA = ОБР медик +ent-RandomHumanoidSpawnerERTMedicalEVA = Полевой Врач ОБР .suffix = Роль ОБР, Броня EVA .desc = { ent-RandomHumanoidSpawnerERTMedical.desc } -ent-RandomHumanoidSpawnerCBURNUnit = Агент РХБЗЗ +ent-RandomHumanoidSpawnerCBURNUnit = Офицер РХБЗЗ .suffix = Роль ОБР .desc = { "" } ent-RandomHumanoidSpawnerCentcomOfficial = Представитель Центком diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl index e6a5ad0f33d..5c64d995334 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl @@ -104,23 +104,23 @@ ent-SyndiPDA = Кроваво-красный КПК # Corvax-HiddenDesc-End -ent-ERTLeaderPDA = КПК ОБР +ent-ERTLeaderPDA = КПК Лидера ОБР .desc = Красный значит мощный. .suffix = Лидер ent-ERTChaplainPDA = КПК Священника ОБР .suffix = Священник .desc = Красный значит мощный. Он благословен. -ent-ERTEngineerPDA = КПК Инженера ОБР - .suffix = Инженер +ent-ERTEngineerPDA = КПК Полевого Инженера ОБР + .suffix = Полевой Инженер .desc = Красный значит мощный. Он изрядно потрёпан. Имеет встроенный газоанализатор. ent-ERTJanitorPDA = КПК Уборщика ОБР .suffix = Уборщик .desc = Красный значит мощный. Чистый аж поскрипывает. -ent-ERTMedicPDA = КПК Врача ОБР - .suffix = Врач +ent-ERTMedicPDA = КПК Полевого Врача ОБР + .suffix = Полевой Врач .desc = Красный значит мощный. Он блестит и стерилен. Имеет встроенный анализатор здоровья. -ent-ERTSecurityPDA = КПК Офицера Безопасности ОБР - .suffix = Офицер Безопасности +ent-ERTSecurityPDA = КПК Полевого Офицера ОБР + .suffix = Полевой Офицер .desc = Красный значит мощный. На боку нацарапаны метки подсчёта. ent-CBURNPDA = КПК РХБЗЗ .desc = Пахнет гнилой плотью. 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 c4960ecce69..871e443ad90 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 @@ -74,21 +74,21 @@ ent-HoSIDCard = ID карта Главы Службы Безопасности .desc = { ent-IDCardStandard.desc } ent-BrigmedicIDCard = ID карта Полевого Врача .desc = { ent-IDCardStandard.desc } -ent-CentcomIDCard = ID карта Старшего Офицера +ent-CentcomIDCard = ID карта Офицера ЦК .desc = { ent-IDCardStandard.desc } ent-ERTLeaderIDCard = ID карта Лидера ОБР .desc = { ent-CentcomIDCard.desc } ent-ERTChaplainIDCard = ID карта Священника ОБР .desc = { ent-ERTLeaderIDCard.desc } -ent-ERTEngineerIDCard = ID карта Инженера ОБР +ent-ERTEngineerIDCard = ID карта Полевого Инженера ОБР .desc = { ent-ERTChaplainIDCard.desc } ent-ERTJanitorIDCard = ID карта Уборщика ОБР .desc = { ent-ERTChaplainIDCard.desc } -ent-ERTMedicIDCard = ID карта Врача ОБР +ent-ERTMedicIDCard = ID карта полевого Врача ОБР .desc = { ent-ERTChaplainIDCard.desc } -ent-ERTSecurityIDCard = ID карта Офицера ОБР +ent-ERTSecurityIDCard = ID карта Полевого Офицера ОБР .desc = { ent-ERTChaplainIDCard.desc } -ent-CentcomIDCardSyndie = ID карта Офицера Командования +ent-CentcomIDCardSyndie = ID карта Офицера ЦК .desc = { ent-IDCardStandard.desc } .suffix = Фальшивый ent-MusicianIDCard = ID карта Музыканта diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 3ddc69834c1..542c5c980fc 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -214,12 +214,14 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: WeaponDisabler + - id: WeaponEnergyGunPistol - id: MedicatedSuture - id: RegenerativeMesh - id: BoxZiptie - id: CrowbarRed - id: MagazineMagnum + - id: LPPERTUplinkShop # LPP + - id: DoubleEmergencyOxygenTank - type: entity categories: [ HideSpawnMenu ] @@ -229,12 +231,13 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: WeaponDisabler + - id: WeaponEnergyGunPistol - id: MedicatedSuture - id: RegenerativeMesh - id: BoxZiptie - id: CrowbarRed - - id: MagazinePistol + - id: MagazineUniversalMagnum + - id: DoubleEmergencyOxygenTank - type: entity categories: [ HideSpawnMenu ] @@ -244,12 +247,14 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: Hypospray - - id: MedkitAdvancedFilled + - id: LPPCombatHypospray # LPP + - id: LPPCombatDefibrillator # LPP + - id: MedkitCombatFilled - id: CrowbarRed - id: OmnizineChemistryBottle - id: EpinephrineChemistryBottle - id: EpinephrineChemistryBottle + - id: DoubleEmergencyOxygenTank - type: entity categories: [ HideSpawnMenu ] @@ -259,7 +264,6 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: trayScanner - id: RCD - id: RCDAmmo amount: 2 @@ -269,6 +273,9 @@ - id: SheetPlasteel - id: SheetSteel - id: SheetGlass + - id: DoubleEmergencyOxygenTank + - id: LPPC4Low + amount: 2 - type: entity categories: [ HideSpawnMenu ] diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index c44cd7dc042..82edec18845 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -22,7 +22,7 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: WeaponShotgunDoubleBarreled + - id: WeaponShotgunEnforcer - id: BoxShotgunIncendiary amount: 2 - id: GrenadeFlashBang diff --git a/Resources/Prototypes/Datasets/Names/military.yml b/Resources/Prototypes/Datasets/Names/military.yml index 4223c9a59be..68da19ffb70 100644 --- a/Resources/Prototypes/Datasets/Names/military.yml +++ b/Resources/Prototypes/Datasets/Names/military.yml @@ -19,45 +19,45 @@ - type: dataset id: NamesLastMilitary values: - - Agena - - Andromeda - - Antares - - Aquarius - - Beid - - Betelgeuse - - Canopus - - Capricorn - - Celaeno - - Centaur - - Chameleon - - Chau - - Cygnus - - Deneb - - Dragon - - Electra - - Fomalhaut - - Ginan - - Hercules - - Labr - - Leonis - - Matar - - Microscopium - - Nihal - - Ophiuchus - - Oculus - - Orion - - Perseus - - Phoenix - - Procyon - - Regulus - - Rigel - - Sargas - - Schedar - - Shaula - - Sirius - - Tabit - - Taurus - - Ukdah - - Vega - - Yildun - - Zosma + - Ажена + - Андромеда + - Антарес + - Водолей + - Бейд + - Бетельгейзе + - Канопус + - Козерог + - Целено + - Кентавр + - Хамелеон + - Чау + - Лебедь + - Денеб + - Дракон + - Электра + - Фомальгаут + - Гинан + - Геркулес + - Лабр + - Леонис + - Матар + - Микроскопиум + - Нихал + - Змееносец + - Окулус + - Орион + - Персей + - Феникс + - Процион + - Регулус + - Ригель + - Саргас + - Шедар + - Шаула + - Сириус + - Табит + - Телец + - Укдах + - Вега + - Йилдун + - Зосма diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index b3f4cbe4063..94be244ac87 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -217,6 +217,8 @@ name: ERT leader backpack description: A spacious backpack with lots of pockets, worn by the Commander of an Emergency Response Team. components: + - type: ExplosionResistance + damageCoefficient: 0.1 - type: Sprite sprite: Clothing/Back/Backpacks/ertleader.rsi - type: Storage diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index de2589af536..2b52bc3a211 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -901,6 +901,17 @@ clothingPrototype: ClothingHeadHelmetHardsuitERTEngineer - type: StaminaDamageResistance coefficient: 0.5 # 50% + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.6 + Heat: 0.1 + Cold: 0.1 + Shock: 0.1 + Radiation: 0.0 + Caustic: 0.1 - type: BiocodedClothing #LPP #ERT Medic Hardsuit diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 5afd45d798b..d8233da46c5 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -1217,15 +1217,20 @@ components: - type: Pda id: ERTMedicIDCard + - type: HealthAnalyzer + scanDelay: 1 + scanningEndSound: + path: "/Audio/Items/Medical/healthscanner.ogg" - type: CartridgeLoader uiKey: enum.PdaUiKey.Key preinstalled: - CrewManifestCartridge - NotekeeperCartridge - NewsReaderCartridge + - SecWatchCartridge # DeltaV: SecWatch replaces WantedList + - LogProbeCartridge - MedTekCartridge - - CrimeAssistCartridge - - SecWatchCartridge + - NanoChatCartridge # DeltaV - type: entity parent: ERTLeaderPDA diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml index 3dbdc22e8c3..61f1cd9b2ec 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml @@ -26,8 +26,10 @@ outerClothing: ClothingOuterArmorBasicSlim id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolN1984NonLethal + belt: ClothingBeltSecurityWebbingFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + pocket1: WeaponPistolN1984 pocket2: FlashlightSeclite - type: startingGear @@ -43,8 +45,10 @@ suitstorage: AirTankFilled id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolN1984NonLethal + belt: ClothingBeltSecurityWebbingFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + pocket1: WeaponPistolN1984 pocket2: FlashlightSeclite - type: startingGear @@ -60,7 +64,9 @@ suitstorage: WeaponRifleLecter id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltSecurityFilled + belt: ClothingBeltSecurityWebbingFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer pocket1: MagazineRifle pocket2: MagazineRifle inhand: @@ -97,9 +103,11 @@ neck: ClothingNeckStoleChaplain gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterArmorBasicSlim - id: ERTEngineerPDA + id: ERTChaplainPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltStorageWaistbag + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer pocket1: Flare pocket2: DrinkWaterBottleFull @@ -118,6 +126,8 @@ id: ERTChaplainPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltStorageWaistbag + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer pocket1: Flare pocket2: DrinkWaterBottleFull @@ -144,14 +154,16 @@ back: ClothingBackpackERTEngineerFilled shoes: ClothingShoesBootsWork head: ClothingHeadHelmetERTEngineer - eyes: ClothingEyesGlassesMeson + eyes: LPPClothingEyesHudSecEng # LPP gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterArmorBasicSlim id: ERTEngineerPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltChiefEngineerFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer pocket1: Flare - pocket2: GasAnalyzer + pocket2: RemoteSignallerAdvanced - type: startingGear id: ERTEngineerGearEVA @@ -160,15 +172,17 @@ back: ClothingBackpackERTEngineerFilled shoes: ClothingShoesBootsMagAdv mask: ClothingMaskGasERT - eyes: ClothingEyesGlassesMeson + eyes: LPPClothingEyesHudSecEng # LPP gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTEngineer suitstorage: AirTankFilled id: ERTEngineerPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltChiefEngineerFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer pocket1: Flare - pocket2: GasAnalyzer + pocket2: RemoteSignallerAdvanced # LPP # Security - type: job @@ -198,8 +212,10 @@ outerClothing: ClothingOuterArmorBasicSlim id: ERTSecurityPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolMk58Nonlethal + belt: ClothingBeltSecurityWebbingFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + pocket1: WeaponPistolUniversal pocket2: FlashlightSeclite - type: startingGear @@ -215,8 +231,10 @@ suitstorage: AirTankFilled id: ERTSecurityPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolMk58Nonlethal + belt: ClothingBeltSecurityWebbingFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + pocket1: WeaponPistolUniversal pocket2: FlashlightSeclite - type: startingGear @@ -232,7 +250,9 @@ suitstorage: WeaponRifleLecter id: ERTSecurityPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltSecurityFilled + belt: ClothingBeltSecurityWebbingFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer pocket1: MagazineRifle pocket2: MagazineRifle inhand: @@ -267,29 +287,35 @@ back: ClothingBackpackERTMedicalFilled shoes: ClothingShoesBootsCombatFilled head: ClothingHeadHelmetERTMedic - eyes: ClothingEyesHudMedical - gloves: ClothingHandsGlovesNitrile + eyes: ClothingEyesHudMedSec + gloves: LPPClothingHandsGlovesCombatNitrile # LPP outerClothing: ClothingOuterArmorBasicSlim id: ERTMedicPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltMedicalFilled + belt: ClothingBeltCorpsmanWebbingFilled # LPP + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer pocket1: Flare + pocket2: HandheldCrewMonitor - type: startingGear id: ERTMedicalGearEVA equipment: jumpsuit: ClothingUniformJumpsuitERTMedic back: ClothingBackpackERTMedicalFilled - shoes: ClothingShoesBootsMag + shoes: LPPClothingShoesBootsMagParamed # LPP mask: ClothingMaskGasERT - eyes: ClothingEyesHudMedical - gloves: ClothingHandsGlovesNitrile + eyes: ClothingEyesHudMedSec + gloves: LPPClothingHandsGlovesCombatNitrile # LPP outerClothing: ClothingOuterHardsuitERTMedical suitstorage: AirTankFilled id: ERTMedicPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltMedicalFilled + belt: ClothingBeltCorpsmanWebbingFilled # LPP + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer pocket1: Flare + pocket2: HandheldCrewMonitor # Janitor - type: job @@ -319,6 +345,8 @@ id: ERTJanitorPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltJanitorFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer pocket1: Flare - type: startingGear @@ -334,4 +362,6 @@ id: ERTJanitorPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltJanitorFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer pocket1: Flare diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index 3fab5630164..4262cc1ca63 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -57,7 +57,7 @@ jumpsuit: ClothingUniformJumpsuitDeathSquad back: ClothingBackpackDeathSquadFilled mask: ClothingMaskGasDeathSquad - eyes: ClothingEyesHudSecurity + eyes: ClothingEyesGlassesSecurity ears: ClothingHeadsetAltCentCom gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitDeathsquad @@ -67,6 +67,8 @@ pocket1: EnergySword pocket2: EnergyShield belt: ClothingBeltMilitaryWebbingMedFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer innerClothingSkirt: ClothingUniformJumpskirtColorBlack #Syndicate Operative Outfit - Full Kit @@ -185,12 +187,14 @@ ears: ClothingHeadsetAltCentCom gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitCBURN - shoes: ClothingShoesBootsCombatFilled + shoes: LPPClothingShoesBootsMagParamed id: CBURNPDA pocket1: RadioHandheld - pocket2: WeaponLaserGun + pocket2: WeaponPulsePistol suitstorage: OxygenTankFilled belt: ClothingBeltBandolier + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer innerClothingSkirt: ClothingUniformJumpsuitColorBrown satchel: ClothingBackpackDuffelCBURNFilled duffelbag: ClothingBackpackDuffelCBURNFilled diff --git a/Resources/Prototypes/_LostParadise/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_LostParadise/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 8ff02d2cd2b..4a2754ae874 100644 --- a/Resources/Prototypes/_LostParadise/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/_LostParadise/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -13,3 +13,96 @@ moles: - 1.025689525 # oxygen - 1.025689525 # nitrogen + +# Delta Squad + +- type: entity + categories: [ HideSpawnMenu ] + parent: LPPClothingBackpackIIC + id: LPPClothingBackpackDeltaLeaderFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalEngineering + - id: WeaponEnergyGunPistol + - id: MedicatedSuture + - id: RegenerativeMesh + - id: BoxZiptie + - id: CrowbarRed + - id: MagazineMagnum + - id: LPPDeltaUplinkShop + - id: DoubleEmergencyOxygenTankFilled + +- type: entity + categories: [ HideSpawnMenu ] + parent: LPPClothingBackpackIIC + id: LPPClothingBackpackDeltaEngineerFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalEngineering + - id: WeaponEnergyGunPistol + - id: RCDRecharging + - id: RCDAmmo + amount: 2 + - id: CableMVStack + - id: CableHVStack + - id: CableApcStack + - id: SheetPlasteel + - id: SheetSteel + - id: SheetGlass + - id: DoubleEmergencyOxygenTankFilled + - id: LPPC4Low + amount: 2 + +- type: entity + categories: [ HideSpawnMenu ] + parent: LPPClothingBackpackIIC + id: LPPClothingBackpackDeltaMedicFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalMedical + - id: WeaponEnergyGunPistol + - id: LPPCombatHypospray + - id: LPPCombatDefibrillator + - id: MedkitCombatFilled + - id: CrowbarRed + - id: OmnizineChemistryBottle + - id: EpinephrineChemistryBottle + amount: 2 + - id: DoubleEmergencyOxygenTankFilled + +- type: entity + categories: [ HideSpawnMenu ] + parent: LPPClothingBackpackIIC + id: LPPClothingBackpackDeltaOperatorFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalEngineering + - id: WeaponEnergyGunPistol + - id: MedicatedSuture + - id: RegenerativeMesh + - id: BoxZiptie + - id: CrowbarRed + - id: MagazineUniversalMagnum + - id: DoubleEmergencyOxygenTankFilled + +- type: entity + categories: [ HideSpawnMenu ] + parent: LPPClothingBackpackIIC + id: LPPClothingBackpackDeltaPyrotechFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalEngineering + - id: MedicatedSuture + - id: RegenerativeMesh + - id: CrowbarRed + - id: AirTankFilled + - id: Multitool + - id: C4 + amount: 4 + - id: MagazineShotgunIncendiary + amount: 2 diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml index d038b90a85a..484acc7cca0 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml @@ -67,6 +67,8 @@ - id: Screwdriver - id: WelderIndustrial - id: Multitool + - id: SprayPainter + - id: trayScanner - type: ExplosionResistance damageCoefficient: 0.5 diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml index 7d4e1b3e66b..c8275d45a09 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml @@ -41,6 +41,9 @@ - type: Armor modifiers: coefficients: + Blunt: 0.80 + Slash: 0.80 + Piercing: 0.90 Heat: 0.80 - type: entity @@ -76,6 +79,9 @@ - type: Armor modifiers: coefficients: + Blunt: 0.80 + Slash: 0.80 + Piercing: 0.90 Heat: 0.80 - type: entity diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml index 786c95c054c..9605e702694 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml @@ -198,18 +198,19 @@ - type: Clothing sprite: Clothing/OuterClothing/Hardsuits/SecEng.rsi - type: PressureProtection - highPressureMultiplier: 0.5 + highPressureMultiplier: 0.02 lowPressureMultiplier: 1000 - type: ExplosionResistance - damageCoefficient: 0.4 + damageCoefficient: 0.3 - type: Armor modifiers: coefficients: - Blunt: 0.65 - Slash: 0.65 - Piercing: 0.70 + Blunt: 0.55 + Slash: 0.55 + Piercing: 0.6 Caustic: 0.8 - Heat: 0.35 + Heat: 0.3 + Radiation: 0.25 - type: ClothingSpeedModifier walkModifier: 0.65 sprintModifier: 0.65 @@ -378,7 +379,7 @@ - type: TemperatureProtection coefficient: 0.5 - type: ExplosionResistance - damageCoefficient: 0.2 + damageCoefficient: 0.1 - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHardsuitIICPyrotech - type: BiocodedClothing @@ -482,7 +483,7 @@ Slash: 0.40 Piercing: 0.35 Heat: 0.1 - Radiation: 0.1 + Radiation: 0.0 Caustic: 0.1 Shock: 0.1 Cold: 0.1 diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Player/humanoid.yml new file mode 100644 index 00000000000..7f07019e2ce --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Entities/Mobs/Player/humanoid.yml @@ -0,0 +1,170 @@ +# Delta Squad + +# Delta Commander + +- type: entity + id: LPPRandomHumanoidSpawnerDeltaCommander + name: Delta Commander + suffix: ERTRole, Delta Squad + components: + - type: Sprite + sprite: _LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi + state: icon + - type: RandomMetadata + nameSegments: + - NamesFirstMilitaryLeader + - NamesLastMilitary + - type: RandomHumanoidSpawner + settings: LPPDeltaCommander + +- type: randomHumanoidSettings + id: LPPDeltaCommander + randomizeName: false + components: + - type: MindShield + - type: GhostRole + name: ghost-role-information-delta-commander-name + description: ghost-role-information-delta-commander-description + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ LPPDeltaCommanderGearEVA ] + - type: RandomMetadata + nameSegments: + - NamesFirstMilitaryLeader + - NamesLastMilitary + +# Delta Engineer + +- type: entity + id: LPPRandomHumanoidSpawnerDeltaEngineer + parent: LPPRandomHumanoidSpawnerDeltaCommander + name: Delta Engineer + suffix: ERTRole, Delta Squad + components: + - type: Sprite + sprite: _LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi + state: icon + - type: RandomMetadata + nameSegments: + - NamesFirstMilitary + - NamesLastMilitary + - type: RandomHumanoidSpawner + settings: LPPDeltaEngineer + +- type: randomHumanoidSettings + id: LPPDeltaEngineer + randomizeName: false + components: + - type: MindShield + - type: GhostRole + name: ghost-role-information-delta-engineer-name + description: ghost-role-information-delta-engineer-description + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ LPPDeltaEngineerGearEVA ] + - type: RandomMetadata + nameSegments: + - NamesFirstMilitaryLeader + - NamesLastMilitary + +# Delta Medic + +- type: entity + id: LPPRandomHumanoidSpawnerDeltaMedic + parent: LPPRandomHumanoidSpawnerDeltaCommander + name: Delta Medic + suffix: ERTRole, Delta Squad + components: + - type: Sprite + sprite: _LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi + state: icon + - type: RandomMetadata + nameSegments: + - NamesFirstMilitary + - NamesLastMilitary + - type: RandomHumanoidSpawner + settings: LPPDeltaMedic + +- type: randomHumanoidSettings + id: LPPDeltaMedic + randomizeName: false + components: + - type: MindShield + - type: GhostRole + name: ghost-role-information-delta-medic-name + description: ghost-role-information-delta-medic-description + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ LPPDeltaMedicGearEVA ] + - type: RandomMetadata + nameSegments: + - NamesFirstMilitaryLeader + - NamesLastMilitary + +# Delta Operator + +- type: entity + id: LPPRandomHumanoidSpawnerDeltaOperator + parent: LPPRandomHumanoidSpawnerDeltaCommander + name: Delta Operator + suffix: ERTRole, Delta Squad + components: + - type: Sprite + sprite: _LostParadise/Clothing/Head/Hardsuits/iic-head.rsi + state: icon + - type: RandomMetadata + nameSegments: + - NamesFirstMilitary + - NamesLastMilitary + - type: RandomHumanoidSpawner + settings: LPPDeltaOperator + +- type: randomHumanoidSettings + id: LPPDeltaOperator + randomizeName: false + components: + - type: MindShield + - type: GhostRole + name: ghost-role-information-delta-operator-name + description: ghost-role-information-delta-operator-description + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ LPPDeltaOperatorGearEVA ] + - type: RandomMetadata + nameSegments: + - NamesFirstMilitaryLeader + - NamesLastMilitary + +# Delta Pyrotech + +- type: entity + id: LPPRandomHumanoidSpawnerDeltaPyrotech + parent: LPPRandomHumanoidSpawnerDeltaCommander + name: Delta Pyrotech + suffix: ERTRole, Delta Squad + components: + - type: Sprite + sprite: _LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi + state: icon + - type: RandomMetadata + nameSegments: + - NamesFirstMilitary + - NamesLastMilitary + - type: RandomHumanoidSpawner + settings: LPPDeltaPyrotech + +- type: randomHumanoidSettings + id: LPPDeltaPyrotech + randomizeName: false + components: + - type: MindShield + - type: GhostRole + name: ghost-role-information-delta-pyrotech-name + description: ghost-role-information-delta-pyrotech-description + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ LPPDeltaPyrotechGearEVA ] + - type: RandomMetadata + nameSegments: + - NamesFirstMilitaryLeader + - NamesLastMilitary diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml index b4cf6e44372..b490fee3afb 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml @@ -35,7 +35,9 @@ - type: Icon state: pda-ert - type: HealthAnalyzer - scanDelay: 1.2 + scanDelay: 1 + scanningEndSound: + path: "/Audio/Items/Medical/healthscanner.ogg" # - type: entity # parent: BasePDA @@ -86,3 +88,87 @@ - CrimeAssistCartridge - SecWatchCartridge - NanoChatCartridge + + +# Delta Squad + +- type: entity + parent: BasePDA + id: LPPDeltaCommanderPDA + name: Delta Commander PDA + suffix: Commander + description: Red for firepower. + components: + - type: Pda + id: LPPDeltaCommanderIDCard + state: pda-ert + - type: PdaBorderColor + borderColor: "#A32D26" + accentHColor: "#447987" + accentVColor: "#447987" + - type: Icon + state: pda-ert + - type: CartridgeLoader + uiKey: enum.PdaUiKey.Key + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - SecWatchCartridge # DeltaV: SecWatch replaces WantedList + - LogProbeCartridge + - NanoChatCartridge # DeltaV + +- type: entity + parent: LPPDeltaCommanderPDA + id: LPPDeltaEngineerPDA + name: Delta Engineer PDA + suffix: Engineer + description: Red for firepower, it's well-worn. + components: + - type: Pda + id: LPPDeltaEngineerIDCard + - type: GasAnalyzer + +- type: entity + parent: LPPDeltaCommanderPDA + id: LPPDeltaMedicPDA + name: Delta Medic PDA + suffix: Medic + description: Red for firepower, it's shiny and sterile. Has a built-in rapid health analyzer. + components: + - type: Pda + id: LPPDeltaMedicIDCard + - type: HealthAnalyzer + scanDelay: 1 + scanningEndSound: + path: "/Audio/Items/Medical/healthscanner.ogg" + - type: CartridgeLoader + uiKey: enum.PdaUiKey.Key + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - SecWatchCartridge # DeltaV: SecWatch replaces WantedList + - LogProbeCartridge + - MedTekCartridge + - NanoChatCartridge # DeltaV + +- type: entity + parent: LPPDeltaCommanderPDA + id: LPPDeltaOperatorPDA + name: Delta Operator PDA + suffix: Operator + description: Red for firepower, it has tally marks etched on the side. + components: + - type: Pda + id: LPPDeltaOperatorIDCard + +- type: entity + parent: LPPDeltaCommanderPDA + id: LPPDeltaPyrotechPDA + name: Delta Pyrotech PDA + suffix: Pyrotech + description: Red for firepower. He looks burnt. + components: + - type: Pda + id: LPPDeltaPyrotechIDCard diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml index f98a70a5cdb..dc1f628b7ed 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml @@ -74,3 +74,87 @@ - state: idseniorofficer - type: PresetIdCard job: SecPilot + +# Delta Squad + +- type: entity + parent: CentcomIDCard + id: LPPDeltaCommanderIDCard + name: Delta Commander ID card + components: + - type: Sprite + layers: + - state: centcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#1B67A5" + - state: captain + - type: PresetIdCard + job: LPPDeltaCommander + - type: Item + heldPrefix: gold + +- type: entity + parent: LPPDeltaCommanderIDCard + id: LPPDeltaEngineerIDCard + name: Delta Engineer ID card + components: + - type: Sprite + layers: + - state: centcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#F39F27" + - state: stationengineer + - type: PresetIdCard + job: LPPDeltaEngineer + +- type: entity + parent: LPPDeltaCommanderIDCard + id: LPPDeltaMedicIDCard + name: Delta Medic ID card + components: + - type: Sprite + layers: + - state: centcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#5B97BC" + - state: medicaldoctor + - type: PresetIdCard + job: LPPDeltaMedic + +- type: entity + parent: LPPDeltaCommanderIDCard + id: LPPDeltaOperatorIDCard + name: Delta Operator ID card + components: + - type: Sprite + layers: + - state: centcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#CB0000" + - state: securityofficer + - type: PresetIdCard + job: LPPDeltaOperator + +- type: entity + parent: LPPDeltaCommanderIDCard + id: LPPDeltaPyrotechIDCard + name: Delta Pyrotech ID card + components: + - type: Sprite + layers: + - state: centcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#CB0000" + - state: senior + - type: PresetIdCard + job: LPPDeltaPyrotech diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/CrateHunter.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/CrateHunter.yml index b276f5ea570..82469d02647 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/CrateHunter.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/CrateHunter.yml @@ -39,7 +39,7 @@ - id: LPPClothingShoesBootsMagHunter - id: JetpackVoidFilled - id: ClothingHandsGlovesCombat - - id: DoubleEmergencyOxygenTank + - id: DoubleEmergencyOxygenTankFilled - id: WeaponLaserSvalinn - id: ClothingBeltSalvageWebbing - id: MedkitFilled diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Walls/asteroid.yml index 26273dc8e67..850e13f62e2 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Walls/asteroid.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Structures/Walls/asteroid.yml @@ -18,7 +18,7 @@ state: rock_asteroid_north - map: [ "enum.EdgeLayer.West" ] state: rock_asteroid_west - - state: rock_ore_diamond + - state: rock_diamond - type: entity id: LPPWallRockOreDiamond @@ -40,7 +40,7 @@ state: rock_north - map: [ "enum.EdgeLayer.West" ] state: rock_west - - state: rock_ore_diamond + - state: rock_diamond - type: entity id: LPPWallRockBasaltOreDiamond @@ -62,7 +62,7 @@ state: rock_wall_north - map: [ "enum.EdgeLayer.West" ] state: rock_wall_west - - state: rock_ore_diamond + - state: rock_diamond - type: entity id: LPPWallRockSnowOreDiamond @@ -84,7 +84,7 @@ state: rock_snow_north - map: [ "enum.EdgeLayer.West" ] state: rock_snow_west - - state: rock_ore_diamond + - state: rock_diamond - type: entity id: LPPWallRockSandOreDiamond @@ -106,7 +106,7 @@ state: rock_sand_north - map: [ "enum.EdgeLayer.West" ] state: rock_sand_west - - state: rock_ore_diamond + - state: rock_diamond - type: entity id: LPPWallRockChromiteOreDiamond @@ -128,7 +128,7 @@ state: rock_chromite_north - map: [ "enum.EdgeLayer.West" ] state: rock_chromite_west - - state: rock_ore_diamond + - state: rock_diamond - type: entity id: LPPWallRockAndesiteOreDiamond @@ -150,4 +150,4 @@ state: rock_andesite_north - map: [ "enum.EdgeLayer.West" ] state: rock_andesite_west - - state: rock_ore_diamond + - state: rock_diamond diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/deltateam.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/deltateam.yml new file mode 100644 index 00000000000..7bf915bdd9a --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/deltateam.yml @@ -0,0 +1,180 @@ +# Commander +- type: job + id: LPPDeltaCommander + name: job-name-delta-commander + description: job-description-delta-commander + playTimeTracker: LPPJobDeltaCommander + setPreference: false + startingGear: LPPDeltaCommanderGearEVA + icon: "JobIconNanotrasen" + supervisors: job-supervisors-centcom + canBeAntag: false + accessGroups: + - AllAccess + access: + - CentralCommand + +- type: startingGear + id: LPPDeltaCommanderGearEVA + equipment: + jumpsuit: ClothingUniformJumpsuitERTLeader + back: LPPClothingBackpackDeltaLeaderFilled + shoes: ClothingShoesBootsMagAdv + mask: LPPClothingMaskGasOfficerIIC + eyes: ClothingEyesGlassesSecurity + gloves: ClothingHandsGlovesCombat + outerClothing: LPPClothingOuterHardsuitIICCommand + suitstorage: AirTankFilled + id: LPPDeltaCommanderPDA + ears: ClothingHeadsetAltCentCom + belt: ClothingBeltSecurityWebbingFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + pocket1: WeaponPistolN1984 + pocket2: FlashlightSeclite + +# Engineer +- type: job + id: LPPDeltaEngineer + name: job-name-delta-engineer + description: job-description-delta-engineer + playTimeTracker: LPPJobDeltaEngineer + setPreference: false + startingGear: LPPDeltaEngineerGearEVA + icon: "JobIconNanotrasen" + supervisors: job-supervisors-centcom + canBeAntag: false + accessGroups: + - AllAccess + access: + - CentralCommand + +- type: startingGear + id: LPPDeltaEngineerGearEVA + equipment: + jumpsuit: ClothingUniformJumpsuitERTEngineer + back: LPPClothingBackpackDeltaEngineerFilled + shoes: ClothingShoesBootsMagAdv + mask: LPPClothingMaskGasOfficerIIC + eyes: LPPClothingEyesHudSecEng + gloves: ClothingHandsGlovesCombat + outerClothing: LPPClothingOuterHardsuitIICEngineer + suitstorage: AirTankFilled + id: LPPDeltaEngineerPDA + ears: ClothingHeadsetAltCentCom + belt: ClothingBeltChiefEngineerFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + pocket1: Flare + pocket2: RemoteSignallerAdvanced + +# Medic +- type: job + id: LPPDeltaMedic + name: job-name-delta-medic + description: job-description-delta-medic + playTimeTracker: LPPJobDeltaMedic + setPreference: false + startingGear: LPPDeltaMedicGearEVA + icon: "JobIconNanotrasen" + supervisors: job-supervisors-centcom + canBeAntag: false + accessGroups: + - AllAccess + access: + - CentralCommand + special: + - !type:AddComponentSpecial + components: + - type: CPRTraining + - type: SurgerySpeedModifier + SpeedModifier: 2.0 + +- type: startingGear + id: LPPDeltaMedicGearEVA + equipment: + jumpsuit: ClothingUniformJumpsuitERTMedic + back: LPPClothingBackpackDeltaMedicFilled + shoes: LPPClothingShoesBootsMagParamed + mask: LPPClothingMaskGasOfficerIIC + eyes: ClothingEyesHudMedSec + gloves: LPPClothingHandsGlovesCombatNitrile + outerClothing: LPPClothingOuterHardsuitIICMedic + suitstorage: AirTankFilled + id: LPPDeltaMedicPDA + ears: ClothingHeadsetAltCentCom + belt: ClothingBeltCorpsmanWebbingFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + pocket1: Flare + pocket2: HandheldCrewMonitor + +# Operator +- type: job + id: LPPDeltaOperator + name: job-name-delta-operator + description: job-description-delta-operator + playTimeTracker: LPPJobDeltaOperator + setPreference: false + startingGear: LPPDeltaOperatorGearEVA + icon: "JobIconNanotrasen" + supervisors: job-supervisors-centcom + canBeAntag: false + accessGroups: + - AllAccess + access: + - CentralCommand + +- type: startingGear + id: LPPDeltaOperatorGearEVA + equipment: + jumpsuit: ClothingUniformJumpsuitERTSecurity + back: LPPClothingBackpackDeltaOperatorFilled + shoes: ClothingShoesBootsMag + mask: LPPClothingMaskGasOfficerIIC + eyes: ClothingEyesGlassesSecurity + gloves: ClothingHandsGlovesCombat + outerClothing: LPPClothingOuterHardsuitIIC + suitstorage: AirTankFilled + id: LPPDeltaOperatorPDA + ears: ClothingHeadsetAltCentCom + belt: ClothingBeltSecurityWebbingFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + pocket1: WeaponPistolUniversal + pocket2: FlashlightSeclite + +# Pyrotech +- type: job + id: LPPDeltaPyrotech + name: job-name-delta-pyrotech + description: job-description-delta-pyrotech + playTimeTracker: LPPJobDeltaPyrotech + setPreference: false + startingGear: LPPDeltaPyrotechGearEVA + icon: "JobIconNanotrasen" + supervisors: job-supervisors-centcom + canBeAntag: false + accessGroups: + - AllAccess + access: + - CentralCommand + +- type: startingGear + id: LPPDeltaPyrotechGearEVA + equipment: + jumpsuit: ClothingUniformJumpsuitERTSecurity + back: LPPClothingBackpackDeltaPyrotechFilled + shoes: ClothingShoesBootsMag + mask: LPPClothingMaskGasOfficerIIC + eyes: ClothingEyesGlassesSecurity + gloves: ClothingHandsGlovesCombat + outerClothing: LPPClothingOuterHardsuitIICPyrotech + suitstorage: WeaponShotgunBulldog + id: LPPDeltaPyrotechPDA + ears: ClothingHeadsetAltCentCom + belt: ClothingBeltSecurityWebbingFilled + socks: LPPClothingUnderSocksNorm + underwear: LPPBoxer + pocket1: RemoteSignallerAdvanced + pocket2: DoubleEmergencyOxygenTankFilled diff --git a/Resources/Prototypes/_LostParadise/Roles/play_time_trackers.yml b/Resources/Prototypes/_LostParadise/Roles/play_time_trackers.yml index f34175385e4..2244de5e137 100644 --- a/Resources/Prototypes/_LostParadise/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_LostParadise/Roles/play_time_trackers.yml @@ -14,4 +14,19 @@ id: JobPilot - type: playTimeTracker - id: LPPJobSecurityEnginer \ No newline at end of file + id: LPPJobSecurityEnginer + +- type: playTimeTracker + id: LPPJobDeltaCommander + +- type: playTimeTracker + id: LPPJobDeltaEngineer + +- type: playTimeTracker + id: LPPJobDeltaMedic + +- type: playTimeTracker + id: LPPJobDeltaOperator + +- type: playTimeTracker + id: LPPJobDeltaPyrotech diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json index 6e0435005cd..13b143d02f0 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json @@ -1,53 +1,53 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by Emisse for SS14. Vox states by Flareguy for SS14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "icon-flash" - }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "equipped-HELMET-tajaran", - "directions": 4 - }, - { - "name": "equipped-HELMET-shark", - "directions": 4 - }, - { - "name": "equipped-HELMET-reptilian", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "off-equipped-HELMET-vox", - "directions": 4 - }, - { - "name": "on-equipped-HELMET-vox", - "directions": 4 - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by Emisse for SS14. Vox states by Flareguy for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vox", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/meta.json b/Resources/Textures/Clothing/Mask/medical.rsi/meta.json index 0a84775e6b8..b6f0acda5b9 100644 --- a/Resources/Textures/Clothing/Mask/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/medical.rsi/meta.json @@ -31,11 +31,11 @@ "directions": 4 }, { - "name": "up-equipped-MASK-vox", + "name": "equipped-MASK-vox", "directions": 4 }, { - "name": "equipped-MASK-vox", + "name": "up-equipped-MASK-vox", "directions": 4 }, { diff --git a/Resources/Textures/Objects/Materials/ore.rsi/adamantine.png b/Resources/Textures/Objects/Materials/ore.rsi/adamantine.png deleted file mode 100644 index 61cb2fb35bb..00000000000 Binary files a/Resources/Textures/Objects/Materials/ore.rsi/adamantine.png and /dev/null differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/ammonia.png b/Resources/Textures/Objects/Materials/ore.rsi/ammonia.png deleted file mode 100644 index 9c795bf9216..00000000000 Binary files a/Resources/Textures/Objects/Materials/ore.rsi/ammonia.png and /dev/null differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/copper.png b/Resources/Textures/Objects/Materials/ore.rsi/copper.png deleted file mode 100644 index 43d4afdb1c2..00000000000 Binary files a/Resources/Textures/Objects/Materials/ore.rsi/copper.png and /dev/null differ diff --git a/Resources/Textures/Objects/Materials/ore.rsi/titanium.png b/Resources/Textures/Objects/Materials/ore.rsi/titanium.png deleted file mode 100644 index beb1908e6a2..00000000000 Binary files a/Resources/Textures/Objects/Materials/ore.rsi/titanium.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_lawyer.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_lawyer.png deleted file mode 100644 index 4f86552d3d9..00000000000 Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_lawyer.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/full.png b/Resources/Textures/Structures/Walls/rock.rsi/full.png deleted file mode 100644 index 26034ae376b..00000000000 Binary files a/Resources/Textures/Structures/Walls/rock.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/full_two.png b/Resources/Textures/Structures/Walls/rock.rsi/full_two.png deleted file mode 100644 index 0ecec3d6efc..00000000000 Binary files a/Resources/Textures/Structures/Walls/rock.rsi/full_two.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/meta.json b/Resources/Textures/Structures/Walls/rock.rsi/meta.json index 0390807b73b..a37805dfb6f 100644 --- a/Resources/Textures/Structures/Walls/rock.rsi/meta.json +++ b/Resources/Textures/Structures/Walls/rock.rsi/meta.json @@ -122,25 +122,6 @@ ] ] }, - { - "name": "rock_ore_diamond", - "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": "rock_gold" }, diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_0.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_0.png deleted file mode 100644 index ba1045c22bc..00000000000 Binary files a/Resources/Textures/Structures/Walls/rock.rsi/rock_0.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_0_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_0_two.png deleted file mode 100644 index 2a64ecdddfd..00000000000 Binary files a/Resources/Textures/Structures/Walls/rock.rsi/rock_0_two.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_1.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_1.png deleted file mode 100644 index 2a2baa735d8..00000000000 Binary files a/Resources/Textures/Structures/Walls/rock.rsi/rock_1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_1_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_1_two.png deleted file mode 100644 index 694dd628fbd..00000000000 Binary files a/Resources/Textures/Structures/Walls/rock.rsi/rock_1_two.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_2.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_2.png deleted file mode 100644 index ba1045c22bc..00000000000 Binary files a/Resources/Textures/Structures/Walls/rock.rsi/rock_2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_2_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_2_two.png deleted file mode 100644 index 2a64ecdddfd..00000000000 Binary files a/Resources/Textures/Structures/Walls/rock.rsi/rock_2_two.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_3.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_3.png deleted file mode 100644 index 2a2baa735d8..00000000000 Binary files a/Resources/Textures/Structures/Walls/rock.rsi/rock_3.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_3_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_3_two.png deleted file mode 100644 index 694dd628fbd..00000000000 Binary files a/Resources/Textures/Structures/Walls/rock.rsi/rock_3_two.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_4.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_4.png deleted file mode 100644 index 1d5d4320fad..00000000000 Binary files a/Resources/Textures/Structures/Walls/rock.rsi/rock_4.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_4_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_4_two.png deleted file mode 100644 index b5a6e30f7be..00000000000 Binary files a/Resources/Textures/Structures/Walls/rock.rsi/rock_4_two.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_5.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_5.png deleted file mode 100644 index 6524c4facfa..00000000000 Binary files a/Resources/Textures/Structures/Walls/rock.rsi/rock_5.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_5_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_5_two.png deleted file mode 100644 index e7ebe599159..00000000000 Binary files a/Resources/Textures/Structures/Walls/rock.rsi/rock_5_two.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_6.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_6.png deleted file mode 100644 index 1d5d4320fad..00000000000 Binary files a/Resources/Textures/Structures/Walls/rock.rsi/rock_6.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_6_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_6_two.png deleted file mode 100644 index b5a6e30f7be..00000000000 Binary files a/Resources/Textures/Structures/Walls/rock.rsi/rock_6_two.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_7.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_7.png deleted file mode 100644 index 753c8293f28..00000000000 Binary files a/Resources/Textures/Structures/Walls/rock.rsi/rock_7.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_7_two.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_7_two.png deleted file mode 100644 index 8456763d948..00000000000 Binary files a/Resources/Textures/Structures/Walls/rock.rsi/rock_7_two.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_ore_diamond.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_ore_diamond.png deleted file mode 100644 index 49c9097057d..00000000000 Binary files a/Resources/Textures/Structures/Walls/rock.rsi/rock_ore_diamond.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-reptilian.png index 59cbfeb2f16..311df71a59e 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-reptilian.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-shark.png index f2255efb749..ff4bf542c45 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-shark.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-tajaran.png index 3fa12054694..7f6c2392621 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-tajaran.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-unshaded-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-unshaded-reptilian.png index 6c9d6cd9ac0..90d2da51f90 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-unshaded-reptilian.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-unshaded-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-unshaded-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-unshaded-shark.png index 1695647be6c..bff5860797e 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-unshaded-shark.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-unshaded-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-unshaded-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-unshaded-tajaran.png index 1695647be6c..6cfdb131da4 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-unshaded-tajaran.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-unshaded-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-unshaded-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-unshaded-vulpkanin.png index 1695647be6c..6cfdb131da4 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-unshaded-vulpkanin.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-unshaded-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-unshaded.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-unshaded.png index 1695647be6c..c78bc7f8bdb 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-unshaded.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-unshaded.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-vulpkanin.png index 8e569f0afaa..6987658d0ae 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-vulpkanin.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head.png index ff9bedff316..20068b3b1da 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/equipped-head.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/icon-flash.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/icon-flash.png index a7448b7412a..d8cb9b80789 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/icon-flash.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/icon-flash.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/icon-unshaded.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/icon-unshaded.png index 7014b5dd017..745f2b2d41a 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/icon-unshaded.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/icon-unshaded.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/icon.png index 563b972f76b..0ecfe38c02c 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/icon.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/meta.json index b813b060c82..8afd9265e5c 100644 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-command.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "By Kyburka&Insulgon", + "copyright": "@timxx7019", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-reptilian.png index 59cbfeb2f16..e165eaaf343 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-reptilian.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-shark.png index f2255efb749..7573557594c 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-shark.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-tajaran.png index 3fa12054694..b4386308dc5 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-tajaran.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-unshaded-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-unshaded-reptilian.png index 6c9d6cd9ac0..90d2da51f90 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-unshaded-reptilian.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-unshaded-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-unshaded-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-unshaded-shark.png index 1695647be6c..bff5860797e 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-unshaded-shark.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-unshaded-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-unshaded-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-unshaded-tajaran.png index 1695647be6c..6cfdb131da4 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-unshaded-tajaran.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-unshaded-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-unshaded-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-unshaded-vulpkanin.png index 1695647be6c..6cfdb131da4 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-unshaded-vulpkanin.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-unshaded-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-unshaded.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-unshaded.png index 1695647be6c..c78bc7f8bdb 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-unshaded.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-unshaded.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-vulpkanin.png index 8e569f0afaa..c4424a04fff 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-vulpkanin.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head.png index ff9bedff316..380baad480d 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/equipped-head.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/icon-flash.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/icon-flash.png index a7448b7412a..ad2c8cc87b9 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/icon-flash.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/icon-flash.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/icon-unshaded.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/icon-unshaded.png index 7014b5dd017..745f2b2d41a 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/icon-unshaded.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/icon-unshaded.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/icon.png index 563b972f76b..d55ec41116d 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/icon.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/meta.json index b813b060c82..8afd9265e5c 100644 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-engineer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "By Kyburka&Insulgon", + "copyright": "@timxx7019", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-reptilian.png index 59cbfeb2f16..d7c154ac665 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-reptilian.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-shark.png index f2255efb749..8019b314cdc 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-shark.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-tajaran.png index 3fa12054694..e2940fea882 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-tajaran.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-unshaded-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-unshaded-reptilian.png index 6c9d6cd9ac0..0e262cb3eab 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-unshaded-reptilian.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-unshaded-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-unshaded-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-unshaded-shark.png index 1695647be6c..34b97cb0728 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-unshaded-shark.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-unshaded-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-unshaded-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-unshaded-tajaran.png index 1695647be6c..904c951f55c 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-unshaded-tajaran.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-unshaded-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-unshaded-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-unshaded-vulpkanin.png index 1695647be6c..ba145af2a16 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-unshaded-vulpkanin.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-unshaded-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-unshaded.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-unshaded.png index 1695647be6c..5a574f850de 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-unshaded.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-unshaded.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-vulpkanin.png index 8e569f0afaa..1b1d21f3f6e 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-vulpkanin.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head.png index ff9bedff316..6e594622c1c 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/equipped-head.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/icon-flash.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/icon-flash.png index a7448b7412a..655a7650b90 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/icon-flash.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/icon-flash.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/icon-unshaded.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/icon-unshaded.png index 7014b5dd017..745f2b2d41a 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/icon-unshaded.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/icon-unshaded.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/icon.png index 563b972f76b..0884890d310 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/icon.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/meta.json index b813b060c82..8afd9265e5c 100644 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-medic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "By Kyburka&Insulgon", + "copyright": "@timxx7019", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-reptilian.png index 59cbfeb2f16..567a1a13a16 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-reptilian.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-shark.png index f2255efb749..7d5e1ed5c3e 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-shark.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-tajaran.png index 3fa12054694..fb6dceb8f83 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-tajaran.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-unshaded-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-unshaded-reptilian.png index 6c9d6cd9ac0..90d2da51f90 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-unshaded-reptilian.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-unshaded-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-unshaded-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-unshaded-shark.png index 1695647be6c..bff5860797e 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-unshaded-shark.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-unshaded-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-unshaded-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-unshaded-tajaran.png index 1695647be6c..6cfdb131da4 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-unshaded-tajaran.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-unshaded-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-unshaded-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-unshaded-vulpkanin.png index 1695647be6c..6cfdb131da4 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-unshaded-vulpkanin.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-unshaded-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-unshaded.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-unshaded.png index 1695647be6c..c78bc7f8bdb 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-unshaded.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-unshaded.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-vulpkanin.png index 8e569f0afaa..d7e5f8e273b 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-vulpkanin.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head.png index ff9bedff316..0df24afe7a9 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/equipped-head.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/icon-flash.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/icon-flash.png index a7448b7412a..7e5a074cf1a 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/icon-flash.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/icon-flash.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/icon-unshaded.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/icon-unshaded.png index 7014b5dd017..745f2b2d41a 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/icon-unshaded.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/icon-unshaded.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/icon.png index 563b972f76b..ca8f69a0de9 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/icon.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/meta.json index b813b060c82..8afd9265e5c 100644 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head-pyrotech.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "By Kyburka&Insulgon", + "copyright": "@timxx7019", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-reptilian.png index 59cbfeb2f16..709f37771e8 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-reptilian.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-shark.png index f2255efb749..223164d4ac6 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-shark.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-tajaran.png index 3fa12054694..d3601d2f888 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-tajaran.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded-reptilian.png index 6c9d6cd9ac0..90d2da51f90 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded-reptilian.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded-reptilian.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded-shark.png index 1695647be6c..bff5860797e 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded-shark.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded-shark.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded-tajaran.png index 1695647be6c..6cfdb131da4 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded-tajaran.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded-tajaran.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded-vulpkanin.png index 1695647be6c..6cfdb131da4 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded-vulpkanin.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded.png index 1695647be6c..c78bc7f8bdb 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-vulpkanin.png index 8e569f0afaa..36622b6ff66 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-vulpkanin.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-vulpkanin.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head.png index ff9bedff316..35dc2bdbf7e 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/icon-flash.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/icon-flash.png index a7448b7412a..2140da62edc 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/icon-flash.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/icon-flash.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/icon-unshaded.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/icon-unshaded.png index 7014b5dd017..745f2b2d41a 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/icon-unshaded.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/icon-unshaded.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/meta.json index b813b060c82..8afd9265e5c 100644 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "By Kyburka&Insulgon", + "copyright": "@timxx7019", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/iic-armor-command.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/iic-armor-command.rsi/equipped-OUTERCLOTHING.png index 473f1dad938..28d3f3c74aa 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/iic-armor-command.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/iic-armor-command.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/iic-armor-engineer.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/iic-armor-engineer.rsi/equipped-OUTERCLOTHING.png index 3e43e5f1a62..b5014fb2034 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/iic-armor-engineer.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/iic-armor-engineer.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/iic-armor-medic.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/iic-armor-medic.rsi/equipped-OUTERCLOTHING.png index 5a2733444ce..d704c655769 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/iic-armor-medic.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/iic-armor-medic.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/iic-armor-pyrotech.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/iic-armor-pyrotech.rsi/equipped-OUTERCLOTHING.png index 4d6b870fde9..2b9a169edba 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/iic-armor-pyrotech.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/iic-armor-pyrotech.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/iic-armor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/iic-armor.rsi/equipped-OUTERCLOTHING.png index ef30400672f..8756de57bd2 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/iic-armor.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/iic-armor.rsi/equipped-OUTERCLOTHING.png differ