diff --git a/Resources/Locale/ru-RU/ADT/Job/job-description.ftl b/Resources/Locale/ru-RU/ADT/Job/job-description.ftl index 1d579e08d95..87e82b63bf4 100644 --- a/Resources/Locale/ru-RU/ADT/Job/job-description.ftl +++ b/Resources/Locale/ru-RU/ADT/Job/job-description.ftl @@ -2,4 +2,6 @@ job-description-ADTPathologist = Осматривайте тела мёртво job-description-roboticist = Собирайте боргов, мехов, обслуживайте синтетиков и поражайте (либо пугайте) экипаж своими новейшими разработками. -job-description-magistrat = Самый грозный и богатый на станции. \ No newline at end of file +job-description-magistrat = Самый грозный и богатый на станции. + +job-description-ADTBlueShieldOfficer = Защищайте капитана и глав отделов от опасностей, а прежде всего - от них самих. diff --git a/Resources/Locale/ru-RU/ADT/Job/job-names.ftl b/Resources/Locale/ru-RU/ADT/Job/job-names.ftl index abc0bf87119..ac8f69c4689 100644 --- a/Resources/Locale/ru-RU/ADT/Job/job-names.ftl +++ b/Resources/Locale/ru-RU/ADT/Job/job-names.ftl @@ -5,4 +5,7 @@ job-name-roboticist = робототехник JobRoboticist = робототехник job-name-magistrat = Магистрат -JobMagistrat = Магистрат \ No newline at end of file +JobMagistrat = Магистрат + +job-name-ADTBlueShieldOfficer = офицер Синего Щита +JobADTBlueShieldOfficer = офицер Синего Щита diff --git a/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl index 79214fbfd1b..1be353ff784 100644 --- a/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl @@ -5,6 +5,11 @@ # Command ent-MagistratNeck = Галстуки ent-MagistratJumpsuit = Костюмы + +loadout-group-blueshield-jumpsuit = ОСЩ, комбинезон +loadout-group-blueshield-head = ОСЩ, голова +loadout-group-blueshield-neck = ОСЩ, шея +loadout-group-blueshield-back = ОСЩ, рюкзак # Civilian # Cargo diff --git a/Resources/Locale/ru-RU/ADT/hidden-description/hiddenDescription.ftl b/Resources/Locale/ru-RU/ADT/hidden-description/hiddenDescription.ftl new file mode 100644 index 00000000000..d770067c39a --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/hidden-description/hiddenDescription.ftl @@ -0,0 +1,2 @@ +corvax-hidden-desc-ADTWeaponSaberRevBlueshield-syndicate = [color=#e31735]Энергетический револьвер Офицера Синего Щита. Прекрасная замена энергетическому мечу, технологию которого украло НТ, ради модернизации этого жалкого оружия.[/color] +corvax-hidden-desc-ADTWeaponSaberRevBlueshield-security = [color=#DE3A3A]Это энергетический меч-револьвер! Кажется, это принадлежит Офицеру Синего Щита, очень опасное оружие, если попадёт не в те руки.[/color] diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Access/accesses.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Access/accesses.ftl index 0c64681745c..a36408757e3 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Access/accesses.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Access/accesses.ftl @@ -1,2 +1,3 @@ id-card-access-level-iaa = Агент Внутренних Дел id-card-access-level-magistrate = Магистрат +id-card-access-level-blueshield = Офицер Синего Щита diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/backpack.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/backpacks.ftl similarity index 57% rename from Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/backpack.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/backpacks.ftl index b2d343ef973..8861606ac65 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/backpack.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/backpacks.ftl @@ -3,4 +3,8 @@ ent-ADTClothingBackpackDuffelPathologist = вещмешок патологоан ent-ADTClothingBackpackPathologist = рюкзак патологоанатома .desc = Рюкзак для хранения инструментов и бумаг. ent-ADTClothingBackpackSatchelPathologist = сумка патологоанатома - .desc = Сумка для хранения инструментов и бумаг. \ No newline at end of file + .desc = Сумка для хранения инструментов и бумаг. + +ent-ADTClothingBlueshieldBackpack = рюкзак офицера синего щита + .desc = Крайне вместительный рюкзак с яркой эмблемой щита, предназначенный для хранения охранного и медицинского арсенала Офицеров Синего Щита. + diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/duffels.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/duffels.ftl new file mode 100644 index 00000000000..e7d54246a26 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/duffels.ftl @@ -0,0 +1,2 @@ +ent-ADTClothingBackpackDuffelBlueshield = вещмешок офицера синего щита + .desc = Крайне вместительный вещмешок с яркой эмблемой щита, предназначенный для хранения охранного и медицинского арсенала Офицеров Синего Щита. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/satchels.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/satchels.ftl new file mode 100644 index 00000000000..b2f21d3f2e7 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/satchels.ftl @@ -0,0 +1,2 @@ +ent-ADTClothingBackpackSatchelBlueshield = сумка офицера синего щита + .desc = Крайне вместительная черно-синяя сумка с яркими белыми эмблемами щита, предназначенная для хранения охранного и медицинского арсенала Офицеров Синего Щита. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Belt/belt.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Belt/belt.ftl new file mode 100644 index 00000000000..3b424bd4498 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Belt/belt.ftl @@ -0,0 +1,5 @@ +ent-ADTClothingBeltMedicalSecurity = охранно-медицинский пояс + .desc = Довольно тонкий и при этом оснащённый всеми нужными креплениями пояс, для хранения охранного и медицинского арсенала. +ent-ADTClothingBeltMedicalSecurityFilled = охранно-медицинский пояс + .desc = Довольно тонкий и при этом оснащённый всеми нужными креплениями пояс, для хранения охранного и медицинского арсенала. + .suffix = { "Полный" } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Ears/headsets.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Ears/headsets.ftl index 75f46dc8e15..c9de67eccbd 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Ears/headsets.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Ears/headsets.ftl @@ -4,3 +4,8 @@ ent-ClothingHeadsetLawyer = Гарнитура юриста .desc = Обычная гарнитура юриста. ent-ClothingHeadsetIAA = Гарнитура Агента Внутренних Дел .desc = Переговоры о нарушениях СРП происходят по этой гарнитуре. + +ent-ADTClothingHeadsetBlueshield = гарнитура офицера синего щита + .desc = Гарнитура Офицера Синего Щита, оснащённая всеми каналами станции, а так же связью ЦентКомом. +ent-ADTClothingHeadsetAltBlueshield = полноразмерная гарнитура офицера синего щита + .desc = Полноразмерная гарнитура Офицера Синего Щита, оснащённая всеми каналами станции, а так же связью ЦентКомом. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl new file mode 100644 index 00000000000..30e361dd0aa --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl @@ -0,0 +1,2 @@ +ent-ADTClothingEyesGlassesBlueshield = очки офицера синего щита + .desc = Продвинутые охранные очки, оснащённые не только охранным HUD, но и медицинским, давая полные показатели здоровья цели, но и защищая от вспышек. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hardsuit-helmets.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hardsuit-helmets.ftl new file mode 100644 index 00000000000..e7d23ad01a5 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hardsuit-helmets.ftl @@ -0,0 +1,2 @@ +ent-ADTClothingHeadHelmetHardsuitBlueshield = шлем скафандра офицера синего щита + .desc = Плотный и устойчивый шлем Офицера Синего Щита на основе шлемов Отряда Быстрого Реагирования. Призван держать воздух внутри, пули снаружи. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl new file mode 100644 index 00000000000..5bfca94c4c7 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl @@ -0,0 +1,4 @@ +ent-ADTClothingHeadHatBeretBlueshield = синий берет офицера синего щита + .desc = Синий берет, с золотой кокардой подразделения "Синий Щит". +ent-ADTClothingHeadHatBeretBlueshieldBlack = чёрный берет офицера синего щита + .desc = Чёрный берет, с синей кокардой подразделения "Синий Щит". diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/cloaks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/cloaks.ftl new file mode 100644 index 00000000000..335a0339d16 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/cloaks.ftl @@ -0,0 +1,2 @@ +ent-ADTClothingNeckCloakBlueshield = накидка офицера синего щита + .desc = Синяя накидка с бронированным наплечником, специально для защиты вашего сильного плеча от несчастного случая. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/armor.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/armor.ftl new file mode 100644 index 00000000000..fcaf6b97454 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/armor.ftl @@ -0,0 +1,2 @@ +ent-ADTClothingBlueshieldArmor = бронежилет офицера синего щита + .desc = Бронежилет третьего класса защиты, предназначенный для офицеров "Синего Щита". Дает приемлемую защиту от ударов и среднюю - от огнестрельного оружия. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/hardsuits.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/hardsuits.ftl new file mode 100644 index 00000000000..03e8e7bea7b --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/hardsuits.ftl @@ -0,0 +1,2 @@ +ent-ADTBlueshieldSuit = скафандр офицера синего щита + .desc = Лёгкий боевой скафандр Нанотрейзен, с совсем не украденными у Синдиката технологиями, специально для Офицера Синего Щита и защиты его защищающего глав тела. Уверяю вас, всё это АБСОЛЮТНО легально. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/wintercoats.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/wintercoats.ftl new file mode 100644 index 00000000000..5e316533c8a --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/wintercoats.ftl @@ -0,0 +1,2 @@ +ent-ADTClothingOuterWinterBlueshield = куртка офицера синего щита + .desc = Зимняя куртка Офицера Синего Щита с вшитыми пластинами, призванная защитить не только от холода, но и от небольших физических повреждений. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl new file mode 100644 index 00000000000..c12f26f2950 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl @@ -0,0 +1,8 @@ +ent-ADTClothingUniformPathologistSkirt = юбка-костюм патологоанатома + .desc = Лёгкая юбка-комбинезон для работницы морга. +ent-ADTClothingUniformPathologistSkirtAlt = чёрная юбка-костюм патологоанатома + .desc = Лёгкая юбка-комбинезон для работницы морга. Более угрюмая версия. +ent-ADTClothingUniformJumpskirtBlueshield = юбка и костюм офицера "Синего Щита" + .desc = Юбка и белая рубашка с погонами Офицера "Синего Щита", уже очень скоро она будет окроплена кроваво-алой кровью врагов НТ, перепутавших его с охранником продуктового магазина 21-го века. +ent-ADTClothingUniformJumpskirtBlueshieldTurtleneck = юбка-водолазка офицера синего щита + .desc = Белая удобная водолазка с юбкой для Офицера "Синего Щита" с пришитыми золотыми погонами и ярким именным бейджиком. К сожалению, если вы её наденете, это не будет значить, что вам дадут отпуск. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl index 10e47136346..17463321fb2 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl @@ -2,9 +2,12 @@ ent-ADTClothingUniformsJumpsuitWhiteDiplomatSuitL = Белый костюм ди .desc = Специально сделанный белый костюм дипломата NanoTrasen. ent-ADTClothingUniformPathologistSuit = костюм патологоанатома .desc = Лёгкий комбинезон для работника морга. -ent-ADTClothingUniformPathologistSkirt = юбка-костюм патологоанатома - .desc = Лёгкая юбка-комбинезон для работницы морга. + ent-ADTClothingUniformPathologistSuitAlt = чёрный костюм патологоанатома .desc = Лёгкий комбинезон для работника морга. Более угрюмая версия. -ent-ADTClothingUniformPathologistSkirtAlt = чёрная юбка-костюм патологоанатома - .desc = Лёгкая юбка-комбинезон для работницы морга. Более угрюмая версия. + +ent-ADTClothingUniformJumpsuitBlueshield = костюм офицера "Синего Щита" + .desc = Военные штаны и белая рубашка с погонами Офицера "Синего Щита", уже очень скоро она будет окроплена кроваво-алой кровью врагов НТ, перепутавших его с охранником продуктового магазина 21-го века. + +ent-ADTClothingUniformJumpsuitBlueshieldTurtleneck = водолазка офицера "Синего Щита" + .desc = Белая удобная водолазка Офицера"Синего Щита" с пришитыми золотыми погонами и ярким именным бейджиком. К сожалению, если вы её наденете, это не будет значить, что вам дадут отпуск. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/jobs.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/jobs.ftl index 331c8aebb87..991e8d9a7d8 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/jobs.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/jobs.ftl @@ -3,3 +3,6 @@ ent-SpawnPointMagistrat = Точка спавна магистрата ent-ADTSpawnPointRoboticist = робототехник .desc = { ent-SpawnPointJobBase.desc } + +ent-SpawnADTBlueShieldOfficer = офицер синего щита + .desc = { ent-SpawnPointJobBase.desc } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl index 8e9a814064f..fca2433ab01 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl @@ -6,3 +6,6 @@ ent-ADTPathologistPDA = КПК патологоанатома ent-ADTRoboticistPDA = КПК робототехника .desc = Почему это всё ещё не робот?! + +ent-ADTBlueshieldOfficerPDA = КПК офицера синего щита + .desc = Покажи им, какой он стильный, как он прочен, ведь в нём вся сила NT. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Fun/figurines.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Fun/figurines.ftl new file mode 100644 index 00000000000..72979e58da9 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Fun/figurines.ftl @@ -0,0 +1,2 @@ +ent-ADTToyFigurineBlueshieldOfficer = фигурка офицера синего щита + .desc = Фигурка, изображающая Офицера Синего Щита - благородного защитника глав станции, готового отдать свою жизнь в бою против врагов НТ, ради исполнения своего долга. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/identification_cards.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/identification_cards.ftl index a87586d412d..2389736d637 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/identification_cards.ftl @@ -6,3 +6,6 @@ ent-ADTPathologistIDCard = ID карта патологоанатома ent-ADTRoboticistIDCard = ID карта робототехника .desc = { ent-IDCardStandard.desc } + +ent-ADTBlueShieldOfficerIDCard = ID карта офицера синего щита + .desc = Блестящая карта офицера Синего Щита. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Power/powercell.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Power/powercell.ftl new file mode 100644 index 00000000000..9489be88989 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Power/powercell.ftl @@ -0,0 +1,2 @@ +ent-ADTPowerCellLasgunRevolver = барабанная батарея револьвера + .desc = Барабанная батарея энергетического меча-револьвера обычной ёмкости. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Storage/bsweaponcase.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Storage/bsweaponcase.ftl new file mode 100644 index 00000000000..36bb91eb6cb --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Storage/bsweaponcase.ftl @@ -0,0 +1,3 @@ +ent-ADTBaseWeaponCaseNTBS = оружейный кейс + .suffix = ОСЩ + .desc = Строгий оружейный кейс, скрывающий в себе что-то смертоносное. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Guns.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Guns.ftl index 717929ece8f..af4401cbbb7 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Guns.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Guns.ftl @@ -1,3 +1,7 @@ ent-ADTWeaponPistolDesertEagle = Дезерт Игл .desc = Дезерт Игл, также известный как "пустынный орёл", - это мощный пистолет калибра .44, который выглядит металлическим и блестящим. - .suffix = { "Пистолет" } \ No newline at end of file + .suffix = { "Пистолет" } + +ent-ADTWeaponSaberRevBlueshield = энергетический меч-револьвер +.desc = NTRS-01 - Nanotrasen energy Revolver-Saber model-1, первый рабочий прототип энергетического револьвера с портативном аккумулятором, с интегрированным энергетическим клинком, выданный в полевое испытание всем Офицерам Синего Щита. Крайне редкая и дорогая технология NT, вымеренная до каждой детали, НЕ ПОТЕРЯЙТЕ ЕГО! +.suffix = { "ОСЩ" } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.ftl new file mode 100644 index 00000000000..0c9aa80bddb --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.ftl @@ -0,0 +1,14 @@ +ent-ADTLockerBlueshield = шкаф офицера синего щита + .desc = { ent-LockerBaseSecure.desc } + +ent-ADTLockerBlueshieldFilledHardsuit = шкаф офицера синего щита + .suffix = Заполненный, Скафандр + .desc = { ent-LockerBaseSecure.desc } + +ent-ADTLockerBlueshieldFilled = шкаф офицера синего щита + .suffix = Заполненный + .desc = { ent-LockerBaseSecure.desc } + +ent-ADTSuitStorageBlueshield = хранилище скафандра + .suffix = Офицер синего щита + .desc = { ent-SuitStorageBase.desc } diff --git a/Resources/Prototypes/ADT/Access/blueshield.yml b/Resources/Prototypes/ADT/Access/blueshield.yml new file mode 100644 index 00000000000..d8edb9453a3 --- /dev/null +++ b/Resources/Prototypes/ADT/Access/blueshield.yml @@ -0,0 +1,3 @@ +- type: accessLevel + id: BlueShield + name: id-card-access-level-blueshield diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/ADT/Catalog/Fills/Items/belt.yml new file mode 100644 index 00000000000..7a5f9a30c88 --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Fills/Items/belt.yml @@ -0,0 +1,12 @@ +- type: entity + id: ADTClothingBeltMedicalSecurityFilled + parent: ADTClothingBeltMedicalSecurity + suffix: Filled + components: + - type: StorageFill + contents: + - id: GrenadeFlashBang + - id: TearGasGrenade + - id: Stunbaton + - id: Handcuffs + - id: Handcuffs diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/centcomm.yml b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/centcomm.yml new file mode 100644 index 00000000000..344abd1d7fc --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/centcomm.yml @@ -0,0 +1,41 @@ +# Blueshield +- type: entity + id: ADTLockerBlueshieldFilledHardsuit + suffix: Filled, Hardsuit + parent: ADTLockerBlueshield + components: + - type: StorageFill + contents: + - id: ADTBlueshieldSuit + - id: MedkitCombatFilled + - id: MedkitBruteFilled + - id: WeaponDisabler + - id: ADTBaseWeaponCaseNTBS + # - id: ADTUnderwearBoxBlueshield + - id: ADTClothingHeadsetAltBlueshield + - id: ADTClothingHeadHatBeretBlueshield + - id: ADTClothingNeckCloakBlueshield + - id: ADTClothingOuterWinterBlueshield + - id: ClothingShoesBootsJack + - id: ADTClothingUniformJumpskirtBlueshieldTurtleneck + - id: ADTClothingUniformJumpsuitBlueshieldTurtleneck + +- type: entity + id: ADTLockerBlueshieldFilled + suffix: Filled + parent: ADTLockerBlueshield + components: + - type: StorageFill + contents: + - id: MedkitCombatFilled + - id: MedkitBruteFilled + - id: WeaponDisabler + - id: ADTBaseWeaponCaseNTBS + # - id: ADTUnderwearBoxBlueshield + - id: ADTClothingHeadsetAltBlueshield + - id: ADTClothingHeadHatBeretBlueshield + - id: ADTClothingNeckCloakBlueshield + - id: ADTClothingOuterWinterBlueshield + - id: ClothingShoesBootsJack + - id: ADTClothingUniformJumpskirtBlueshieldTurtleneck + - id: ADTClothingUniformJumpsuitBlueshieldTurtleneck 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..15228959613 --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/suit_storage.yml @@ -0,0 +1,13 @@ +#Blueshield's hardsuit +- type: entity + id: ADTSuitStorageBlueshield + parent: SuitStorageBase + suffix: Blueshield + components: + - type: StorageFill + contents: + - id: OxygenTankFilled + - id: ADTBlueshieldSuit + - id: ClothingMaskBreath + - type: AccessReader + access: [["BlueShield"]] diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml new file mode 100644 index 00000000000..422a7933928 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml @@ -0,0 +1,10 @@ +#ОСЩ + +- type: entity + parent: ClothingBackpackSecurity + id: ADTClothingBlueshieldBackpack + name: blueshield's backpack + description: criminalst backpack + components: + - type: Sprite + sprite: ADT/Clothing/Back/blueshield_backpack.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/duffel.yml new file mode 100644 index 00000000000..5d4eeb78cb9 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/duffel.yml @@ -0,0 +1,9 @@ +#ОСЩ +- type: entity + parent: ClothingBackpackDuffelSecurity + id: ADTClothingBackpackDuffelBlueshield + name: blueshield duffel bag + description: A large duffel bag to hold medical and security equipment. + components: + - type: Sprite + sprite: ADT/Clothing/Back/blueshield_duffel.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml new file mode 100644 index 00000000000..df4753b3865 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml @@ -0,0 +1,9 @@ +#ОСЩ +- type: entity + parent: ClothingBackpackSatchelSecurity + id: ADTClothingBackpackSatchelBlueshield + name: blueshield satchel + description: A satchel to hold medical and security equipment + components: + - type: Sprite + sprite: ADT/Clothing/Back/blueshield_satchel.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml index c232b37e780..c3e6da54f53 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml @@ -1,3 +1,94 @@ +# Blueshield +- type: entity + id: ADTClothingBeltMedicalSecurity + name: medical-security belt + description: Special medical-security belt. + parent: ClothingBeltStorageBase + components: + - type: Storage + grid: + - 0,0,7,1 + maxItemSize: Normal + whitelist: + tags: + - Taser + - SecBeltEquip + - Sidearm + - MagazinePistol + - MagazineMagnum + - Patch + - Wrench + - Bottle + - Spray + - Brutepack + - Bloodpack + - Gauze + - Ointment + - CigPack + - PillCanister + - Radio + - DiscreteHealthAnalyzer + - Defibrillator + - SurgeryTool + components: + - Stunbaton + - FlashOnTrigger + - SmokeOnTrigger + - Flash + - Handcuff + - BallisticAmmoProvider + - Ammo + - Hypospray + - Injector + - Pill + - HandLabeler + - type: ItemMapper + mapLayers: + flashbang: + whitelist: + components: + - FlashOnTrigger + stunbaton: + whitelist: + components: + - Stunbaton + tear_gas_grenade: + whitelist: + components: + - SmokeOnTrigger + bottle: + whitelist: + tags: + - Bottle + hypo: + whitelist: + components: + - Hypospray + pill: + whitelist: + components: + - Pill + tags: + - PillCanister + bottle_spray: + whitelist: + tags: + - Spray + defibrillator: + whitelist: + tags: + - Defibrillator + wrench: + whitelist: + tags: + - Wrench + sprite: Clothing/Belt/belt_overlay.rsi + - type: Appearance + - type: Sprite + sprite: ADT/Clothing/Belt/medical_security_belt.rsi + - type: Clothing + sprite: ADT/Clothing/Belt/medical_security_belt.rsi + - type: entity parent: [ClothingBeltBase, ClothingSlotBase] id: ADTClothingBeltSheathOCK diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/ADT/Entities/Clothing/Ears/headsets.yml index 200cf36bc4c..50781754765 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Ears/headsets.yml @@ -45,3 +45,13 @@ - EncryptionKeyCommon - type: Sprite sprite: Clothing/Ears/Headsets/servicesecurity.rsi + +- type: entity + parent: ClothingHeadsetCentCom + id: ADTClothingHeadsetBlueshield + name: blueshield headset + components: + - type: Sprite + sprite: ADT/Clothing/Ears/Headsets/blueshield.rsi + - type: Clothing + sprite: ADT/Clothing/Ears/Headsets/blueshield.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/ADT/Entities/Clothing/Ears/headsets_alt.yml new file mode 100644 index 00000000000..937b97a24c5 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Ears/headsets_alt.yml @@ -0,0 +1,9 @@ +- type: entity + parent: ClothingHeadsetAltCentCom + id: ADTClothingHeadsetAltBlueshield + name: blueshield over-ear headset + components: + - type: Sprite + sprite: ADT/Clothing/Ears/Headsets/blueshield.rsi + - type: Clothing + sprite: ADT/Clothing/Ears/Headsets/blueshield.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml new file mode 100644 index 00000000000..40d18dcd7eb --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml @@ -0,0 +1,16 @@ +- type: entity + parent: ClothingEyesGlassesSecurity + id: ADTClothingEyesGlassesBlueshield + name: blueshield's glasses + description: Upgraded sunglasses that provide flash immunity and a medical-security HUDs. + components: + - type: Sprite + sprite: ADT/Clothing/Eyes/Glasses/blueshield.rsi + - type: Clothing + sprite: ADT/Clothing/Eyes/Glasses/blueshield.rsi + - type: ShowHealthBars + damageContainers: + - Biological + - type: ShowHealthIcons + damageContainers: + - Biological diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml index 2b3a51a6d85..15c5200e8f8 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml @@ -22,3 +22,50 @@ Piercing: 0.9 Heat: 0.9 Radiation: 0.9 + +# Blueshield +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ADTClothingHeadHelmetHardsuitBlueshield + noSpawn: true + name: blueshield hardsuit helmet + description: + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi + layers: + - state: icon + - state: icon-light + shader: unshaded + map: [ "light" ] + - type: HandheldLight + addPrefix: false + - type: ToggleableLightVisuals + spriteLayer: light + clothingVisuals: + head: + - state: equipped-HELMET + - state: equipped-HELMET-unshading + shader: unshaded + - state: equipped-HELMET-light + shader: unshaded + - type: Clothing + clothingVisuals: + head: + - state: equipped-HELMET + - state: equipped-HELMET-unshading + shader: unshaded + - type: PointLight + color: "#fff7cd" + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + Radiation: 0.8 + Caustic: 0.85 + - type: PressureProtection + highPressureMultiplier: 0.6 + lowPressureMultiplier: 1000 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml index e2c39b11441..00602dccb63 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml @@ -9,3 +9,24 @@ - type: Clothing sprite: Clothing/Head/Hats/urs_hat.rsi +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatBeretBlueshieldBlack + name: blueshield officer's beret + description: A corporate black beret with a blueshield officer's rank emblem. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/blueshield_beret_black.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/blueshield_beret_black.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatBeretBlueshield + name: blueshield officer's beret + description: A corporate blue beret with a blueshield officer's rank emblem. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/blueshield_beret.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/blueshield_beret.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml new file mode 100644 index 00000000000..174b652d927 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml @@ -0,0 +1,9 @@ +# Blueshield +- type: entity + parent: ClothingNeckBase + id: ADTClothingNeckCloakBlueshield + name: blueshield cloak + description: A blue cape with an armored shoulder pad, especially for the protection of station heads. + components: + - type: Sprite + sprite: ADT/Clothing/Neck/Cloaks/blueshield_neck.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml new file mode 100644 index 00000000000..dd6576cfd23 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml @@ -0,0 +1,19 @@ +- type: entity + parent: ClothingOuterArmorBasic + id: ADTClothingBlueshieldArmor + name: blueshield bulletproof vest + description: A Type III heavy bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.4 + Heat: 0.8 + - type: ExplosionResistance + damageCoefficient: 0.80 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuit.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuit.yml index 0e7d2713e6f..e9ec46e9943 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuit.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuit.yml @@ -5,9 +5,9 @@ description: The cheapest ERT hardsuit choice, designed especially for economy and anti-riot actions components: - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/riotert.yml + sprite: ADT/Clothing/OuterClothing/Hardsuits/riotert.rsi - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/riotert.yml + sprite: ADT/Clothing/OuterClothing/Hardsuits/riotert.rsi - type: ToggleableClothing clothingPrototype: ADTClothingHeadHelmetHardsuitRiotERT - type: Armor @@ -21,3 +21,35 @@ - type: ClothingSpeedModifier walkModifier: 0.9 sprintModifier: 0.9 + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTBlueshieldSuit + name: blueshield's hardsuit + description: A rugged and mobile spacesuit for the lives of high-ranking members of Nanotrasen. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + - type: HeldSpeedModifier + - type: PressureProtection + highPressureMultiplier: 0.05 + lowPressureMultiplier: 10000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.5 + Heat: 0.7 + Radiation: 0.3 + Caustic: 0.5 + # Stun: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.6 + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetHardsuitBlueshield diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/wintercoats.yml new file mode 100644 index 00000000000..fdcb16288b3 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/wintercoats.yml @@ -0,0 +1,15 @@ +- type: entity + parent: ClothingOuterWinterCoat + id: ADTClothingOuterWinterBlueshield + name: blueshield's winter coat + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/WinterCoats/blueshield_winter.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/WinterCoats/blueshield_winter.rsi + - type: Armor + modifiers: + coefficients: + Slash: 0.9 + Heat: 0.9 + Piercing: 0.9 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml index 014d6f6474a..8c744ffb2cb 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml @@ -8,3 +8,26 @@ sprite: ADT/Clothing/Uniforms/Jumpsuit/white-diplomat-suit.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/white-diplomat-suit.rsi + +# Blueshield +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitBlueshield + name: blueshield's jumpsuit + description: blueshield's jumpsuit + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitBlueshieldTurtleneck + name: blueshield's turtleneck + description: blueshield's turtleneck + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml new file mode 100644 index 00000000000..888062e74c3 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml @@ -0,0 +1,22 @@ +# Blueshield +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpskirtBlueshield + name: blueshield's jumpskirt + description: blueshield's jumpskirt + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpskirtBlueshieldTurtleneck + name: blueshield's turtleneck skirt + description: blueshield's turtleneck + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield_woman.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield_woman.rsi diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml index 8b7daec37ea..92a30c384fd 100644 --- a/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml @@ -56,3 +56,15 @@ layers: - state: green - state: scientist + +- type: entity + id: SpawnADTBlueShieldOfficer + parent: ADTSpawnPointJobBase + name: ADTBlueShieldOfficer + components: + - type: SpawnPoint + job_id: ADTBlueShieldOfficer + - type: Sprite + layers: + - state: green + - state: blueshield diff --git a/Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml index 2660c105ac1..f5af95083cc 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml @@ -39,3 +39,24 @@ accentVColor: "#15616b" - type: Icon state: pda-pathologist + +- type: entity + parent: BasePDA + id: ADTBlueshieldOfficerPDA + name: BlueShield PDA + description: Smells like protection. + components: + - type: Sprite + sprite: ADT/Objects/Devices/pda.rsi + - type: Pda + id: ADTBlueShieldOfficerIDCard + state: pda-blueshield + - type: PdaBorderColor + borderColor: "#424248" + accentHColor: "#2851a4" + accentVColor: "#e1e1e1" + - type: Icon + sprite: ADT/Objects/Devices/pda.rsi + state: pda-blueshield + - type: HealthAnalyzer + scanDelay: 1.2 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..9d8dfefda6b --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/figurines.yml @@ -0,0 +1,9 @@ +- type: entity + parent: BaseFigurine + id: ADTToyFigurineBlueshieldOfficer + name: blueshield officer figure + description: A figurine depicting the blueshield officer, austere and blue, stands guard over the station government. I guess. + components: + - type: Sprite + sprite: ADT/Objects/Fun/figurines.rsi + state: blueshield diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml index 83d6930836f..613f791ef86 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml @@ -35,3 +35,16 @@ - state: idroboticist - type: PresetIdCard job: ADTRoboticist + +- type: entity + parent: IDCardStandard + id: ADTBlueShieldOfficerIDCard + name: Blue Shield Officer ID card + components: + - type: Sprite + sprite: ADT/Objects/Misc/id_cards.rsi + layers: + - state: centcom + - state: idblueshield + - type: PresetIdCard + job: ADTBlueShieldOfficer diff --git a/Resources/Prototypes/ADT/Entities/Objects/Power/powercell.yml b/Resources/Prototypes/ADT/Entities/Objects/Power/powercell.yml new file mode 100644 index 00000000000..304e24770d1 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Power/powercell.yml @@ -0,0 +1,44 @@ +- type: entity + name: revolver power cell + description: lasgun power sell + id: ADTPowerCellLasgunRevolver + parent: BaseItem + components: + - type: Battery + maxCharge: 1500 + startingCharge: 1500 + - type: Explosive + explosionType: Default + maxIntensity: 200 + intensitySlope: 1.5 + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 4 + zeroVisible: false + - type: SolutionContainerManager + solutions: + battery: + maxVol: 5 + - type: InjectableSolution + solution: battery + - type: DrawableSolution + solution: battery + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Zinc + Quantity: 5 + - type: Tag + tags: + - ADTLasgunRevolverCell + - type: Appearance + - type: ProjectileBatteryAmmoProvider + proto: ADTBulletLaserMK2 + fireCost: 220 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml new file mode 100644 index 00000000000..8f40776a4a7 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/bsweaponcase.yml @@ -0,0 +1,28 @@ +- type: entity + id: ADTBaseWeaponCaseNTBS + name: weapon case + description: Weapon case, special designed for ERT. + parent: [ BaseStorageItem, BaseBagOpenClose ] + components: + - type: Sprite + sprite: ADT/Objects/Storage/weaponcase.rsi + layers: + - state: closed + - state: open + map: ["openLayer"] + - type: Appearance + - type: Item + sprite: ADT/Objects/Storage/weaponcase.rsi + size: Ginormous + - type: Storage + maxItemSize: Normal + grid: + - 0,0,1,0 + - 0,1,0,1 + - 3,0,6,1 + - type: StorageFill + contents: + - id: ADTWeaponSaberRevBlueshield + - id: ADTPowerCellLasgunRevolver + - id: ADTPowerCellLasgunRevolver + - id: ADTPowerCellLasgunRevolver diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index c91b8597337..9dc4683fc46 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -30,3 +30,23 @@ forceSound: true - type: EmpOnCollide energyConsumption: 80000 + +- type: entity + name: Laser bolt + id: ADTBulletLaserMK2 + parent: BulletDisabler + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + layers: + - state: omnilaser + shader: unshaded + - type: Projectile + impactEffect: BulletImpactEffectDisabler + damage: + types: + Heat: 25 + soundHit: + collection: WeakHit + forceSound: true diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/saber_revolvers.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/saber_revolvers.yml new file mode 100644 index 00000000000..83f1746d7c0 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/saber_revolvers.yml @@ -0,0 +1,112 @@ +- type: entity + name: NTRS-01 energy revolver-saber + parent: [EnergySword, BaseWeaponPowerCellSmall] + id: ADTWeaponSaberRevBlueshield + description: + components: + - type: Item + size: Small + sprite: ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi + inhandVisuals: + left: + - state: inhand-left + right: + - state: inhand-right + shape: + - 0,0,1,0 + - 0,1,0,1 + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi + layers: + - state: icon_saber + color: "#FFFFFF" + visible: false + shader: unshaded + map: [ "blade" ] + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: AmmoCounter + - type: PointLight + enabled: false + radius: 2 + energy: 2 + color: white + netsync: false + - type: Gun + fireRate: 1.8 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + useKey: false + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 5 + Slash: 5 + Structural: 10 + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1 + damage: + types: + Blunt: 4.5 + - type: ItemToggleMeleeWeapon + activatedSoundOnHit: + path: /Audio/Weapons/eblade1.ogg + params: + variation: 0.250 + activatedSoundOnHitNoDamage: + path: /Audio/Weapons/eblade1.ogg + params: + variation: 0.250 + volume: -10 + activatedSoundOnSwing: + path: /Audio/Weapons/eblademiss.ogg + params: + variation: 0.125 + activatedDamage: + types: + Slash: 5 + Heat: 5 + Structural: 20 + - type: GunRequiresWield + - type: ToggleableLightVisuals + spriteLayer: blade + inhandVisuals: + left: + - state: inhand-left-blade + shader: unshaded + right: + - state: inhand-right-blade + shader: unshaded + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: true + - type: HiddenDescription + entries: + - label: corvax-hidden-desc-ADTWeaponSaberRevBlueshield-syndicate + whitelistMind: + components: + - TraitorRole + - NukeOperative + - label: corvax-hidden-desc-ADTWeaponSaberRevBlueshield-security + jobRequired: + - HeadOfSecurity + - Detective + - SecurityCadet + - SecurityOfficer + - Warden + - type: Appearance + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: ADTPowerCellLasgunRevolver + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + whitelist: + tags: + - ADTLasgunRevolverCell diff --git a/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml new file mode 100644 index 00000000000..462a683d9fc --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -0,0 +1,14 @@ +- type: entity + id: ADTLockerBlueshield + parent: LockerBaseSecure + name: blue shield's locker + components: + - type: Appearance + - type: Sprite + sprite: ADT/Structures/Storage/closet.rsi + - type: EntityStorageVisuals + stateBaseClosed: blueshield + stateDoorOpen: blueshield_open + stateDoorClosed: blueshield_door + - type: AccessReader + access: [["BlueShield"]] diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Command/blueshield.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Command/blueshield.yml new file mode 100644 index 00000000000..341c64bfd1b --- /dev/null +++ b/Resources/Prototypes/ADT/Loadouts/Jobs/Command/blueshield.yml @@ -0,0 +1,93 @@ +# Head +- type: loadout + id: ADTBlueshieldHeadBeret + equipment: ADTBlueshieldHeadBeret + +- type: startingGear + id: ADTBlueshieldHeadBeret + equipment: + head: ADTClothingHeadHatBeretBlueshield + +- type: loadout + id: ADTBlueshieldHeadBeretBlack + equipment: ADTBlueshieldHeadBeretBlack + +- type: startingGear + id: ADTBlueshieldHeadBeretBlack + equipment: + head: ADTClothingHeadHatBeretBlueshieldBlack + +# Jumpsuit +- type: loadout + id: ADTBlueshieldJumpsuit + equipment: ADTBlueshieldJumpsuit + +- type: startingGear + id: ADTBlueshieldJumpsuit + equipment: + jumpsuit: ADTClothingUniformJumpsuitBlueshield + +- type: loadout + id: ADTBlueshieldJumpskirt + equipment: ADTBlueshieldJumpskirt + +- type: startingGear + id: ADTBlueshieldJumpskirt + equipment: + jumpsuit: ADTClothingUniformJumpskirtBlueshield + +- type: loadout + id: ADTBlueshieldJumpsuitTurtleneck + equipment: ADTBlueshieldJumpsuitTurtleneck + +- type: startingGear + id: ADTBlueshieldJumpsuitTurtleneck + equipment: + jumpsuit: ADTClothingUniformJumpsuitBlueshieldTurtleneck + +- type: loadout + id: ADTBlueshieldJumpskirtTurtleneck + equipment: ADTBlueshieldJumpskirtTurtleneck + +- type: startingGear + id: ADTBlueshieldJumpskirtTurtleneck + equipment: + jumpsuit: ADTClothingUniformJumpskirtBlueshieldTurtleneck + +# Neck +- type: loadout + id: ADTBlueshieldCloak + equipment: ADTBlueshieldCloak + +- type: startingGear + id: ADTBlueshieldCloak + equipment: + neck: ADTClothingNeckCloakBlueshield + +# Back +- type: loadout + id: ADTBlueshieldBackpack + equipment: ADTBlueshieldBackpack + +- type: startingGear + id: ADTBlueshieldBackpack + equipment: + back: ADTClothingBlueshieldBackpack + +- type: loadout + id: ADTBlueshieldSatchel + equipment: ADTBlueshieldSatchel + +- type: startingGear + id: ADTBlueshieldSatchel + equipment: + back: ADTClothingBackpackSatchelBlueshield + +- type: loadout + id: ADTBlueshieldDuffel + equipment: ADTBlueshieldDuffel + +- type: startingGear + id: ADTBlueshieldDuffel + equipment: + back: ADTClothingBackpackDuffelBlueshield diff --git a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml index facd4eb165d..25e87e1506c 100644 --- a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml @@ -94,3 +94,42 @@ - LatexGloves - PurpleGloves - RobohandsGloves + +#Blueshield +- type: loadoutGroup + id: ADTBlueshieldJumpsuit + name: loadout-group-blueshield-jumpsuit + minLimit: 1 + maxLimit: 1 + loadouts: + - ADTBlueshieldJumpsuit + - ADTBlueshieldJumpskirt + - ADTBlueshieldJumpsuitTurtleneck + - ADTBlueshieldJumpskirtTurtleneck + +- type: loadoutGroup + id: ADTBlueshieldHead + name: loadout-group-blueshield-head + minLimit: 0 + maxLimit: 1 + loadouts: + - ADTBlueshieldHeadBeret + - ADTBlueshieldHeadBeretBlack + +- type: loadoutGroup + id: ADTBlueshieldNeck + name: loadout-group-blueshield-neck + minLimit: 0 + maxLimit: 1 + loadouts: + - ADTBlueshieldCloak + +- type: loadoutGroup + id: ADTBlueshieldBack + name: loadout-group-blueshield-back + minLimit: 1 + maxLimit: 1 + loadouts: + - ADTBlueshieldBackpack + - ADTBlueshieldSatchel + - ADTBlueshieldDuffel diff --git a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml index dd613aacad5..1a71f96f28f 100644 --- a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml @@ -44,3 +44,16 @@ - Survival - Trinkets - GroupSpeciesBreathTool + +- type: roleLoadout + id: JobADTBlueShieldOfficer + groups: + - Inventory # Corvax-Loadouts + - GroupTankHarness + - ADTBlueshieldHead + - ADTBlueshieldJumpsuit + - ADTBlueshieldNeck + - ADTBlueshieldBack + - SurvivalSecurity + - Trinkets + - GroupSpeciesBreathToolSecurity diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Command/blueshieldofficer.yml b/Resources/Prototypes/ADT/Roles/Jobs/Command/blueshieldofficer.yml new file mode 100644 index 00000000000..098800c0b76 --- /dev/null +++ b/Resources/Prototypes/ADT/Roles/Jobs/Command/blueshieldofficer.yml @@ -0,0 +1,56 @@ +- type: job + id: ADTBlueShieldOfficer + name: job-name-ADTBlueShieldOfficer + description: job-description-ADTBlueShieldOfficer + playTimeTracker: JobADTBlueShieldOfficer + requirements: + - !type:RoleTimeRequirement + role: JobCaptain + time: 36000 #10 hrs + - !type:RoleTimeRequirement + role: JobHeadOfSecurity + time: 36000 #10 hrs + - !type:RoleTimeRequirement + role: JobChiefMedicalOfficer + time: 18000 #5 hrs + weight: 15 + startingGear: ADTBlueShieldOfficerGear + icon: "JobIconADTBlueShieldOfficer" + supervisors: job-supervisors-centcom + canBeAntag: false + access: + - Captain + - Command + - Brig + - Security + - Armory + - Maintenance + - Service + - External + - Research + - Medical + - Engineering + - Cargo + # - Centcom + - BlueShield + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + +- type: startingGear + id: ADTBlueShieldOfficerGear + equipment: + # head: ADTClothingHeadHatBeretBlueshieldBlack + eyes: ADTClothingEyesGlassesBlueshield + ears: ADTClothingHeadsetBlueshield + # jumpsuit: ADTClothingUniformJumpsuitBlueshield + # back: ADTClothingBlueshieldBackpack + shoes: ClothingShoesBootsCombatFilled + outerClothing: ADTClothingBlueshieldArmor + belt: ADTClothingBeltMedicalSecurityFilled + gloves: ClothingHandsGlovesCombat + id: ADTBlueshieldOfficerPDA + pocket2: HandheldCrewMonitor + # innerClothingSkirt: ClothingUniformJumpskirtBlueshield + # satchel: ADTClothingBackpackSatchelBlueshield + # duffelbag: ADTClothingBackpackDuffelBlueshield diff --git a/Resources/Prototypes/ADT/Roles/play_time_trackers.yml b/Resources/Prototypes/ADT/Roles/play_time_trackers.yml index dc77c0fb415..65533b16dce 100644 --- a/Resources/Prototypes/ADT/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/ADT/Roles/play_time_trackers.yml @@ -6,3 +6,6 @@ - type: playTimeTracker id: JobRoboticist + +- type: playTimeTracker + id: JobADTBlueShieldOfficer diff --git a/Resources/Prototypes/ADT/StatusIcon/job.yml b/Resources/Prototypes/ADT/StatusIcon/job.yml index aef4c3dbf9d..82788676db0 100644 --- a/Resources/Prototypes/ADT/StatusIcon/job.yml +++ b/Resources/Prototypes/ADT/StatusIcon/job.yml @@ -4,3 +4,10 @@ icon: sprite: /Textures/ADT/Interface/Misc/job_icons.rsi state: Magistrat + +- type: statusIcon + parent: JobIcon + id: JobIconADTBlueShieldOfficer + icon: + sprite: /Textures/ADT/Interface/Misc/job_icons.rsi + state: ADTBlueShieldOfficer diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml index c2f4fe3da9d..aa6cfab49aa 100644 --- a/Resources/Prototypes/ADT/tags.yml +++ b/Resources/Prototypes/ADT/tags.yml @@ -1,2 +1,11 @@ - type: Tag - id: ADTMothFriendlyFood \ No newline at end of file + id: ADTMothFriendlyFood + +- type: Tag + id: Patch + +- type: Tag + id: Defibrillator + +- type: Tag + id: ADTLasgunRevolverCell diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index 0ac85d29ee5..eb6387abed1 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -33,4 +33,5 @@ - Hydroponics - Atmospherics - IAA - - Magistrate + - Magistrate # ADT-Roles + - BlueShield # ADT-Roles diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml index dbbe86678f0..1335573f9bc 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml @@ -133,3 +133,5 @@ - id: ToyFigurineHamlet prob: 0.20 orGroup: SpacemenFig + - id: ADTToyFigurineBlueshieldOfficer #ADT-Tweak + orGroup: SpacemenFig diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 62e027d9e2d..ed33c7f14f0 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -44,6 +44,7 @@ - HeadOfSecurity - ResearchDirector - Quartermaster + - ADTBlueShieldOfficer # ADT-Roles primary: false weight: 100 diff --git a/Resources/Textures/ADT/Clothing/Back/blueshield_backpack.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Clothing/Back/blueshield_backpack.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..8a868399ae3 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/blueshield_backpack.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/blueshield_backpack.rsi/icon.png b/Resources/Textures/ADT/Clothing/Back/blueshield_backpack.rsi/icon.png new file mode 100644 index 00000000000..55f0b371424 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/blueshield_backpack.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/blueshield_backpack.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Back/blueshield_backpack.rsi/inhand-left.png new file mode 100644 index 00000000000..4e4080857a1 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/blueshield_backpack.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/blueshield_backpack.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Back/blueshield_backpack.rsi/inhand-right.png new file mode 100644 index 00000000000..371fea7cd82 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/blueshield_backpack.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/blueshield_backpack.rsi/meta.json b/Resources/Textures/ADT/Clothing/Back/blueshield_backpack.rsi/meta.json new file mode 100644 index 00000000000..06136987b0e --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Back/blueshield_backpack.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Tamioki.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Back/blueshield_duffel.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Clothing/Back/blueshield_duffel.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..74dd772a1a1 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/blueshield_duffel.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/blueshield_duffel.rsi/icon.png b/Resources/Textures/ADT/Clothing/Back/blueshield_duffel.rsi/icon.png new file mode 100644 index 00000000000..0c915cd7942 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/blueshield_duffel.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/blueshield_duffel.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Back/blueshield_duffel.rsi/inhand-left.png new file mode 100644 index 00000000000..98ef9bd14d4 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/blueshield_duffel.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/blueshield_duffel.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Back/blueshield_duffel.rsi/inhand-right.png new file mode 100644 index 00000000000..99b7bb1f0d9 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/blueshield_duffel.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/blueshield_duffel.rsi/meta.json b/Resources/Textures/ADT/Clothing/Back/blueshield_duffel.rsi/meta.json new file mode 100644 index 00000000000..06136987b0e --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Back/blueshield_duffel.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Tamioki.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Back/blueshield_satchel.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Clothing/Back/blueshield_satchel.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..77d8f2830ba Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/blueshield_satchel.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/blueshield_satchel.rsi/icon.png b/Resources/Textures/ADT/Clothing/Back/blueshield_satchel.rsi/icon.png new file mode 100644 index 00000000000..8136e3e5aff Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/blueshield_satchel.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/blueshield_satchel.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Back/blueshield_satchel.rsi/inhand-left.png new file mode 100644 index 00000000000..5e150a24149 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/blueshield_satchel.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/blueshield_satchel.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Back/blueshield_satchel.rsi/inhand-right.png new file mode 100644 index 00000000000..d5924373ec5 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/blueshield_satchel.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/blueshield_satchel.rsi/meta.json b/Resources/Textures/ADT/Clothing/Back/blueshield_satchel.rsi/meta.json new file mode 100644 index 00000000000..a124e4fa069 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Back/blueshield_satchel.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:JayJacobs#1187", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Belt/medical_security_belt.rsi/equipped-BELT.png b/Resources/Textures/ADT/Clothing/Belt/medical_security_belt.rsi/equipped-BELT.png new file mode 100644 index 00000000000..36d5d9bf6c5 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Belt/medical_security_belt.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Clothing/Belt/medical_security_belt.rsi/icon.png b/Resources/Textures/ADT/Clothing/Belt/medical_security_belt.rsi/icon.png new file mode 100644 index 00000000000..5a5a4636828 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Belt/medical_security_belt.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Belt/medical_security_belt.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Belt/medical_security_belt.rsi/inhand-left.png new file mode 100644 index 00000000000..c59dd145424 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Belt/medical_security_belt.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Belt/medical_security_belt.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Belt/medical_security_belt.rsi/inhand-right.png new file mode 100644 index 00000000000..2ebc2fb6bfa Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Belt/medical_security_belt.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Belt/medical_security_belt.rsi/meta.json b/Resources/Textures/ADT/Clothing/Belt/medical_security_belt.rsi/meta.json new file mode 100644 index 00000000000..8bc24eaeb13 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Belt/medical_security_belt.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Skyrat-TG at https://github.com/Skyrat-SS13/Skyrat-tg", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Ears/Headsets/blueshield.rsi/alt-equipped-EARS.png b/Resources/Textures/ADT/Clothing/Ears/Headsets/blueshield.rsi/alt-equipped-EARS.png new file mode 100644 index 00000000000..97572386c60 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Ears/Headsets/blueshield.rsi/alt-equipped-EARS.png differ diff --git a/Resources/Textures/ADT/Clothing/Ears/Headsets/blueshield.rsi/equipped-EARS.png b/Resources/Textures/ADT/Clothing/Ears/Headsets/blueshield.rsi/equipped-EARS.png new file mode 100644 index 00000000000..b095fb0ee33 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Ears/Headsets/blueshield.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/ADT/Clothing/Ears/Headsets/blueshield.rsi/icon.png b/Resources/Textures/ADT/Clothing/Ears/Headsets/blueshield.rsi/icon.png new file mode 100644 index 00000000000..4050850856e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Ears/Headsets/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Ears/Headsets/blueshield.rsi/icon_alt.png b/Resources/Textures/ADT/Clothing/Ears/Headsets/blueshield.rsi/icon_alt.png new file mode 100644 index 00000000000..1076c3c7722 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Ears/Headsets/blueshield.rsi/icon_alt.png differ diff --git a/Resources/Textures/ADT/Clothing/Ears/Headsets/blueshield.rsi/meta.json b/Resources/Textures/ADT/Clothing/Ears/Headsets/blueshield.rsi/meta.json new file mode 100644 index 00000000000..6ff7e12a761 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Ears/Headsets/blueshield.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Tamioki.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_alt" + }, + { + "name": "equipped-EARS", + "directions": 4 + }, + { + "name": "alt-equipped-EARS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/blueshield.rsi/equipped-EYES-hamster.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/blueshield.rsi/equipped-EYES-hamster.png new file mode 100644 index 00000000000..6097e85c832 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Eyes/Glasses/blueshield.rsi/equipped-EYES-hamster.png differ diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/blueshield.rsi/equipped-EYES.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/blueshield.rsi/equipped-EYES.png new file mode 100644 index 00000000000..ed1c16ef148 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Eyes/Glasses/blueshield.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/blueshield.rsi/icon.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/blueshield.rsi/icon.png new file mode 100644 index 00000000000..875f9745f57 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Eyes/Glasses/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/blueshield.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..388d8f90c21 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Eyes/Glasses/blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/blueshield.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..72a70ec90b6 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Eyes/Glasses/blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/blueshield.rsi/meta.json b/Resources/Textures/ADT/Clothing/Eyes/Glasses/blueshield.rsi/meta.json new file mode 100644 index 00000000000..d3a337bc26e --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Eyes/Glasses/blueshield.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Skyrat-TG at https://github.com/Skyrat-SS13/Skyrat-tg", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "equipped-EYES-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/equipped-HELMET-light.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/equipped-HELMET-light.png new file mode 100644 index 00000000000..68cdd4ce721 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/equipped-HELMET-light.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/equipped-HELMET-unshading.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/equipped-HELMET-unshading.png new file mode 100644 index 00000000000..4668a1e1745 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/equipped-HELMET-unshading.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..ee9a5d6bf46 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/icon-light.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/icon-light.png new file mode 100644 index 00000000000..309f6631962 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/icon-light.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/icon.png new file mode 100644 index 00000000000..942401ade2e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/meta.json new file mode 100644 index 00000000000..accb99c8fe5 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Tamioki.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-light" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulp", + "directions": 4 + }, + { + "name": "equipped-HELMET-unshading", + "directions": 4 + }, + { + "name": "equipped-HELMET-light", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/off-equipped-HELMET-vulp.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/off-equipped-HELMET-vulp.png new file mode 100644 index 00000000000..d62306fba71 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi/off-equipped-HELMET-vulp.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..ad0b59b6880 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret.rsi/icon.png new file mode 100644 index 00000000000..38986536bfa Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret.rsi/inhand-left.png new file mode 100644 index 00000000000..7fdded4feb6 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret.rsi/inhand-right.png new file mode 100644 index 00000000000..da8b5207a18 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret.rsi/meta.json new file mode 100644 index 00000000000..a14543c06cb --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Tamioki", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left" + }, + { + "name": "inhand-right" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret_black.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret_black.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..2354e1bd1e6 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret_black.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret_black.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret_black.rsi/icon.png new file mode 100644 index 00000000000..6954cc603fd Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret_black.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret_black.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret_black.rsi/inhand-left.png new file mode 100644 index 00000000000..2bd11fa4888 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret_black.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret_black.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret_black.rsi/inhand-right.png new file mode 100644 index 00000000000..5aa89de95eb Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret_black.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret_black.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret_black.rsi/meta.json new file mode 100644 index 00000000000..a14543c06cb --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret_black.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Tamioki", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left" + }, + { + "name": "inhand-right" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Neck/Cloaks/blueshield_neck.rsi/equipped-NECK.png b/Resources/Textures/ADT/Clothing/Neck/Cloaks/blueshield_neck.rsi/equipped-NECK.png new file mode 100644 index 00000000000..8f7f6d39b9b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Neck/Cloaks/blueshield_neck.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/ADT/Clothing/Neck/Cloaks/blueshield_neck.rsi/icon.png b/Resources/Textures/ADT/Clothing/Neck/Cloaks/blueshield_neck.rsi/icon.png new file mode 100644 index 00000000000..d1ff78497f8 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Neck/Cloaks/blueshield_neck.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Neck/Cloaks/blueshield_neck.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Neck/Cloaks/blueshield_neck.rsi/inhand-left.png new file mode 100644 index 00000000000..949f67334c8 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Neck/Cloaks/blueshield_neck.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Neck/Cloaks/blueshield_neck.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Neck/Cloaks/blueshield_neck.rsi/inhand-right.png new file mode 100644 index 00000000000..729a9eb31f7 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Neck/Cloaks/blueshield_neck.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Neck/Cloaks/blueshield_neck.rsi/meta.json b/Resources/Textures/ADT/Clothing/Neck/Cloaks/blueshield_neck.rsi/meta.json new file mode 100644 index 00000000000..d9b9e8293cb --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Neck/Cloaks/blueshield_neck.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Skyrat-TG at https://github.com/Skyrat-SS13/Skyrat-tg", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..e8860c6a0cc Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/icon.png new file mode 100644 index 00000000000..288d50bf9d2 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/inhand-left.png new file mode 100644 index 00000000000..47e41ba6df1 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/inhand-right.png new file mode 100644 index 00000000000..374aa98a731 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/meta.json new file mode 100644 index 00000000000..944d77bbc07 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Skyrat-TG at https://github.com/Skyrat-SS13/Skyrat-tg", + "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/ADT/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..39265a71458 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi/icon.png new file mode 100644 index 00000000000..de740187ee0 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi/inhand-left.png new file mode 100644 index 00000000000..f0351ab1437 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi/inhand-right.png new file mode 100644 index 00000000000..e2d085b0615 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi/meta.json new file mode 100644 index 00000000000..e5417aed4e8 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Tamioki.", + "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/ADT/Clothing/OuterClothing/Hardsuits/riotert.yml/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/riotert.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/riotert.yml/equipped-OUTERCLOTHING.png rename to Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/riotert.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/riotert.yml/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/riotert.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/riotert.yml/icon.png rename to Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/riotert.rsi/icon.png diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/riotert.yml/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/riotert.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/riotert.yml/inhand-left.png rename to Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/riotert.rsi/inhand-left.png diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/riotert.yml/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/riotert.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/riotert.yml/inhand-right.png rename to Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/riotert.rsi/inhand-right.png diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/riotert.yml/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/riotert.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/riotert.yml/meta.json rename to Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/riotert.rsi/meta.json diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/blueshield_winter.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/blueshield_winter.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..69cbebb00b4 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/blueshield_winter.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/blueshield_winter.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/blueshield_winter.rsi/icon.png new file mode 100644 index 00000000000..b07751b6c05 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/blueshield_winter.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/blueshield_winter.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/blueshield_winter.rsi/inhand-left.png new file mode 100644 index 00000000000..f3f0c7b2320 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/blueshield_winter.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/blueshield_winter.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/blueshield_winter.rsi/inhand-right.png new file mode 100644 index 00000000000..487cfd2fe2d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/blueshield_winter.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/blueshield_winter.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/blueshield_winter.rsi/meta.json new file mode 100644 index 00000000000..944d77bbc07 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/blueshield_winter.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Skyrat-TG at https://github.com/Skyrat-SS13/Skyrat-tg", + "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/ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..3f5f73d2549 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..e5983606a2f Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi/icon.png new file mode 100644 index 00000000000..6a3267f018e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi/inhand-left.png new file mode 100644 index 00000000000..fd03131c3eb Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi/inhand-right.png new file mode 100644 index 00000000000..7ca2314196c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi/meta.json new file mode 100644 index 00000000000..c300b05fe92 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Tamioki.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..b102769adc8 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..fe75cdf2c65 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi/icon.png new file mode 100644 index 00000000000..66abcacb6c0 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi/inhand-left.png new file mode 100644 index 00000000000..fd03131c3eb Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi/inhand-right.png new file mode 100644 index 00000000000..7ca2314196c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi/meta.json new file mode 100644 index 00000000000..c300b05fe92 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Tamioki.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..1a8ea7369a6 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield.rsi/icon.png new file mode 100644 index 00000000000..83c571b59f6 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..a2343e27858 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..543f36e2094 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield.rsi/meta.json new file mode 100644 index 00000000000..c57d01fbfef --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Tamioki", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "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/Turtleneck/turtleneck_blueshield_woman.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield_woman.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..d8a847bb4d4 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield_woman.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield_woman.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield_woman.rsi/icon.png new file mode 100644 index 00000000000..36aec065f58 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield_woman.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield_woman.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield_woman.rsi/inhand-left.png new file mode 100644 index 00000000000..a2343e27858 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield_woman.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield_woman.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield_woman.rsi/inhand-right.png new file mode 100644 index 00000000000..543f36e2094 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield_woman.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield_woman.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield_woman.rsi/meta.json new file mode 100644 index 00000000000..c57d01fbfef --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield_woman.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Tamioki", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "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/Interface/Misc/job_icons.rsi/ADTBlueShieldOfficer.png b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/ADTBlueShieldOfficer.png new file mode 100644 index 00000000000..6a66a5d9a2e Binary files /dev/null and b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/ADTBlueShieldOfficer.png differ diff --git a/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json index a71d57c8075..f74231a9ad5 100644 --- a/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "ADTPathologist icon made by JustKeks(github) | Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/huds/hud.dmi . Blueshield made by Tamioki.", + "copyright": "Magistrat and ADTPathologist icon made by JustKeks(github), Blueshield made by Tamioki.", "size": { "x": 8, @@ -13,6 +13,9 @@ }, { "name": "ADTPathologist" + }, + { + "name": "ADTBlueShieldOfficer" } ] } diff --git a/Resources/Textures/ADT/Markers/jobs.rsi/blueshield.png b/Resources/Textures/ADT/Markers/jobs.rsi/blueshield.png new file mode 100644 index 00000000000..12577cfbd56 Binary files /dev/null and b/Resources/Textures/ADT/Markers/jobs.rsi/blueshield.png differ diff --git a/Resources/Textures/ADT/Markers/jobs.rsi/meta.json b/Resources/Textures/ADT/Markers/jobs.rsi/meta.json index 40d0eda2dcf..113f5fcf2fb 100644 --- a/Resources/Textures/ADT/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/ADT/Markers/jobs.rsi/meta.json @@ -1,29 +1,32 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Adventure Time, justkekc", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "green" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Adventure Time, justkekc, Blueshield made by Tamioki", + "size": { + "x": 32, + "y": 32 }, - { - "name": "investigator" - }, - { - "name": "magistrat" - }, - { - "name": "iaa" - }, - { - "name": "urist" - }, - { - "name": "pathologist" - } - ] + "states": [ + { + "name": "green" + }, + { + "name": "investigator" + }, + { + "name": "magistrat" + }, + { + "name": "iaa" + }, + { + "name": "urist" + }, + { + "name": "pathologist" + }, + { + "name": "blueshield" + } + ] } diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/equipped-BELT.png new file mode 100644 index 00000000000..6901e6c33b1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/equipped-IDCARD.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/equipped-IDCARD.png new file mode 100644 index 00000000000..6901e6c33b1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/equipped-IDCARD.png differ diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/id_overlay.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/id_overlay.png new file mode 100644 index 00000000000..3f5d310e703 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/id_overlay.png differ diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/inhand-left.png new file mode 100644 index 00000000000..12b784f81e8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/inhand-right.png new file mode 100644 index 00000000000..6919215bcf5 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/insert_overlay.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/insert_overlay.png new file mode 100644 index 00000000000..61ba781c1ff Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/insert_overlay.png differ diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/light_overlay.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/light_overlay.png new file mode 100644 index 00000000000..286a6c32558 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/light_overlay.png differ diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/ADT/Objects/Devices/pda.rsi/meta.json new file mode 100644 index 00000000000..044e62ff7a1 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Devices/pda.rsi/meta.json @@ -0,0 +1,58 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Blueshield made by Tamioki.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "id_overlay" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "insert_overlay" + }, + { + "name": "light_overlay" + }, + { + "name": "pda-blueshield", + "delays": [ + [ + 0.9, + 0.9, + 0.9, + 0.9 + ] + ] + }, + { + "name": "pda-centcom", + "delays": [ + [ + 1.2, + 1.2, + 1.2, + 1.2 + ] + ] + }, + { + "name": "equipped-IDCARD", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-blueshield.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-blueshield.png new file mode 100644 index 00000000000..7d574325355 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-blueshield.png differ diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-centcom.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-centcom.png new file mode 100644 index 00000000000..be7e66fd035 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-centcom.png differ diff --git a/Resources/Textures/ADT/Objects/Fun/figurines.rsi/blueshield.png b/Resources/Textures/ADT/Objects/Fun/figurines.rsi/blueshield.png new file mode 100644 index 00000000000..837bd66247c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/figurines.rsi/blueshield.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..278318f7fba --- /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": "Sprites Blueshield made by Tamioki.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "blueshield" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/blue-inhand-left.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/blue-inhand-left.png new file mode 100644 index 00000000000..49a145c26bd Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/blue-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/blue-inhand-right.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/blue-inhand-right.png new file mode 100644 index 00000000000..f7742aa89b4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/blue-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/centcom.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/centcom.png new file mode 100644 index 00000000000..cca1e3a51d1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/centcom.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_chaplain.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_chaplain.png new file mode 100644 index 00000000000..efe5ab7546a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_chaplain.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_commander.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_commander.png new file mode 100644 index 00000000000..d9c8b6e261d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_commander.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_engineer.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_engineer.png new file mode 100644 index 00000000000..b3284fe4efa Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_engineer.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_janitor.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_janitor.png new file mode 100644 index 00000000000..8434e5129f3 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_janitor.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_medic.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_medic.png new file mode 100644 index 00000000000..eb80a9fa557 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_medic.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_security.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_security.png new file mode 100644 index 00000000000..d3e94c61f9e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/ert_security.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/idblueshield.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/idblueshield.png new file mode 100644 index 00000000000..42611386882 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/idblueshield.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/idcentcom.png b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/idcentcom.png new file mode 100644 index 00000000000..7fad7c7a80e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/idcentcom.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/meta.json index f8b4aa32c54..5892ac1b15b 100644 --- a/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Misc/id_cards.rsi/meta.json @@ -18,8 +18,43 @@ "directions": 4 }, { - "name": "default-inhand-right", + "name": "default-inhand-right", + "directions": 4 + }, + { + "name": "idblueshield" + }, + { + "name": "centcom" + }, + { + "name": "ert_chaplain" + }, + { + "name": "ert_commander" + }, + { + "name": "ert_engineer" + }, + { + "name": "ert_janitor" + }, + { + "name": "ert_medic" + }, + { + "name": "ert_security" + }, + { + "name": "idcentcom" + }, + { + "name": "blue-inhand-left", + "directions": 4 + }, + { + "name": "blue-inhand-right", "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/beam.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/beam.png new file mode 100644 index 00000000000..3f784bcb9f8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/beam.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/impact_laser.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/impact_laser.png new file mode 100644 index 00000000000..dc69da91c4f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/impact_laser.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/meta.json new file mode 100644 index 00000000000..b3bfa6f96d9 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/meta.json @@ -0,0 +1,59 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Create by not_so_big_chungus only for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "muzzle_laser", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.5 + ] + ] + }, + { + "name": "beam", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.5 + ] + ] + }, + { + "name": "impact_laser", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.5 + ] + ] + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/muzzle_laser.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/muzzle_laser.png new file mode 100644 index 00000000000..f1b472f67c5 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi/muzzle_laser.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_bullet.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_bullet.png new file mode 100644 index 00000000000..9af9ad53d61 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_bullet.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_laser_greyscale.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_laser_greyscale.png new file mode 100644 index 00000000000..a2bdccf8822 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_laser_greyscale.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_laser_red.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_laser_red.png new file mode 100644 index 00000000000..13d69ab3631 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/impact_laser_red.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/meta.json new file mode 100644 index 00000000000..ee65042bd36 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/meta.json @@ -0,0 +1,51 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "drawn by nopeingeneer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "omnilaser" + }, + { + "name": "omnilaser_greyscale" + }, + { + "name": "impact_bullet", + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] + }, + { + "name": "impact_laser_red", + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] + }, + { + "name": "impact_laser_greyscale", + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/omnilaser.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/omnilaser.png new file mode 100644 index 00000000000..41d3e030099 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/omnilaser.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/omnilaser_greyscale.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/omnilaser_greyscale.png new file mode 100644 index 00000000000..5f4efba75e4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi/omnilaser_greyscale.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/base.png new file mode 100644 index 00000000000..10aa5fec829 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/inhand-left.png new file mode 100644 index 00000000000..0e56c82e179 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/inhand-right.png new file mode 100644 index 00000000000..fc784723cf7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/mag-1.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/mag-1.png new file mode 100644 index 00000000000..ef3119c3feb Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/mag-1.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/mag-2.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/mag-2.png new file mode 100644 index 00000000000..a8869cf77e4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/mag-2.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/mag-3.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/mag-3.png new file mode 100644 index 00000000000..5f4990accc6 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/mag-3.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/meta.json new file mode 100644 index 00000000000..30efab55d34 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Tamioki", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-left-blade.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-left-blade.png new file mode 100644 index 00000000000..61e6149c37d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-left-blade.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-left.png new file mode 100644 index 00000000000..1cd0726f379 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-right-blade.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-right-blade.png new file mode 100644 index 00000000000..42e8b189bcf Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-right-blade.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-right.png new file mode 100644 index 00000000000..9bcd0b183e4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/meta.json new file mode 100644 index 00000000000..61acf9cff2c --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi/meta.json @@ -0,0 +1,63 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Inhands by Tamioki", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic.rsi/icon.png new file mode 100644 index 00000000000..69b8f43c38f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic.rsi/icon_saber.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic.rsi/icon_saber.png new file mode 100644 index 00000000000..57b348ff869 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic.rsi/icon_saber.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic.rsi/meta.json new file mode 100644 index 00000000000..9893e307b1d --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Tamioki", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_saber", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-left-blade.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-left-blade.png new file mode 100644 index 00000000000..61e6149c37d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-left-blade.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-left.png new file mode 100644 index 00000000000..fe3bf8944b9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-right-blade.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-right-blade.png new file mode 100644 index 00000000000..42e8b189bcf Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-right-blade.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-right.png new file mode 100644 index 00000000000..ee0f3387950 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/meta.json new file mode 100644 index 00000000000..988beef92ac --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi/meta.json @@ -0,0 +1,99 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Inhands by Tamioki", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 0.5, + 0.5 + ], + [ + 0.5, + 0.5 + ], + [ + 0.5, + 0.5 + ], + [ + 0.5, + 0.5 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 0.5, + 0.5 + ], + [ + 0.5, + 0.5 + ], + [ + 0.5, + 0.5 + ], + [ + 0.5, + 0.5 + ] + ] + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/base.png new file mode 100644 index 00000000000..5ab0f44a5cc Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/icon_saber.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/icon_saber.png new file mode 100644 index 00000000000..908db302f77 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/icon_saber.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/mag-0.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/mag-0.png new file mode 100644 index 00000000000..49382ecebcc Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/mag-0.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/mag-1.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/mag-1.png new file mode 100644 index 00000000000..95acd504079 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/mag-1.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/meta.json new file mode 100644 index 00000000000..ee010dce692 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Tamioki", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "mag-1" + }, + { + "name": "icon_saber", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic.png new file mode 100644 index 00000000000..9fb79da87ef Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_door.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_door.png new file mode 100644 index 00000000000..dc7d1924fad Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_door.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_open.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_open.png new file mode 100644 index 00000000000..70bd872400d Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_paramedic_open.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist.png new file mode 100644 index 00000000000..9c30d08321a Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_door.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_door.png new file mode 100644 index 00000000000..7c70b7a6484 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_door.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_open.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_open.png new file mode 100644 index 00000000000..cacaa5ac991 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/bio_pathologist_open.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield.png new file mode 100644 index 00000000000..fb5d01ccb29 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield_door.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield_door.png new file mode 100644 index 00000000000..676e5d87cbc Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield_door.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield_open.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield_open.png new file mode 100644 index 00000000000..fa74babe4bc Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/blueshield_open.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/cc.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/cc.png new file mode 100644 index 00000000000..6a5cd1f7a97 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/cc.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/cc_door.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/cc_door.png new file mode 100644 index 00000000000..26017e463b5 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/cc_door.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/cc_open.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/cc_open.png new file mode 100644 index 00000000000..b99850e38b2 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/cc_open.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic.png new file mode 100644 index 00000000000..cd0c0ff2ea1 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_door.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_door.png new file mode 100644 index 00000000000..26498527779 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_door.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_icon.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_icon.png new file mode 100644 index 00000000000..2487eae1fdd Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_icon.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_open.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_open.png new file mode 100644 index 00000000000..01ed5bf73b6 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/generic_open.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/locked.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/locked.png new file mode 100644 index 00000000000..d90218d19e2 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/locked.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/ADT/Structures/Storage/closet.rsi/meta.json new file mode 100644 index 00000000000..ade760f2748 --- /dev/null +++ b/Resources/Textures/ADT/Structures/Storage/closet.rsi/meta.json @@ -0,0 +1,79 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "copyright": "Taken from tgstation. Bio Pathologist and Paramedic made by JustKekc. Central Command (cc) and blueshield made by Tamioki.", + "license": "CC-BY-SA-3.0", + "states": [ + { + "name": "generic" + }, + { + "name": "generic_door" + }, + { + "name": "generic_open" + }, + { + "name": "generic_icon" + }, + { + "name": "welded" + }, + { + "name": "cc" + }, + { + "name": "cc_door" + }, + { + "name": "cc_open" + }, + { + "name": "blueshield" + }, + { + "name": "blueshield_door" + }, + { + "name": "blueshield_open" + }, + { + "name": "bio_pathologist" + }, + { + "name": "bio_pathologist_door" + }, + { + "name": "bio_pathologist_open" + }, + { + "name": "bio_paramedic" + }, + { + "name": "bio_paramedic_door" + }, + { + "name": "bio_paramedic_open" + }, + { + "name": "locked" + }, + { + "name": "unlocked" + }, + { + "name": "sparking", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/sparking.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/sparking.png new file mode 100644 index 00000000000..b027535b060 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/sparking.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/unlocked.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/unlocked.png new file mode 100644 index 00000000000..418607bfaf5 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/unlocked.png differ diff --git a/Resources/Textures/ADT/Structures/Storage/closet.rsi/welded.png b/Resources/Textures/ADT/Structures/Storage/closet.rsi/welded.png new file mode 100644 index 00000000000..5ba5dcc8962 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Storage/closet.rsi/welded.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/defibrillator.png b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/defibrillator.png new file mode 100644 index 00000000000..c7f31234bce Binary files /dev/null and b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/defibrillator.png differ diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json index 3f3418b36c1..2af2ad458d7 100644 --- a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json +++ b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json @@ -14,7 +14,10 @@ "name": "bottle" }, { - "name": "bottle_spray" + "name": "bottle_spray" + }, + { + "name": "defibrillator" }, { "name": "cleaver"