diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 394bc687261..614c3f6b7d9 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1832,3 +1832,21 @@ Entries: - { message: "Все главы имеют вживленный чип MindShield и не могут стать антагами", type: Tweak} id: 55757 #костыль отображения в Обновлениях time: '2024-05-30T19:14:00.0000000+00:00' + +- author: Tamioki&RevengenRat + changes: + - { message: "Удалены шлем и броня Бригмедика добавленная к нам с Corvax'а.", type: Remove} + - { message: "Удалён ЯЩИК Бригмедика.", type: Remove} + - { message: "Изменена большая часть спрайтов экипировки Бригмедика.", type: Tweak} + - { message: "Изменены все спрайты основных HUD визоров. Так же изменены очки ниндзя.", type: Tweak} + - { message: "Изменены спрайты очков с HUD'ами.", type: Tweak} + - { message: "Изменены спрайты глазных повязок с HUD визорами.", type: Tweak} + - { message: "Изменены спрайты латексных перчаток и спрайт экипированных боевых перчаток.", type: Tweak} + - { message: "Изменена экипировка Бригмедика, а так же содержимое его шкафчика.", type: Tweak} + - { message: "Изменено время СБ для получения Бригмедика - 10800 Минут, или же 3 часа.", type: Tweak} + - { message: "Изменены характеристики скафандра Бригмедика.", type: Tweak} + - { message: "Добавлены медицинские солнцезащитные очки.", type: Add} + - { message: "Добавлена новая экипировка для Бригмедика.", type: Add} + - { message: "Добавлена фигурка Бригмедика.", type: Add} + id: 55758 #костыль отображения в Обновлениях + time: '2024-06-01T18:01:00.0000000+00:00' diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl index 0dc82ca6e63..9763f479af5 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl @@ -14,7 +14,7 @@ ent-ClothingHeadHatBeretHoS = head of security's beret .desc = A black beret with a commander's rank emblem. For officers that are more inclined towards style than safety. ent-ClothingHeadHatBeretWarden = warden's beret .desc = A corporate blue beret with a warden's rank emblem. For officers that are more inclined towards style than safety. -ent-ClothingHeadHatBeretBrigmedic = medical beret +ent-ADTClothingHeadHatBeretBrigmedic = medical beret .desc = White beret, looks like a cream pie on the head. ent-ClothingHeadHatBeretMerc = mercenary beret .desc = Olive beret, the badge depicts a jackal on a rock. diff --git a/Resources/Locale/ru-RU/job/job-description.ftl b/Resources/Locale/ru-RU/job/job-description.ftl index 399810e32e3..85951c8d046 100644 --- a/Resources/Locale/ru-RU/job/job-description.ftl +++ b/Resources/Locale/ru-RU/job/job-description.ftl @@ -4,7 +4,7 @@ job-description-bartender = Заведуйте баром и поддержив job-description-botanist = Выращивайте фрукты и овощи для шеф-поваров, лекарственные травы для медотсека, и другие растения для личного пользования. job-description-borg = Получеловек, полумашина. Придерживайтесь своих законов, служите экипажу и преследуйте учёных с просьбами апгрейда. job-description-boxer = Пробейтесь на вершину! Бросьте вызов главе персонала и будьте арестованы когда выиграете. Эта должность доступна на станциях Core, Origin и Avrite. -job-description-brigmedic = Боритесь за жизни своих товарищей в тылу службы безопасности! Вы - первая и последняя надежда своего отряда. Да благословит вас Гиппократ. +job-description-brigmedic = Боритесь за жизни своих товарищей в тылу битвы! Вы - первая и последняя надежда своего отряда. Да благословит Вас Гиппократ. job-description-cadet = Изучите основы задержания преступников и порядки организации брига. job-description-captain = Управляйте станцией, распределяйте работу между другими главами персонала и изъявляйте свою волю. job-description-cargotech = Обрабатывайте заказы и осуществляйте поставки в чрезвычайных ситуациях, управляйте грузовым шаттлом и работайте сообща с другими, чтобы зарабатывать смехотворные суммы денег. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/eyes/glasses.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/eyes/glasses.ftl new file mode 100644 index 00000000000..a4492616215 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/eyes/glasses.ftl @@ -0,0 +1,2 @@ +ent-ADTClothingEyesGlassesMed = медицинские солнцезащитные очки + .desc = Отлично защищают глаза от вспышек, показывая всю информацию о здоровье окружающих. Лучший друг полевого медика. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/uniforms/Jumpsuit.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/uniforms/Jumpsuit.ftl index fe13406389f..effc5f5c587 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/uniforms/Jumpsuit.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/uniforms/Jumpsuit.ftl @@ -14,3 +14,7 @@ ent-ADTClothingUniformCyberSun = костюм Киберсан .desc = Костюм Киберсан, стильно и практично ! ent-ADTClothingUniformSupremeCommanderJumpsuit = джемпер верховного главнокомандующего .desc = Подходит для ситуаций супергалактического масштаба. +ent-ADTClothingUniformBrigmedicTurtleneck = водолазка бригмедика + .desc = Удобная и тёплая водолазка ангела-хранителя брига. +ent-ADTClothingUniformSkirtBrigmedicTurtleneck = юбка-водолазка бригмедика + .desc = Удобная и тёплая юбка-водолазка ангела-хранителя брига. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/objects/fun/figurines.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/objects/fun/figurines.ftl new file mode 100644 index 00000000000..b1eef161cef --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/objects/fun/figurines.ftl @@ -0,0 +1,2 @@ +ent-ToyFigurineBrigmedic = фигурка бригмедика + .desc = Фигурка, представляющая собой бригмедика - бравого полевого медика сражающегося за жизни своих товарищей, даже под градом пуль и лучей лазерных винтовок. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/security.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/security.ftl index 14a020a6afe..a43d4700203 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/security.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/security.ftl @@ -8,7 +8,10 @@ ent-LockerSecurityFilled = { ent-LockerSecurity } .suffix = Заполненный .desc = { ent-LockerSecurity.desc } ent-LockerBrigmedicFilled = { ent-LockerBrigmedic } - .suffix = Бригмедик, Заполненный + .suffix = Заполненный + .desc = { ent-LockerBrigmedic.desc } +ent-LockerBrigmedicFilledHardsuit = { ent-LockerBrigmedic } + .suffix = Заполненный, Скафандр .desc = { ent-LockerBrigmedic.desc } ent-LockerDetectiveFilled = { ent-LockerDetective } .suffix = Заполненный diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/suit_storage.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/suit_storage.ftl index 0dc8cf1210e..98f6b4939f0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/suit_storage.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/suit_storage.ftl @@ -34,6 +34,9 @@ ent-SuitStorageAtmos = { ent-SuitStorageBase } ent-SuitStorageSec = { ent-SuitStorageBase } .suffix = Служба безопасности .desc = { ent-SuitStorageBase.desc } +ent-SuitStorageBrigmedic = { ent-SuitStorageBase } + .suffix = Бригмедик + .desc = { ent-SuitStorageBase.desc } ent-SuitStorageCE = { ent-SuitStorageBase } .suffix = Старший инженер .desc = { ent-SuitStorageBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/head/helmets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/head/helmets.ftl deleted file mode 100644 index 4f1247ee14f..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/head/helmets.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-ClothingHeadHelmetSecurityMedic = шлем бригмедика - .desc = Стандартный боевой шлем медиков службы безопасности. Имеет достойный предел прочности и броню. Не задирайте голову. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/outerclothing/coats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/outerclothing/coats.ftl index d82b16b68c4..131e5fdec0b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/outerclothing/coats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/outerclothing/coats.ftl @@ -6,8 +6,6 @@ ent-ClothingOuterCoatWardenAlt = куртка смотрителя .desc = Темно-синяя бронированная куртка с синими отметками на плечах и нашивкой "/Смотритель/" на одном из нагрудных карманов. ent-ClothingOuterCoatSecurityOvercoat = шинель службы безопасности .desc = Бронированная кожаная шинель, предназначенная для повседневной носки офицерами. Имеет логотип компании Nanotrasen Security. -ent-ClothingOuterCoatLabSecurityMedic = лабораторный халат бригмедика - .desc = Костюм, защищающий от небольших разливов химикатов. ent-ClothingOuterCoatCaptain = торжественная куртка капитана .desc = Капитанская торжественная куртка, инкрустированная золотом. ent-ClothingOuterCoatHOP = куртка главы персонала diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/outerclothing/vests.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/outerclothing/vests.ftl index b4cc694f7a1..fdd814bb554 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/outerclothing/vests.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/outerclothing/vests.ftl @@ -1,6 +1,2 @@ ent-ClothingOuterVestArmorSec = бронежилет .desc = Тонкий бронежилет Типа I, обеспечивающий достойную защиту от большинства видов повреждений. -ent-ClothingOuterVestArmorMedSec = бронежилет бригмедика - .desc = Бронированный жилет бригмедика, с карманами для мелочёвки. -ent-ClothingOuterVestSecurityMedic = жилет бригмедика - .desc = Легкий жилет, который носят бригмедики. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/backpacks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/backpacks.ftl index 33aa251bb26..dbd39c3f157 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/backpacks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/backpacks.ftl @@ -7,7 +7,7 @@ ent-ClothingBackpackIan = рюкзак Иана ent-ClothingBackpackSecurity = рюкзак охраны .desc = Это очень робастный рюкзак. ent-ClothingBackpackBrigmedic = рюкзак бригмедика - .desc = Это очень стерильный рюкзак. + .desc = Это очень стерильный и вместительный на вид рюкзак с нашивкой красного ангельского креста. ent-ClothingBackpackEngineering = рюкзак инженера .desc = Это крепкий рюкзак на все случаи жизни на станции. ent-ClothingBackpackAtmospherics = рюкзак атмос-инженера diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/duffel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/duffel.ftl index 544d8c0b811..3b940823387 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/duffel.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/duffel.ftl @@ -13,7 +13,7 @@ ent-ClothingBackpackDuffelClown = вещмешок клоуна ent-ClothingBackpackDuffelSecurity = вещмешок охраны .desc = Большой вещмешок для хранения дополнительных припасов охраны. ent-ClothingBackpackDuffelBrigmedic = вещмешок бригмедика - .desc = Большой вещмешок для хранения дополнительных медицинских припасов. + .desc = Большой вещмешок ангела-хранителя брига, для хранения дополнительных медицинских принадлежностей. ent-ClothingBackpackDuffelChemistry = вещмешок химика .desc = Большой вещмешок для хранения дополнительных мензурок и пробирок. ent-ClothingBackpackDuffelVirology = вещмешок вирусолога diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/satchel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/satchel.ftl index 773c9c64d40..740bcc0631c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/satchel.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/satchel.ftl @@ -23,7 +23,7 @@ ent-ClothingBackpackSatchelScience = сумка учёного ent-ClothingBackpackSatchelSecurity = сумка охраны .desc = Прочная сумка для нужд службы безопасности. ent-ClothingBackpackSatchelBrigmedic = сумка бригмедика - .desc = Стерильная сумка для медицинских нужд. + .desc = Стерильная сумка бригмедика с его блестящей нашивкой, для его медицинских принадлежностей. ent-ClothingBackpackSatchelCaptain = сумка капитана .desc = Это особая сумка, изготовленная исключительно для офицеров Nanotrasen. ent-ClothingBackpackSatchelHydroponics = сумка ботаника diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl index 294c6692115..9f656a7fd43 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl @@ -21,7 +21,7 @@ ent-ClothingHeadHelmetHardsuitSecurity = шлем скафандра служб ent-ClothingHeadHelmetHardsuitSecurityRed = шлем скафандра главы службы безопасности .desc = Шлем скафандра службы безопасности с новейшим сверхсекретным программным обеспечением NT-HUD. Принадлежит главе службы безопасности. ent-ClothingHeadHelmetHardsuitBrigmedic = шлем скафандра бригмедика - .desc = Легкий шлем скафандра бригмедика. Защищает и от вирусов, и от клоунов. + .desc = Легкий шлем защитного скафандра бригмедика. Держит Бригмедика и воздух - внутри, вирусы и клоунов - Снаружи. ent-ClothingHeadHelmetHardsuitWarden = шлем скафандра смотрителя .desc = Модифицированный шлем брони против бунтов. На удивление удобный. ent-ClothingHeadHelmetHardsuitLuxury = шлем элитного шахтёрского скафандра diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl index 10162baf140..c773505a8e4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl @@ -14,8 +14,10 @@ ent-ClothingHeadHatBeretHoS = берет главы службы безопас .desc = Черный берет с вышитой командирской эмблемой. Для офицеров, которые предпочитают стиль безопасности. ent-ClothingHeadHatBeretWarden = берет смотрителя .desc = Фирменный голубой берет с эмблемой смотрителя. Для офицеров, которые предпочитают стиль безопасности. -ent-ClothingHeadHatBeretBrigmedic = берет медика +ent-ClothingHeadHatBeretMedical = берет медика .desc = Белый берет для стильных врачей. +ent-ADTClothingHeadHatBeretBrigmedic = берет бригмедика + .desc = Красный берет с ярким белым крестом, показывающий всем что вы - Медик. К сожалению, это не защищает вас от пули, ведь здесь не работают земные конвенции. Зато служит отличной мешенью. ent-ClothingHeadHatBeretMerc = берет наёмника .desc = Оливковый берет, на значке изображен шакал на скале. ent-ClothingHeadHatBowlerHat = шляпа котелок diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl index c1f12e27c05..5c06473db9d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl @@ -36,6 +36,8 @@ ent-ClothingOuterDogi = доги самурая .desc = Доги - это вид традиционной японской одежды. Доги изготавливается из тяжелой, плотной ткани, практичен в бою и стилен на вид. Спина украшена замысловатыми узорами и вышивкой. ent-ClothingOuterCoatParamedicWB = ветровка парамедика .desc = Надежная ветровка парамедика, защита от любого космического ветра. +ent-ADTClothingOuterCoatBrigmedicWB = ветровка бригмедика + .desc = Надежная ветровка врача брига, защита от любого космического ветра. ent-ClothingOuterCoatSyndieCap = тренч Синдиката .desc = Плащ Синдиката, изготовлен из прочной ткани, украшен позолоченными узорами. ent-ClothingOuterCoatSyndieCapArmored = бронированный тренч Синдиката diff --git a/Resources/Maps/ADTMaps/adt_delta.yml b/Resources/Maps/ADTMaps/adt_delta.yml index 09bfc456072..54277376d8f 100644 --- a/Resources/Maps/ADTMaps/adt_delta.yml +++ b/Resources/Maps/ADTMaps/adt_delta.yml @@ -94082,7 +94082,7 @@ entities: - type: Transform pos: -41.25105,59.651302 parent: 13307 -- proto: ClothingHeadHatBeretBrigmedic +- proto: ADTClothingHeadHatBeretBrigmedic entities: - uid: 6314 components: diff --git a/Resources/Maps/ADTMaps/adt_meta.yml b/Resources/Maps/ADTMaps/adt_meta.yml index 528d958e274..576b5ac01ff 100644 --- a/Resources/Maps/ADTMaps/adt_meta.yml +++ b/Resources/Maps/ADTMaps/adt_meta.yml @@ -60679,7 +60679,7 @@ entities: - type: Transform pos: 45.50863,41.570244 parent: 5350 -- proto: ClothingHeadHatBeretBrigmedic +- proto: ADTClothingHeadHatBeretBrigmedic entities: - uid: 23959 components: diff --git a/Resources/Maps/ADTMaps/adt_saltern.yml b/Resources/Maps/ADTMaps/adt_saltern.yml index 7c76e3a3355..23bb074b949 100644 --- a/Resources/Maps/ADTMaps/adt_saltern.yml +++ b/Resources/Maps/ADTMaps/adt_saltern.yml @@ -27072,7 +27072,7 @@ entities: - type: Transform pos: -22.754051,9.462572 parent: 31 -- proto: ClothingHeadHatBeretBrigmedic +- proto: ADTClothingHeadHatBeretBrigmedic entities: - uid: 6607 components: diff --git a/Resources/Maps/CorvaxMaps/corvax_avrit.yml b/Resources/Maps/CorvaxMaps/corvax_avrit.yml index fc76439600a..25998a7e01b 100644 --- a/Resources/Maps/CorvaxMaps/corvax_avrit.yml +++ b/Resources/Maps/CorvaxMaps/corvax_avrit.yml @@ -123767,7 +123767,7 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: ClothingHeadHatBeretBrigmedic +- proto: ADTClothingHeadHatBeretBrigmedic entities: - uid: 23774 components: diff --git a/Resources/Maps/CorvaxMaps/corvax_delta.yml b/Resources/Maps/CorvaxMaps/corvax_delta.yml index 4f038b72924..5388e4b4173 100644 --- a/Resources/Maps/CorvaxMaps/corvax_delta.yml +++ b/Resources/Maps/CorvaxMaps/corvax_delta.yml @@ -105652,7 +105652,7 @@ entities: - type: Transform pos: -41.25105,59.651302 parent: 13307 -- proto: ClothingHeadHatBeretBrigmedic +- proto: ADTClothingHeadHatBeretBrigmedic entities: - uid: 6314 components: diff --git a/Resources/Maps/Dungeon/medicine.yml b/Resources/Maps/Dungeon/medicine.yml index 23c1b73bb43..50d9725eeb4 100644 --- a/Resources/Maps/Dungeon/medicine.yml +++ b/Resources/Maps/Dungeon/medicine.yml @@ -4735,7 +4735,7 @@ entities: - type: Transform pos: 10.480986,45.607067 parent: 1 -- proto: ClothingHeadHatBeretBrigmedic +- proto: ADTClothingHeadHatBeretBrigmedic entities: - uid: 1183 components: diff --git a/Resources/Maps/NewYear/adtny_delta.yml b/Resources/Maps/NewYear/adtny_delta.yml index e412f21dd9d..2f9b8dbc4c7 100644 --- a/Resources/Maps/NewYear/adtny_delta.yml +++ b/Resources/Maps/NewYear/adtny_delta.yml @@ -113167,7 +113167,7 @@ entities: - canCollide: False type: Physics - type: InsideEntityStorage -- proto: ClothingHeadHatBeretBrigmedic +- proto: ADTClothingHeadHatBeretBrigmedic entities: - uid: 6314 components: diff --git a/Resources/Maps/NewYear/adtny_saltern.yml b/Resources/Maps/NewYear/adtny_saltern.yml index 41ff49fb15b..8bc0ce0b6c8 100644 --- a/Resources/Maps/NewYear/adtny_saltern.yml +++ b/Resources/Maps/NewYear/adtny_saltern.yml @@ -31241,7 +31241,7 @@ entities: - pos: -22.754051,9.462572 parent: 2 type: Transform -- proto: ClothingHeadHatBeretBrigmedic +- proto: ADTClothingHeadHatBeretBrigmedic entities: - uid: 4475 components: diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml index 10fa94ffb03..bed51674d10 100644 --- a/Resources/Maps/meta.yml +++ b/Resources/Maps/meta.yml @@ -60560,7 +60560,7 @@ entities: - type: Transform pos: 45.50863,41.570244 parent: 5350 -- proto: ClothingHeadHatBeretBrigmedic +- proto: ADTClothingHeadHatBeretBrigmedic entities: - uid: 23959 components: diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index f688e2131af..3a141e2b55a 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -26986,7 +26986,7 @@ entities: - type: Transform pos: -22.754051,9.462572 parent: 31 -- proto: ClothingHeadHatBeretBrigmedic +- proto: ADTClothingHeadHatBeretBrigmedic entities: - uid: 6607 components: diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/ADT/Catalog/Fills/Boxes/emergency.yml new file mode 100644 index 00000000000..593bdc77986 --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Fills/Boxes/emergency.yml @@ -0,0 +1,20 @@ +- type: entity + name: survival box + parent: BoxCardboard + id: BoxSurvivalBrigmedic + description: It's a box with basic internals inside. + suffix: Medical + components: + - type: StorageFill + contents: + - id: ClothingMaskBreathMedicalSecurity + - id: EmergencyOxygenTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodSnackNutribrick + - id: DrinkWaterBottleFull + - id: SpaceMedipen + - type: Sprite + layers: + - state: internals + - state: emergencytank diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/suit_storage.yml new file mode 100644 index 00000000000..578336d4727 --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/suit_storage.yml @@ -0,0 +1,13 @@ +#Brigmedic hardsuit +- type: entity + id: SuitStorageBrigmedic + parent: SuitStorageBase + suffix: Brigmedic + components: + - type: StorageFill + contents: + - id: OxygenTankFilled + - id: ClothingOuterHardsuitBrigmedic + - id: ClothingMaskBreath + - type: AccessReader + access: [["Medical"]] diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml index 6a937a61348..8bd4be4fa4e 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml @@ -51,4 +51,29 @@ sprite: ADT/Clothing/Eyes/Glasses/servant_of_evil.rsi state: icon - type: Clothing - sprite: ADT/Clothing/Eyes/Glasses/servant_of_evil.rsi \ No newline at end of file + sprite: ADT/Clothing/Eyes/Glasses/servant_of_evil.rsi + +- type: entity + parent: ClothingEyesBase + id: ADTClothingEyesGlassesMed + name: medical sunglasses + description: They perfectly protect the eyes from flashes, showing all the information about the health of others. A field medic's best friend. + components: + - type: Sprite + sprite: ADT/Clothing/Eyes/Glasses/sunmed.rsi + state: icon + - type: Clothing + sprite: ADT/Clothing/Eyes/Glasses/sunmed.rsi + - type: ShowHealthBars + damageContainers: + - Biological + - type: ShowHealthIcons + damageContainers: + - Biological + - type: FlashImmunity + - type: EyeProtection + protectionTime: 5 + - type: Tag + tags: + - WhitelistChameleon + - HudMedical diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml index cefec509944..c1cc4c5a8b1 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml @@ -612,16 +612,6 @@ - WhitelistChameleon # medical update -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadHatsMedicalBeret - name: medical beret - description: A white beret with carefully sewn cross. Smells like familliar ethanol. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/medical_beret.rsi #спрайты от prazat911 - - type: Clothing - sprite: ADT/Clothing/Head/Hats/medical_beret.rsi - type: entity parent: ClothingHeadBase @@ -1064,3 +1054,15 @@ sprite: ADT/Clothing/Uniforms/Nine/border.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Nine/border.rsi + +# Brigmedic beret +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatBeretBrigmedic + name: brigmedic beret + description: A robust beret with the medical insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/beret_brigmedic.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/beret_brigmedic.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml index 8a87a4e6997..10fc215590e 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml @@ -480,3 +480,18 @@ Slash: 0.8 Piercing: 0.7 Heat: 0.8 + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterCoatBrigmedicWB + name: brigmedic windbreaker + description: A brigmedic's trusty windbreaker, for all the space wind. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/brigmedicWB.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/brigmedicWB.rsi + - type: Armor + modifiers: + coefficients: + Caustic: 0.75 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml index 1e9d3cc1ce4..7773b1756a3 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml @@ -807,4 +807,15 @@ - type: Sprite sprite: ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi \ No newline at end of file + sprite: ADT/Clothing/Uniforms/Jumpskirt/janimaid.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformSkirtBrigmedicTurtleneck + name: brigmedic turtleneck + description: Comfortable and warm turtleneck. Especially for the guardian angel. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml index 21739d3414f..49bf242f62c 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml @@ -1639,3 +1639,14 @@ sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/michael_suit.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/michael_suit.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformBrigmedicTurtleneck + name: brigmedic turtleneck + description: Comfortable and warm turtleneck. Especially for the guardian angel. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brigmed.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brigmed.rsi diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/figurines.yml new file mode 100644 index 00000000000..4ef20d72921 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/figurines.yml @@ -0,0 +1,30 @@ + +# Штука для наших фигурок, чтобы потом все фигурки из этого файла брали текстурки из нашего файла. +- type: entity + parent: BaseItem + id: ADTBaseFigurine + name: figurine + description: A small miniature. + abstract: true + components: + - type: Sprite + sprite: ADT/Objects/Fun/figurines.rsi + - type: PhysicalComposition + materialComposition: + Plastic: 100 + - type: StaticPrice + price: 75 + - type: Tag + tags: + - Figurine + - type: StealTarget + stealGroup: Figurines + +- type: entity + parent: ADTBaseFigurine + id: ToyFigurineBrigmedic + name: brigmedic figure + description: AAA, MEDIC! + components: + - type: Sprite + state: brigmedic \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml index 8a939ac7895..d8b1d062f7b 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml @@ -79,16 +79,6 @@ group: market #ADT -- type: cargoProduct - id: SecurityBrigMedLocker - icon: - sprite: Structures/Storage/closet.rsi - state: brigmedlocked - product: ADTCrateSecurityBrigmedic - cost: 4000 - category: cargoproduct-category-name-security - group: market - - type: cargoProduct id: SecurityHardsuit icon: diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index e68c157ac60..95e343b3da7 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -53,8 +53,9 @@ components: - type: StorageFill contents: + - id: BoxSurvivalBrigmedic - id: Flash - - id: BoxSurvivalSecurity + - id: MagazinePistol - id: ADTSpaceLaw - id: SpaceCash500 diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index a9b1dad2ce7..8f076c3b74c 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -52,8 +52,10 @@ components: - type: StorageFill contents: + - id: BoxSurvivalBrigmedic - id: Flash - - id: BoxSurvivalSecurity + - id: MagazinePistol + - id: ADTSpaceLaw - id: SpaceCash500 - type: entity diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index ec8a2c66043..ceb82574222 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -61,8 +61,10 @@ components: - type: StorageFill contents: + - id: BoxSurvivalBrigmedic - id: Flash - - id: BoxSurvivalSecurity + - id: MagazinePistol + - id: ADTSpaceLaw - id: SpaceCash500 - type: entity diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml index 0fcfe3bb460..6a990e37f2e 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml @@ -133,29 +133,3 @@ - id: ADTClothingHeadUSSPjuggernautHelmetArmored - id: ClothingUniformJumpsuitUSSPBlack - id: ClothingHandsGlovesLeatherUSSPBlack - -- type: entity - id: ADTCrateSecurityBrigmedic - parent: CrateSecgear - components: - - type: StorageFill - contents: - #- id: BrigmedicPDA - - id: ClothingHeadHatBeretSecurityMedic - - id: ClothingHeadHatBeretBrigmedic - - id: ClothingBackpackDuffelBrigmedic - - id: ClothingBackpackBrigmedic - - id: ClothingBackpackSatchelBrigmedic - - id: ClothingUniformJumpsuitBrigmedic - - id: ClothingUniformJumpskirtBrigmedic - - id: ClothingHeadsetBrigmedic - - id: ClothingOuterCoatAMG - - id: ClothingOuterHardsuitBrigmedic - - id: ClothingUniformJumpskirtOfLife - - id: ClothingHeadHelmetSecurityMedic - - id: WeaponDisabler - - id: MedkitCombatFilled - - id: MedkitAdvancedFilled - - -# Cosmetic Crates diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 3e6b90ee8e8..52e176caeb4 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -84,27 +84,64 @@ prob: 0.6 - type: entity - id: LockerBrigmedicFilled - suffix: Brigmedic, Filled + id: LockerBrigmedicFilledHardsuit + suffix: Filled, Hardsuit parent: LockerBrigmedic components: - type: StorageFill contents: - #- id: ClothingEyesHudSecurity + - id: ClothingEyesHudMedSec - id: WeaponDisabler - id: TrackingImplanter - amount: 2 + amount: 4 - id: ClothingOuterHardsuitBrigmedic - - id: BoxSterileMask - - id: ClothingHeadHatBeretBrigmedic + - id: ClothingHandsGlovesNitrile + - id: ClothingHeadHatBeretMedic - id: ClothingOuterCoatAMG + - id: ADTClothingOuterCoatBrigmedicWB - id: ClothingUniformJumpsuitBrigmedic - id: ClothingUniformJumpskirtBrigmedic - - id: ClothingUniformJumpskirtOfLife - prob: 0.1 + - id: ADTClothingUniformBrigmedicTurtleneck + - id: ADTClothingUniformSkirtBrigmedicTurtleneck + - id: MedkitFilled + - id: MedkitCombatFilled + - id: MedkitAdvancedFilled + prob: 0.4 + - id: MedkitOxygenFilled + prob: 0.3 + - id: MedkitBruteFilled + prob: 0.3 + - id: MedkitToxinFilled + prob: 0.3 + - id: MedkitBurnFilled + prob: 0.7 + - id: BoxSyringe + - id: BoxPillCanister + - id: BoxBodyBag + - id: EpinephrineChemistryBottle + amount: 1 + +- type: entity + id: LockerBrigmedicFilled + suffix: Filled + parent: LockerBrigmedic + components: + - type: StorageFill + contents: + - id: ClothingEyesHudMedSec + - id: WeaponDisabler + - id: TrackingImplanter + amount: 4 + - id: ClothingHandsGlovesNitrile + - id: ClothingHeadHatBeretMedic + - id: ClothingOuterCoatAMG + - id: ADTClothingOuterCoatBrigmedicWB + - id: ClothingUniformJumpsuitBrigmedic + - id: ClothingUniformJumpskirtBrigmedic + - id: ADTClothingUniformBrigmedicTurtleneck + - id: ADTClothingUniformSkirtBrigmedicTurtleneck - id: MedkitFilled - id: MedkitCombatFilled - prob: 0.6 - id: MedkitAdvancedFilled prob: 0.4 - id: MedkitOxygenFilled @@ -115,8 +152,11 @@ prob: 0.3 - id: MedkitBurnFilled prob: 0.7 - - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse - prob: 0.15 + - id: BoxSyringe + - id: BoxPillCanister + - id: BoxBodyBag + - id: EpinephrineChemistryBottle + amount: 1 - type: entity id: LockerDetectiveFilled diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml index 1237a5085d3..86a75b23b04 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml @@ -8,7 +8,7 @@ #ADTClothingBackpackMedical: 4 #ADTClothingBackpackSatchelMedical: 4 #ADTClothingBeltMedicalBag: 4 - ADTClothingHeadHatsMedicalBeret: 4 + ClothingHeadHatBeretMedic: 4 ClothingHeadNurseHat: 4 ClothingOuterCoatLab: 4 ClothingShoesColorWhite: 4 diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Head/hats.yml index d6c2e05dfd1..17f2d9b12d0 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Head/hats.yml @@ -64,17 +64,6 @@ - type: Clothing sprite: Corvax/Clothing/Head/Hats/warden_alt.rsi -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatBeretSecurityMedic - name: security medic beret - description: A robust beret with the medical insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection. - components: - - type: Sprite - sprite: Corvax/Clothing/Head/Hats/beret_security_medic.rsi - - type: Clothing - sprite: Corvax/Clothing/Head/Hats/beret_security_medic.rsi - - type: entity parent: ClothingHeadBase id: ClothingHeadCaptainHat diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Head/helmets.yml deleted file mode 100644 index 8852e2f5d1c..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Head/helmets.yml +++ /dev/null @@ -1,10 +0,0 @@ -- type: entity - parent: ClothingHeadHelmetBasic - id: ClothingHeadHelmetSecurityMedic - name: security medic helmet - description: A standard issue combat helmet for security medics. Has decent tensile strength and armor. Keep your head down. - components: - - type: Sprite - sprite: Corvax/Clothing/Head/Helmets/security_medic.rsi - - type: Clothing - sprite: Corvax/Clothing/Head/Helmets/security_medic.rsi diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml index 909fa91bb95..b941ac7feb1 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml @@ -73,21 +73,6 @@ Piercing: 0.6 Heat: 0.9 -- type: entity - parent: ClothingOuterStorageBase - id: ClothingOuterCoatLabSecurityMedic - name: security medic labcoat - description: A suit that protects against minor chemical spills. - components: - - type: Sprite - sprite: Corvax/Clothing/OuterClothing/Coats/labcoat_security_medic.rsi - - type: Clothing - sprite: Corvax/Clothing/OuterClothing/Coats/labcoat_security_medic.rsi - - type: Armor - modifiers: - coefficients: - Caustic: 0.75 - - type: entity parent: ClothingOuterStorageBase id: ClothingOuterCoatCaptain diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/vests.yml index 42b00999ebf..62e8d1f7fbf 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/vests.yml @@ -8,25 +8,3 @@ sprite: Corvax/Clothing/OuterClothing/Vests/armor_sec.rsi - type: Clothing sprite: Corvax/Clothing/OuterClothing/Vests/armor_sec.rsi - -- type: entity - parent: ClothingOuterArmorBasic - id: ClothingOuterVestArmorMedSec - name: security medic armor vest - description: A security medic's armor vest, with little pockets for little things. - components: - - type: Sprite - sprite: Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi - - type: Clothing - sprite: Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi - -- type: entity - parent: ClothingOuterBase - id: ClothingOuterVestSecurityMedic - name: security medic vest - description: A lightweight vest worn by the Security Medic. - components: - - type: Sprite - sprite: Corvax/Clothing/OuterClothing/Vests/vest_security_medic.rsi - - type: Clothing - sprite: Corvax/Clothing/OuterClothing/Vests/vest_security_medic.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index 49983843db9..b24f040e21e 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -48,9 +48,6 @@ sprite: Clothing/Eyes/Hud/sec.rsi - type: Clothing sprite: Clothing/Eyes/Hud/sec.rsi - - type: FlashImmunity - - type: EyeProtection - protectionTime: 5 - type: ShowSecurityIcons - type: Tag tags: @@ -162,9 +159,6 @@ - type: ShowHealthBars damageContainers: - Biological - - type: FlashImmunity - - type: EyeProtection - protectionTime: 5 - type: entity parent: ClothingEyesBase @@ -242,9 +236,6 @@ damageContainers: - Biological - type: ShowSecurityIcons - - type: FlashImmunity - - type: EyeProtection - protectionTime: 5 - type: entity parent: ClothingEyesHudMedical diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index 33d37def50e..b0d28b84408 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -211,25 +211,41 @@ - type: entity parent: ClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetHardsuitBrigmedic + noSpawn: true name: brigmedic hardsuit helmet description: The lightweight helmet of the brigmedic hardsuit. Protects against viruses, and clowns. components: - - type: BreathMask - type: Sprite sprite: Clothing/Head/Hardsuits/brigmedic.rsi + layers: + - state: icon + - state: icon-flash + shader: unshaded + map: [ "light" ] + - type: HandheldLight + addPrefix: false + - type: ToggleableLightVisuals + spriteLayer: light + clothingVisuals: + head: + - state: equipped-head + - state: equipped-head-light + shader: unshaded - type: Clothing - sprite: Clothing/Head/Hardsuits/brigmedic.rsi + clothingVisuals: + head: + - state: equipped-head - type: PointLight - color: "#00FFFF" + color: "#82feef" - type: Armor modifiers: coefficients: Blunt: 0.95 Slash: 0.95 - Piercing: 0.95 - Heat: 0.95 - Radiation: 0.90 - Caustic: 0.90 + Piercing: 0.9 + Heat: 0.9 + Radiation: 0.85 + Caustic: 0.85 - type: PressureProtection highPressureMultiplier: 0.6 lowPressureMultiplier: 1000 diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index dd9610bcea8..5345df7cc34 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -157,14 +157,14 @@ - type: entity parent: ClothingHeadBase - id: ClothingHeadHatBeretBrigmedic - name: brigmedical beret + id: ClothingHeadHatBeretMedic + name: medic beret description: White beret, looks like a cream pie on the head. components: - type: Sprite - sprite: Clothing/Head/Hats/beret_brigmedic.rsi + sprite: Clothing/Head/Hats/beret_medic.rsi - type: Clothing - sprite: Clothing/Head/Hats/beret_brigmedic.rsi + sprite: Clothing/Head/Hats/beret_medic.rsi - type: entity parent: ClothingHeadBase @@ -1059,14 +1059,3 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatBeretMedic - name: medical beret - description: White beret that encourages you to be clean. - components: - - type: Sprite - sprite: Clothing/Head/Hats/beret_medic.rsi - - type: Clothing - sprite: Clothing/Head/Hats/beret_medic.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index d0074f38204..35027646ae4 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -247,8 +247,8 @@ modifiers: coefficients: Blunt: 0.8 - Slash: 0.8 - Piercing: 0.7 + Slash: 0.7 + Piercing: 0.6 Heat: 0.7 Radiation: 0.8 Caustic: 0.7 diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml index 0a2558168a4..d9fad2eb4dc 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml @@ -260,7 +260,7 @@ - id: ClothingMaskNeckGaiter prob: 0.02 orGroup: dressersecondloot - - id: ClothingHeadHatBeretBrigmedic + - id: ADTClothingHeadHatBeretBrigmedic prob: 0.02 orGroup: dresserthirdloot - id: ClothingMaskGas diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 247b40edccd..2c30e338e76 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1076,7 +1076,7 @@ - ClothingHeadHatBeretSecurity - ClothingUniformJumpsuitSec - ClothingUniformJumpskirtSec - - ClothingHeadHatBeretBrigmedic + - ADTClothingHeadHatBeretBrigmedic - ClothingUniformJumpsuitBrigmedic - ClothingUniformJumpskirtBrigmedic - ClothingHeadHatBeretWarden diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index c2a60fd3769..69cf471abe6 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -1068,8 +1068,8 @@ Cloth: 100 - type: latheRecipe - id: ClothingHeadHatBeretBrigmedic - result: ClothingHeadHatBeretBrigmedic + id: ADTClothingHeadHatBeretBrigmedic + result: ADTClothingHeadHatBeretBrigmedic completetime: 2 materials: Cloth: 100 diff --git a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml index 34272981ef1..bee5f10d2a7 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml @@ -9,7 +9,7 @@ time: 18000 - !type:DepartmentTimeRequirement department: Security - time: 7200 + time: 10800 #3 hrs startingGear: BrigmedicGear icon: "JobIconBrigmedic" supervisors: job-supervisors-hos @@ -27,21 +27,21 @@ - type: startingGear id: BrigmedicGear equipment: - jumpsuit: ClothingUniformJumpsuitBrigmedic - outerClothing: ClothingOuterCoatAMG + jumpsuit: ADTClothingUniformBrigmedicTurtleneck + outerClothing: ADTClothingOuterCoatBrigmedicWB back: ClothingBackpackBrigmedicFilled - shoes: ClothingShoesColorRed - gloves: ClothingHandsGlovesNitrile - eyes: ClothingEyesHudMedical - head: ClothingHeadHatBeretBrigmedic + shoes: ClothingShoesBootsJackSec + gloves: ClothingHandsGlovesLatex + eyes: ADTClothingEyesGlassesMed + head: ADTClothingHeadHatBeretBrigmedic id: BrigmedicPDA ears: ClothingHeadsetBrigmedic - mask: ClothingMaskBreathMedicalSecurity belt: ClothingBeltMedicalFilled + pocket1: WeaponPistolMk58Nonlethal underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear socks: ClothingUnderwearSocksNormal underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerClothingSkirt: ClothingUniformJumpskirtBrigmedic + innerClothingSkirt: ADTClothingUniformSkirtBrigmedicTurtleneck satchel: ClothingBackpackSatchelBrigmedicFilled duffelbag: ClothingBackpackDuffelBrigmedicFilled diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/sunmed.rsi/equipped-EYES-hamster.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/sunmed.rsi/equipped-EYES-hamster.png new file mode 100644 index 00000000000..7fbe3818439 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Eyes/Glasses/sunmed.rsi/equipped-EYES-hamster.png differ diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/sunmed.rsi/equipped-EYES.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/sunmed.rsi/equipped-EYES.png new file mode 100644 index 00000000000..29650475e8a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Eyes/Glasses/sunmed.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/sunmed.rsi/icon.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/sunmed.rsi/icon.png new file mode 100644 index 00000000000..eedfa1bc837 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Eyes/Glasses/sunmed.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/sunmed.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/sunmed.rsi/inhand-left.png new file mode 100644 index 00000000000..5a2955dc367 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Eyes/Glasses/sunmed.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/sunmed.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/sunmed.rsi/inhand-right.png new file mode 100644 index 00000000000..37f25287a5e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Eyes/Glasses/sunmed.rsi/inhand-right.png differ diff --git a/Resources/Textures/Corvax/Clothing/Head/Helmets/security_medic.rsi/meta.json b/Resources/Textures/ADT/Clothing/Eyes/Glasses/sunmed.rsi/meta.json similarity index 60% rename from Resources/Textures/Corvax/Clothing/Head/Helmets/security_medic.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Eyes/Glasses/sunmed.rsi/meta.json index 19b464c6809..2baf49e2c0a 100644 --- a/Resources/Textures/Corvax/Clothing/Head/Helmets/security_medic.rsi/meta.json +++ b/Resources/Textures/ADT/Clothing/Eyes/Glasses/sunmed.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 & inhand taken at commit https://github.com/tgstation/tgstation/commit/d1582bf1b41a0e24fd7a18124c6ff46b86b393f9 and modified by github:Morb0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da & modified glass color by mureixlol", "size": { "x": 32, "y": 32 @@ -11,7 +11,11 @@ "name": "icon" }, { - "name": "equipped-HELMET", + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "equipped-EYES-hamster", "directions": 4 }, { diff --git a/Resources/Textures/ADT/Clothing/Eyes/HUD/advanced_hud.rsi/equipped-EYES.png b/Resources/Textures/ADT/Clothing/Eyes/HUD/advanced_hud.rsi/equipped-EYES.png index b6e183dc4bc..c99e6a2916c 100644 Binary files a/Resources/Textures/ADT/Clothing/Eyes/HUD/advanced_hud.rsi/equipped-EYES.png and b/Resources/Textures/ADT/Clothing/Eyes/HUD/advanced_hud.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/ADT/Clothing/Eyes/HUD/advanced_hud.rsi/icon.png b/Resources/Textures/ADT/Clothing/Eyes/HUD/advanced_hud.rsi/icon.png index 827592d0f9a..7147a98f477 100644 Binary files a/Resources/Textures/ADT/Clothing/Eyes/HUD/advanced_hud.rsi/icon.png and b/Resources/Textures/ADT/Clothing/Eyes/HUD/advanced_hud.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Eyes/HUD/advanced_hud.rsi/meta.json b/Resources/Textures/ADT/Clothing/Eyes/HUD/advanced_hud.rsi/meta.json index 9504458d81f..9f8064fb61f 100644 --- a/Resources/Textures/ADT/Clothing/Eyes/HUD/advanced_hud.rsi/meta.json +++ b/Resources/Textures/ADT/Clothing/Eyes/HUD/advanced_hud.rsi/meta.json @@ -1,18 +1,37 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Friskis", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation.", "size": { "x": 32, "y": 32 }, - "states": [ + "states": + [ { - "name": "icon" + "name": "equipped-EYES", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ] + ] }, { - "name": "equipped-EYES", - "directions": 4 + "name": "icon" } ] } diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..36a4764c295 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png new file mode 100644 index 00000000000..e024d1b06fa Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png new file mode 100644 index 00000000000..2e2afff5a88 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png new file mode 100644 index 00000000000..2670203a55c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/vest_security_medic.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json similarity index 54% rename from Resources/Textures/Corvax/Clothing/OuterClothing/Vests/vest_security_medic.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json index d637f044e04..a1ec9a2fd19 100644 --- a/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/vest_security_medic.rsi/meta.json +++ b/Resources/Textures/ADT/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/blob/068271b779be918cf3c73a816a60c1e5cdf8bfda/modular_skyrat/master_files/icons/mob/clothing/suit.dmi & inhand sprites by Morb0", + "copyright": "Made by Tamioki.", "size": { "x": 32, "y": 32 @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-OUTERCLOTHING", + "name": "equipped-HELMET", "directions": 4 }, { diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/equipped-HELMET.png deleted file mode 100644 index b2425b6851e..00000000000 Binary files a/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/icon.png deleted file mode 100644 index b7f6cd25422..00000000000 Binary files a/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/inhand-left.png deleted file mode 100644 index f39980dc937..00000000000 Binary files a/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/inhand-right.png deleted file mode 100644 index 26832a51f64..00000000000 Binary files a/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/brigmedicWB.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/brigmedicWB.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..f305cd43a2e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/brigmedicWB.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/brigmedicWB.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/brigmedicWB.rsi/icon.png new file mode 100644 index 00000000000..7f18e0f0a75 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/brigmedicWB.rsi/icon.png differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/labcoat_security_medic.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/brigmedicWB.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Corvax/Clothing/OuterClothing/Coats/labcoat_security_medic.rsi/inhand-left.png rename to Resources/Textures/ADT/Clothing/OuterClothing/Coats/brigmedicWB.rsi/inhand-left.png diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/labcoat_security_medic.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/brigmedicWB.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Corvax/Clothing/OuterClothing/Coats/labcoat_security_medic.rsi/inhand-right.png rename to Resources/Textures/ADT/Clothing/OuterClothing/Coats/brigmedicWB.rsi/inhand-right.png diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/labcoat_security_medic.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/brigmedicWB.rsi/meta.json similarity index 100% rename from Resources/Textures/Corvax/Clothing/OuterClothing/Coats/labcoat_security_medic.rsi/meta.json rename to Resources/Textures/ADT/Clothing/OuterClothing/Coats/brigmedicWB.rsi/meta.json diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..c575cbd7e3b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi/icon.png new file mode 100644 index 00000000000..4c6ff3d1445 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi/inhand-left.png new file mode 100644 index 00000000000..71b71c2a53a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi/inhand-right.png new file mode 100644 index 00000000000..81408fdce3a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi/meta.json similarity index 56% rename from Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi/meta.json index 823470fed1d..ef6c4438b8e 100644 --- a/Resources/Textures/ADT/Clothing/Head/Hats/medical_beret.rsi/meta.json +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "JustKekc and prazat911", + "copyright": "Taken from Skyrat-tg https://github.com/Skyrat-SS13/Skyrat-tg/blob/735606d73c5262dcce6a5d9b9cfc797eb5a64946/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi", "size": { "x": 32, "y": 32 @@ -11,16 +11,16 @@ "name": "icon" }, { - "name": "equipped-HELMET", + "name": "equipped-INNERCLOTHING", "directions": 4 }, { "name": "inhand-left", "directions": 4 - }, - { + }, + { "name": "inhand-right", "directions": 4 - } + } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brigmed.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brigmed.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..2c76796b78b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brigmed.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brigmed.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brigmed.rsi/icon.png new file mode 100644 index 00000000000..02baf32b46a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brigmed.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brigmed.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brigmed.rsi/inhand-left.png new file mode 100644 index 00000000000..71b71c2a53a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brigmed.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brigmed.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brigmed.rsi/inhand-right.png new file mode 100644 index 00000000000..81408fdce3a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brigmed.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brigmed.rsi/meta.json similarity index 56% rename from Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brigmed.rsi/meta.json index d16877dba2a..ef6c4438b8e 100644 --- a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brigmed.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Adventure Time prazat911(Discord)", + "copyright": "Taken from Skyrat-tg https://github.com/Skyrat-SS13/Skyrat-tg/blob/735606d73c5262dcce6a5d9b9cfc797eb5a64946/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi", "size": { "x": 32, "y": 32 @@ -11,20 +11,16 @@ "name": "icon" }, { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "equipped-HELMET-hamster", + "name": "equipped-INNERCLOTHING", "directions": 4 }, { "name": "inhand-left", "directions": 4 - }, - { + }, + { "name": "inhand-right", "directions": 4 - } + } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Fun/figurines.rsi/brigmedic.png b/Resources/Textures/ADT/Objects/Fun/figurines.rsi/brigmedic.png new file mode 100644 index 00000000000..92455f06348 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/figurines.rsi/brigmedic.png differ diff --git a/Resources/Textures/ADT/Objects/Fun/figurines.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/figurines.rsi/meta.json new file mode 100644 index 00000000000..6504b7c3692 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Fun/figurines.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Brigmedic by Tamioki.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "brigmedic" + } + ] +} diff --git a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/equipped-BACKPACK.png index 37a5937690b..c1ead9cfbe7 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/icon.png index 06875557192..f2f23b534cf 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-left.png index d06bc5c0502..c1d6bb8ca96 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-right.png index eda68924f68..2f5c18e0901 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/meta.json index 477c5227850..8b4cffd7793 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Hülle#2562 (Discord)", + "copyright": "Made by Tamioki.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/equipped-BACKPACK.png index f286ed6ed7d..ee8070a0cba 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/icon.png index 1a59e359322..4b54f09a83e 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-left.png index 9b3711546ef..05eaf3aa100 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-right.png index ad44a33b51d..a8d8272cc20 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/meta.json index d239c4dd178..06136987b0e 100644 --- a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Hülle#2562 (Discord), and modified for Adventure Time by prazat911 (Discord)", + "copyright": "Made by Tamioki.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/equipped-BACKPACK.png index 09f3fce48f7..cfc689305e8 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/icon.png index 3c3fc165461..a8cdc798c0f 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-left.png index 66229364c51..07c5c570526 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-right.png index 51b618480d1..62d997de0ef 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/meta.json index 477c5227850..8b4cffd7793 100644 --- a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Hülle#2562 (Discord)", + "copyright": "Made by Tamioki.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/equipped-EYES.png index 483d40449fb..fddfe952f48 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/icon.png index 0911957a8d2..283a7ca2d17 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/inhand-left.png index ebd7858dabb..4449390fbad 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/inhand-left.png and b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/inhand-right.png index 53535a1de70..c52603a5a7e 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/inhand-right.png and b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/meta.json index f803400908a..cbd41f806f4 100644 --- a/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise station https://github.com/ParadiseSS13/Paradise/commit/ede55cc8f5b50abcd4f51d37779b56853a440a9a", + "copyright": "Taken from skyrat-TG at https://github.com/Skyrat-SS13/Skyrat-tghttps://github.com/Skyrat-SS13/Skyrat-tg", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/equipped-EYES.png index dd921481b7a..c26571cf7f6 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/icon.png index af3788654b9..d973f836d89 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Glasses/science.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES-hamster.png b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES-hamster.png index cc392eb9871..cd45058fcc0 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES-hamster.png and b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES-hamster.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES.png index 3760be8c03a..50889988dbb 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/icon.png index e39b403ec5a..bb46a99276d 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-left.png index 58cff681aae..8fe6efbf389 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-left.png and b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-right.png index c040c0dc690..7cb12fdbd8a 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-right.png and b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES.png index f72e29ec428..8c75dd14635 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/inhand-left.png index 9712db9d5f4..e90068b213a 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/inhand-left.png and b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/inhand-right.png index 2a225f98bcf..4c7b27bc482 100644 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/inhand-right.png and b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/equipped-EYES.png index d2af43448b7..a659acc7af1 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/icon.png index 39823c84465..e3e17b647cf 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-left.png index 7c9605a87b0..45d5af71dc2 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-left.png and b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-right.png index ec2b0de5c9a..d616526ab73 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-right.png and b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/equipped-EYES.png index 5ea6a09494b..1ffaf2d1da1 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/icon.png index f0d842ddbcf..8ca425e4780 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/equipped-EYES.png index 65d1d2383e1..1b2811ceeef 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/icon.png index a4fa06807c5..4a67eae8511 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/meta.json index 541bdfbedca..c56779e33b7 100644 --- a/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/meta.json @@ -1,18 +1,37 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation.", "size": { "x": 32, "y": 32 }, - "states": [ + "states": + [ { - "name": "icon" + "name": "equipped-EYES", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ] + ] }, { - "name": "equipped-EYES", - "directions": 4 + "name": "icon" }, { "name": "inhand-left", diff --git a/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/equipped-EYES.png index 91a6b3ac3ee..23d068c08d9 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/icon.png index ca0aac22e76..fc4093ff06b 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/med.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/equipped-EYES.png index 63f6e1e018f..422010eb21e 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/med.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/med.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/icon.png index efc87155fde..ec8ef0ab63d 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/med.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/med.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/meta.json index 541bdfbedca..c56779e33b7 100644 --- a/Resources/Textures/Clothing/Eyes/Hud/med.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/meta.json @@ -1,18 +1,37 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation.", "size": { "x": 32, "y": 32 }, - "states": [ + "states": + [ { - "name": "icon" + "name": "equipped-EYES", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ] + ] }, { - "name": "equipped-EYES", - "directions": 4 + "name": "icon" }, { "name": "inhand-left", diff --git a/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/equipped-EYES.png index 5bb3dde71f1..a4c89c33377 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/icon.png index fcb3dbb4121..49ea04f3928 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/equipped-EYES.png index 22b26456c9a..5a28009d484 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/icon.png index 77c9e430b9c..bac2090212a 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/meta.json index 945139fb056..9f8064fb61f 100644 --- a/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/meta.json @@ -1,18 +1,37 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Derby", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation.", "size": { "x": 32, "y": 32 }, - "states": [ + "states": + [ { - "name": "icon" + "name": "equipped-EYES", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ] + ] }, { - "name": "equipped-EYES", - "directions": 4 + "name": "icon" } ] } diff --git a/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/equipped-EYES.png index 2d7da82848c..bb68c6ad070 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/icon.png index 124404b5eee..73076ec922e 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/meta.json index 541bdfbedca..c56779e33b7 100644 --- a/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/meta.json @@ -1,18 +1,37 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation.", "size": { "x": 32, "y": 32 }, - "states": [ + "states": + [ { - "name": "icon" + "name": "equipped-EYES", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ] + ] }, { - "name": "equipped-EYES", - "directions": 4 + "name": "icon" }, { "name": "inhand-left", diff --git a/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/equipped-EYES.png index ed5af49e30e..4a724a4a510 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/icon.png index 8a1fc5bc555..479b83202c5 100644 Binary files a/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/icon.png and b/Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/equipped-HAND.png index 9c87c210ef6..a2d68ab4e63 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/equipped-HAND.png and b/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/icon.png index c2d384a5613..6a02719e95f 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/icon.png and b/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/equipped-HAND.png index 57dd8882d3c..45dffd7612b 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/equipped-HAND.png and b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png index 11237e02a94..845d15b7476 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png and b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/inhand-left.png index 5ec31202f10..bee86b157d9 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/inhand-left.png and b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/inhand-right.png index f9ea9a377af..f6ba1ea94d6 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/inhand-right.png and b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json index 3b5d02aff6a..e22a16492bf 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", + "copyright": "Made by Tamioki.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/equipped-head-light.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/equipped-head-light.png new file mode 100644 index 00000000000..389194c3c4e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/equipped-head-light.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/equipped-head.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/equipped-head.png new file mode 100644 index 00000000000..5dbfe45b476 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/equipped-head.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/icon-flash.png index 5033c5a1f82..7060e55804e 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/icon.png index 0bf76e1a88c..3d8e3671227 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/meta.json index 2000bca3c1a..9c15fdd2cbc 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by PuroSlavKing (github) for SS14", + "copyright": "Made by Tamioki", "size": { "x": 32, "y": 32 @@ -14,7 +14,7 @@ "name": "icon-flash" }, { - "name": "off-equipped-HELMET", + "name": "equipped-head", "directions": 4 }, { @@ -26,7 +26,7 @@ "directions": 4 }, { - "name": "on-equipped-HELMET", + "name": "equipped-head-light", "directions": 4 }, { @@ -36,14 +36,6 @@ { "name": "on-inhand-right", "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulp", - "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulp", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET-vulp.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET-vulp.png deleted file mode 100644 index 55694382f97..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET-vulp.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET.png deleted file mode 100644 index 68f95ad9fda..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET-vulp.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET-vulp.png deleted file mode 100644 index a6752d5b1cd..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET-vulp.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET.png deleted file mode 100644 index 890ecd02006..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png deleted file mode 100644 index b95bf1e3608..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png deleted file mode 100644 index 227ff9b056f..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png deleted file mode 100644 index aa73a5fc6bd..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png deleted file mode 100644 index 7d6b6ea8d49..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/equipped-HELMET-hamster.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET-hamster.png rename to Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/equipped-HELMET-hamster.png diff --git a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/equipped-HELMET.png index 13f8eb2afdb..b95bf1e3608 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/icon.png index 46b5ac16fb4..227ff9b056f 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-left.png index fe6d00e15c3..aa73a5fc6bd 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-right.png index 6af0e0514df..7d6b6ea8d49 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/meta.json index e1197010d7c..d16877dba2a 100644 --- a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Hülle#2562 (Discord), resprite by icekot8", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Adventure Time prazat911(Discord)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-cat.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-cat.png deleted file mode 100644 index fc5b4906220..00000000000 Binary files a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-cat.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-dog.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-dog.png deleted file mode 100644 index a39c2778b01..00000000000 Binary files a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-dog.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-fox.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-fox.png deleted file mode 100644 index 7554106bc42..00000000000 Binary files a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-fox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-pig.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-pig.png deleted file mode 100644 index 899eeb0bc2e..00000000000 Binary files a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-pig.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-possum.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-possum.png deleted file mode 100644 index 20fc7da6437..00000000000 Binary files a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-possum.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-puppy.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-puppy.png deleted file mode 100644 index c6d1968388b..00000000000 Binary files a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-puppy.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-reptilian.png deleted file mode 100644 index 6bea4932324..00000000000 Binary files a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-sloth.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-sloth.png deleted file mode 100644 index aebfd610420..00000000000 Binary files a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-sloth.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-vulp.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-vulp.png deleted file mode 100644 index 4b2956c2be9..00000000000 Binary files a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-vulp.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK.png index aa30ac4e001..e1223ec39e3 100644 Binary files a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK.png and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/icon.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/icon.png index 91eb353b2f7..b6127aba7bb 100644 Binary files a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/icon.png and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/inhand-left.png index dc764f15310..8f8639795f7 100644 Binary files a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/inhand-left.png and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/inhand-right.png index 97610dee5f0..eba1578f6c6 100644 Binary files a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/inhand-right.png and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json index 4e7f8cd981e..5a86321b329 100644 --- a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by LinkUyx#6557. Reptilian edit by Nairod(Github)", + "copyright": "Made by Tamioki)", "size": { "x": 32, "y": 32 @@ -14,42 +14,6 @@ "name": "equipped-MASK", "directions": 4 }, - { - "name": "equipped-MASK-vulp", - "directions": 4 - }, - { - "name": "equipped-MASK-dog", - "directions": 4 - }, - { - "name": "equipped-MASK-puppy", - "directions": 4 - }, - { - "name": "equipped-MASK-fox", - "directions": 4 - }, - { - "name": "equipped-MASK-cat", - "directions": 4 - }, - { - "name": "equipped-MASK-sloth", - "directions": 4 - }, - { - "name": "equipped-MASK-possum", - "directions": 4 - }, - { - "name": "equipped-MASK-pig", - "directions": 4 - }, - { - "name": "up-equipped-MASK", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 @@ -57,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-MASK-reptilian", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/up-equipped-MASK.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/up-equipped-MASK.png deleted file mode 100644 index 98e2b15b364..00000000000 Binary files a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/up-equipped-MASK.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/equipped-OUTERCLOTHING.png index ae01ce0a03a..29c6797d73d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/icon.png index db9d900646b..44eeea35dc7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/inhand-left.png deleted file mode 100644 index 48eae2b05b1..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/inhand-right.png deleted file mode 100644 index 582296eb74c..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/meta.json index 0b116ffb593..6bc0b688247 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Hülle#2562 (Discord) for Space Station 14 and Adventure Time prazat911(Discord)", + "copyright": "Made by Tamioki.", "size": { "x": 32, "y": 32 @@ -13,14 +13,6 @@ { "name": "equipped-OUTERCLOTHING", "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING.png index 62ff24def93..0489c420bea 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/icon.png index 2fa0358ff63..72516f2e4db 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/inhand-left.png index d0f9634e3e5..ca57bd84f1d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/inhand-right.png index b7d4d3b1535..25c3c67d31d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json index 9ecf4115a97..2c657b5f813 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by PuroSlavKing (github) for SS14", + "copyright": "Made by Tamioki.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png deleted file mode 100644 index a09c68c7b92..00000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png index ab93302717e..c1c97c2b539 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png index 4c6ff3d1445..222aa22d211 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png index c473f19e70a..f48b45bc1f1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png index 3b5560521e7..885685051d9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json index 36ba443fb53..7fe2ce70ada 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Skyrat-tg https://github.com/Skyrat-SS13/Skyrat-tg/blob/735606d73c5262dcce6a5d9b9cfc797eb5a64946/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi, monkey made by brainfood1183 (github) for ss14", + "copyright": "Made by Tamioki.", "size": { "x": 32, "y": 32 @@ -14,10 +14,6 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png deleted file mode 100644 index c4d767aaaa4..00000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png index 512f10ad5bb..477e8fb22e0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png index 02baf32b46a..d0136892933 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png index c473f19e70a..f48b45bc1f1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png index 3b5560521e7..885685051d9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json index 36ba443fb53..7fe2ce70ada 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Skyrat-tg https://github.com/Skyrat-SS13/Skyrat-tg/blob/735606d73c5262dcce6a5d9b9cfc797eb5a64946/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi, monkey made by brainfood1183 (github) for ss14", + "copyright": "Made by Tamioki.", "size": { "x": 32, "y": 32 @@ -14,10 +14,6 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Corvax/Clothing/Head/Hats/beret_security_medic.rsi/equipped-HELMET.png b/Resources/Textures/Corvax/Clothing/Head/Hats/beret_security_medic.rsi/equipped-HELMET.png index 6d74e0c9334..36a4764c295 100644 Binary files a/Resources/Textures/Corvax/Clothing/Head/Hats/beret_security_medic.rsi/equipped-HELMET.png and b/Resources/Textures/Corvax/Clothing/Head/Hats/beret_security_medic.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Corvax/Clothing/Head/Hats/beret_security_medic.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Head/Hats/beret_security_medic.rsi/icon.png index 54dc3f0eb37..b50a4b1168f 100644 Binary files a/Resources/Textures/Corvax/Clothing/Head/Hats/beret_security_medic.rsi/icon.png and b/Resources/Textures/Corvax/Clothing/Head/Hats/beret_security_medic.rsi/icon.png differ diff --git a/Resources/Textures/Corvax/Clothing/Head/Hats/beret_security_medic.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/Head/Hats/beret_security_medic.rsi/inhand-left.png index 8700a9194c7..2e2afff5a88 100644 Binary files a/Resources/Textures/Corvax/Clothing/Head/Hats/beret_security_medic.rsi/inhand-left.png and b/Resources/Textures/Corvax/Clothing/Head/Hats/beret_security_medic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Corvax/Clothing/Head/Hats/beret_security_medic.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/Head/Hats/beret_security_medic.rsi/inhand-right.png index 0bcd4ea724c..2670203a55c 100644 Binary files a/Resources/Textures/Corvax/Clothing/Head/Hats/beret_security_medic.rsi/inhand-right.png and b/Resources/Textures/Corvax/Clothing/Head/Hats/beret_security_medic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Corvax/Clothing/Head/Hats/beret_security_medic.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Head/Hats/beret_security_medic.rsi/meta.json index 36cb036fff1..a1ec9a2fd19 100644 --- a/Resources/Textures/Corvax/Clothing/Head/Hats/beret_security_medic.rsi/meta.json +++ b/Resources/Textures/Corvax/Clothing/Head/Hats/beret_security_medic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/blob/735606d73c5262dcce6a5d9b9cfc797eb5a64946/icons/obj/clothing/head/beret.dmi as greyscale and recolored with #3F3C40 #870E12 by Morb0", + "copyright": "Made by Tamioki.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Corvax/Clothing/Head/Helmets/security_medic.rsi/equipped-HELMET.png b/Resources/Textures/Corvax/Clothing/Head/Helmets/security_medic.rsi/equipped-HELMET.png deleted file mode 100644 index 62b893f1db0..00000000000 Binary files a/Resources/Textures/Corvax/Clothing/Head/Helmets/security_medic.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Clothing/Head/Helmets/security_medic.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Head/Helmets/security_medic.rsi/icon.png deleted file mode 100644 index 818c23f24b3..00000000000 Binary files a/Resources/Textures/Corvax/Clothing/Head/Helmets/security_medic.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Clothing/Head/Helmets/security_medic.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/Head/Helmets/security_medic.rsi/inhand-left.png deleted file mode 100644 index 5b0fad9af4a..00000000000 Binary files a/Resources/Textures/Corvax/Clothing/Head/Helmets/security_medic.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Clothing/Head/Helmets/security_medic.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/Head/Helmets/security_medic.rsi/inhand-right.png deleted file mode 100644 index 78f7e8de46f..00000000000 Binary files a/Resources/Textures/Corvax/Clothing/Head/Helmets/security_medic.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/labcoat_security_medic.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/labcoat_security_medic.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index 954c7eac45c..00000000000 Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/labcoat_security_medic.rsi/equipped-OUTERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/labcoat_security_medic.rsi/icon.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/labcoat_security_medic.rsi/icon.png deleted file mode 100644 index 5012bc3ba20..00000000000 Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/labcoat_security_medic.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index 9c43f812149..00000000000 Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi/equipped-OUTERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi/icon.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi/icon.png deleted file mode 100644 index e2e78a8ec4d..00000000000 Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi/inhand-left.png deleted file mode 100644 index aea0f39676c..00000000000 Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi/inhand-right.png deleted file mode 100644 index cef6f162c71..00000000000 Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi/meta.json b/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi/meta.json deleted file mode 100644 index 5a4d06fbe32..00000000000 --- a/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from skyray-tg at https://github.com/Skyrat-SS13/Skyrat-tg/blob/735606d73c5262dcce6a5d9b9cfc797eb5a64946/modular_skyrat/master_files/icons/mob/clothing/suit.dmi and icon modified by Morb0", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/vest_security_medic.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/vest_security_medic.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index 902888676f5..00000000000 Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/vest_security_medic.rsi/equipped-OUTERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/vest_security_medic.rsi/icon.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/vest_security_medic.rsi/icon.png deleted file mode 100644 index 7df19350d0b..00000000000 Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/vest_security_medic.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/vest_security_medic.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/vest_security_medic.rsi/inhand-left.png deleted file mode 100644 index 75f32feb04f..00000000000 Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/vest_security_medic.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/vest_security_medic.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/vest_security_medic.rsi/inhand-right.png deleted file mode 100644 index 1b055e9a9de..00000000000 Binary files a/Resources/Textures/Corvax/Clothing/OuterClothing/Vests/vest_security_medic.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Markers/jobs.rsi/brigmedic.png b/Resources/Textures/Markers/jobs.rsi/brigmedic.png index cec28ec8353..ab2fe8d9699 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/brigmedic.png and b/Resources/Textures/Markers/jobs.rsi/brigmedic.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json index bca3be1df84..28c31f035be 100644 --- a/Resources/Textures/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/Markers/jobs.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | cburn and cluwne made by brainfood1183 (github). brigmed made by PuroSlavKing (Github)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | cburn and cluwne made by brainfood1183 (github). Brigmedic made by Tamioki.", "size": { "x": 32, "y": 32 diff --git a/Resources/migration.yml b/Resources/migration.yml index 3908d70a64e..feec2acabc9 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -258,3 +258,9 @@ ImprovisedExplosiveFuel: FireBombFuel # 2024-04-10 LGBTQHandyFlag: Ash + +# 2024-06-01 +ClothingHeadHatBeretSecurityMedic: ADTClothingHeadHatBeretBrigmedic +ClothingHeadHelmetSecurityMedic: ClothingHeadHelmetBasic +ClothingOuterVestArmorMedSec: ClothingOuterArmorBasicSlim +ClothingOuterVestSecurityMedic: ClothingOuterArmorBasicSlim