diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs index 9a4767bbf21..5ec94794a74 100644 --- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs +++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs @@ -1555,6 +1555,9 @@ private void OpenLoadout(JobPrototype? jobProto, RoleLoadout roleLoadout, RoleLo JobOverride = jobProto; var session = _playerManager.LocalSession; + // Forge-Change: role loadouts can gain new groups after a profile was saved. + roleLoadout.EnsureValid(Profile, session, collection); + _loadoutWindow = new LoadoutWindow(Profile, roleLoadout, roleLoadoutProto, _playerManager.LocalSession, collection) { Title = jobProto?.LocalizedName + " loadout", // Mono - replace the "-" with a space in "-loadout", change to LocalizedName from ID diff --git a/Content.Client/_Wega/Security/SecApartment/SecApartmentWindow.xaml.cs b/Content.Client/_Wega/Security/SecApartment/SecApartmentWindow.xaml.cs index e8f9650eda0..70dc50f4db7 100644 --- a/Content.Client/_Wega/Security/SecApartment/SecApartmentWindow.xaml.cs +++ b/Content.Client/_Wega/Security/SecApartment/SecApartmentWindow.xaml.cs @@ -31,7 +31,7 @@ private static readonly (string Title, string Department)[] DebugSquadDepartment ("ТСФ", "TSF"), ("НаноТразен", "NanoTrasen"), ("СИВ", "Empire"), - ("СССП", "UnionOfSovietSocialistPlanets"), + ("СПН", "SPN"), ("Ренегаты", "Renegates") }; @@ -53,7 +53,7 @@ private static readonly (string Title, string Department)[] DebugSquadDepartment ["TSF"] = false, ["NanoTrasen"] = false, ["CIV"] = false, - ["USSP"] = false, + ["SPN"] = false, ["Renegates"] = false }; private List _lastUnassignedCrew = new(); @@ -329,7 +329,7 @@ private void SetThemedPanel(PanelContainer panel, Color background, Color border }; // AngleRect stylesheet modulates panels to #292929 — washes out light palettes. - if (_styles.Theme.ID == "SecApUiThemeUSSP") + if (_styles.Theme.ID == "SecApUiThemeSPN") panel.ModulateSelfOverride = Color.White; } @@ -482,7 +482,7 @@ private void UpdateSquadsList(List squads, bool debug) AddSquadCategory("TSF", "ТСФ", squads.Where(squad => squad.Department == "TSF").ToList(), debug); AddSquadCategory("NanoTrasen", "НаноТразен", squads.Where(IsNanoTrasenSquad).ToList(), debug); AddSquadCategory("CIV", "СИВ", squads.Where(IsCivilianSquad).ToList(), debug); - AddSquadCategory("USSP", "СССП", squads.Where(IsUsspSquad).ToList(), debug); + AddSquadCategory("SPN", "СПН", squads.Where(IsSpnSquad).ToList(), debug); AddSquadCategory("Renegates", "Ренегаты", squads.Where(squad => squad.Department == "Renegates").ToList(), debug); return; } @@ -575,9 +575,9 @@ private static bool IsCivilianSquad(Squad squad) return squad.Department is "CIV" or "Empire"; } - private static bool IsUsspSquad(Squad squad) + private static bool IsSpnSquad(Squad squad) { - return squad.Department is "USSP" or "СССП" or "UnionOfSovietSocialistPlanets"; + return squad.Department is "SPN" or "СПН"; } private void UpdateTimersList(List timers) diff --git a/Content.Server/_Forge/GuardImplant/GuardSystem.cs b/Content.Server/_Forge/GuardImplant/GuardSystem.cs index e9d83e686c3..8289d67e66b 100644 --- a/Content.Server/_Forge/GuardImplant/GuardSystem.cs +++ b/Content.Server/_Forge/GuardImplant/GuardSystem.cs @@ -12,7 +12,8 @@ namespace Content.Server._Forge.Guard; /// -/// Adds or removes the guard overlay component when the empire guard implant is inserted or removed. +/// Adds or removes the guard overlay component when a guard implant is inserted or removed. +/// Faction-specific guard icons are configured in implant YAML via SubdermalImplant.onAdd. /// public sealed class GuardSystem : EntitySystem { diff --git a/Content.Server/_Wega/Security/SecApartmentSystem.cs b/Content.Server/_Wega/Security/SecApartmentSystem.cs index 8b16a4f3691..24626f4ff03 100644 --- a/Content.Server/_Wega/Security/SecApartmentSystem.cs +++ b/Content.Server/_Wega/Security/SecApartmentSystem.cs @@ -54,7 +54,7 @@ public sealed partial class SecApartmentSystem : EntitySystem "TSF", "NanoTrasen", "Empire", - "UnionOfSovietSocialistPlanets", + "SPN", "Renegates" }; @@ -193,7 +193,7 @@ private static string GetSquadIconPrefix(string department, string fallback) { "TSF" => "TSFSquadIcon", "Empire" => "EmpireSquadIcon", - "UnionOfSovietSocialistPlanets" => "USSPSquadIcon", + "SPN" => "USSPSquadIcon", "Renegates" => "RenegateSquadIcon", _ => fallback }; diff --git a/Content.Shared/_Forge/Company/FactionCompanyResolver.cs b/Content.Shared/_Forge/Company/FactionCompanyResolver.cs index ed028f89743..efbb904179a 100644 --- a/Content.Shared/_Forge/Company/FactionCompanyResolver.cs +++ b/Content.Shared/_Forge/Company/FactionCompanyResolver.cs @@ -17,6 +17,7 @@ public static class FactionCompanyResolver "Renegates", "Colonial", "MD", + "SPN", }; public static bool IsFactionCompany(string? companyId) => diff --git a/Content.Shared/_Forge/GuardImplant/GuardComponent.cs b/Content.Shared/_Forge/GuardImplant/GuardComponent.cs index bebd4b1fd97..cf1d667f173 100644 --- a/Content.Shared/_Forge/GuardImplant/GuardComponent.cs +++ b/Content.Shared/_Forge/GuardImplant/GuardComponent.cs @@ -4,9 +4,9 @@ namespace Content.Shared._Forge.Guard.Components; -[RegisterComponent, NetworkedComponent] +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] public sealed partial class GuardComponent : Component { - [DataField, ViewVariables(VVAccess.ReadWrite)] + [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)] public ProtoId GuardStatusIcon = "GuardIcon"; } diff --git a/Resources/Locale/en-US/_Forge/cybernetics.ftl b/Resources/Locale/en-US/_Forge/cybernetics.ftl index 7f150517541..2657394cb35 100644 --- a/Resources/Locale/en-US/_Forge/cybernetics.ftl +++ b/Resources/Locale/en-US/_Forge/cybernetics.ftl @@ -21,8 +21,12 @@ ent-ForgeRiplyRightHand = R.I.P.L.Y right hand .desc = A cybernetic right hand with reinforced fingertip anchors. It helps drag and carry heavy bodies only when paired with the matching hand. ent-ImplantGuard = guard implant .desc = A technological chip that shields loyal minds of the Holy Empire's subjects. +ent-SpnMindShieldImplant = SPN mindshield implant + .desc = A subdermal implant that shields SPN personnel from external influence and mind control devices. ent-GuardImplanter = guard implanter .desc = A disposable syringe preloaded with a guard implant. +ent-SpnMindShieldImplanter = SPN mindshield implanter + .desc = A disposable syringe preloaded with an SPN mindshield implant. ent-ForgeVoiceModuleImplanter = voice module implanter .desc = A disposable syringe preloaded with a configurable voice module implant. ent-ForgeCyberneticLiver = cybernetic liver diff --git a/Resources/Locale/ru-RU/_Forge/communications/communications-console-component.ftl b/Resources/Locale/ru-RU/_Forge/communications/communications-console-component.ftl index 20994d325ba..3a00df55a80 100644 --- a/Resources/Locale/ru-RU/_Forge/communications/communications-console-component.ftl +++ b/Resources/Locale/ru-RU/_Forge/communications/communications-console-component.ftl @@ -2,7 +2,7 @@ comms-console-announcement-title-renegate = ВКР comms-console-announcement-title-tsf = ТСФ comms-console-announcement-title-empire = СИВ -comms-console-announcement-title-ussp = СССП +comms-console-announcement-title-ussp = СПН comms-console-announcement-title-nt = НТ comms-console-announcement-title-tti = TTI comms-console-announcement-title-ads = ADS \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_Forge/contractors/nationality.ftl b/Resources/Locale/ru-RU/_Forge/contractors/nationality.ftl index 5117aa5401d..3dcba896e35 100644 --- a/Resources/Locale/ru-RU/_Forge/contractors/nationality.ftl +++ b/Resources/Locale/ru-RU/_Forge/contractors/nationality.ftl @@ -5,8 +5,8 @@ nationality_description_solfed = Гражданин ТСФ. nationality_name_imperial = Священная Империя Вермиллионов nationality_description_imperial = Гражданин империи. -nationality_name_ussp = Союз Советских Социалистических Планет -nationality_description_ussp = Гражданин СССП. +nationality_name_ussp = Союз Прогрессивных Народов +nationality_description_ussp = Гражданин СПН. nationality_name_freecolonies = Свободные Колонии nationality_description_freecolonies = Гражданин Свободных Колоний. diff --git a/Resources/Locale/ru-RU/_Forge/cybernetics.ftl b/Resources/Locale/ru-RU/_Forge/cybernetics.ftl index 40dd1bcfd05..2d7dba190ea 100644 --- a/Resources/Locale/ru-RU/_Forge/cybernetics.ftl +++ b/Resources/Locale/ru-RU/_Forge/cybernetics.ftl @@ -8,6 +8,8 @@ reagent-effect-guidebook-transmutin-mutate-monkey = Мутирует обезь ent-ImplantGuard = имплант "Страж" .desc = Технологичный чип, защищающий светлые умы подданных Священной Империи +ent-SpnMindShieldImplant = имплант «щит разума» СПН + .desc = Подкожный имплант, защищающий разум бойца СПН от внешнего контроля и устройств влияния на сознание. ent-ForgeVoiceModuleImplant = голосовой модуль .desc = Настраиваемый подкожный TTS-модулятор голоса. Настройте его в руке до имплантации. ent-ForgeSubdermalArmorImplant = подкожная броня @@ -24,6 +26,8 @@ ent-ForgeRiplyRightHand = правая кисть R.I.P.L.Y .desc = Кибернетическая правая кисть с усиленными опорами в кончиках пальцев. Упрощает перетаскивание и перенос тяжёлых тел только в паре со второй кистью. ent-GuardImplanter = имплантер "Страж" .desc = Технологичный чип, защищающий светлые умы подданных Священной Империи +ent-SpnMindShieldImplanter = имплантер «щит разума» СПН + .desc = Одноразовый шприц с имплантом щита разума СПН. ent-ForgeVoiceModuleImplanter = имплантер голосового модуля .desc = Одноразовый шприц с настроенным голосовым модулем. ent-ForgeCyberneticLiver = кибернетическая печень diff --git a/Resources/Locale/ru-RU/_Forge/job/job-description.ftl b/Resources/Locale/ru-RU/_Forge/job/job-description.ftl index 74e10b3e9f3..b98af7407c5 100644 --- a/Resources/Locale/ru-RU/_Forge/job/job-description.ftl +++ b/Resources/Locale/ru-RU/_Forge/job/job-description.ftl @@ -66,3 +66,15 @@ job-description-tsf-Medic = Спасайте жизни своих товари job-description-tsf-sl = Командуйте приставленным в ваш отряд людьми и приведите их к победе. job-description-tsf-Crew = Обслуживайте Халкион, следите за питанием, изучайте РнД, производите снаряжение. job-description-tsf-crewofficer = Руководите экипажем Халкиона и будьте главным стрелком-наводчиком аванпоста. + +department-SPN-description = Военные и дипломатические силы Союза Прогрессивных Народов в секторе. +forge-job-desc-spn-council-member = Высшее командование СПН. Определяйте стратегию, распределяйте ресурсы и руководите флотом Союза. +forge-job-desc-spn-union-diplomat = Представляйте Союз Прогрессивных Народов в переговорах и ведите дипломатию от его имени. +forge-job-desc-spn-fleet-officer = Командуйте подразделениями СПН, поддерживайте дисциплину и исполняйте решения Совета. +forge-job-desc-spn-squad-leader = Командуйте звеном пехотинцев, ведите отряд в бой и выполняйте приказы офицеров. +forge-job-desc-spn-corpsman = Оказывайте медицинскую помощь бойцам СПН в полевых условиях. +forge-job-desc-spn-sapper = Уничтожайте укрепления врага, обезвреживайте мины и прокладывайте путь для наступления. +forge-job-desc-spn-rifleman = Основная боевая сила СПН. Исполняйте приказы командиров и держите линию фронта. +forge-job-desc-spn-trainee = Проходите подготовку, учитесь дисциплине и службе в рядах Союза Прогрессивных Народов. +job-supervisors-spn-council = члены совета СПН +job-supervisors-spn-fleet-officer = офицеры флота СПН diff --git a/Resources/Locale/ru-RU/_Forge/job/job-names.ftl b/Resources/Locale/ru-RU/_Forge/job/job-names.ftl index 118105d4eaa..96a1f1f2b66 100644 --- a/Resources/Locale/ru-RU/_Forge/job/job-names.ftl +++ b/Resources/Locale/ru-RU/_Forge/job/job-names.ftl @@ -2,6 +2,7 @@ department-Empire = Священная Империя Вермиллионов department-Renegates = Восставшие колонии Ренегатов department-TSF = Транс-Солнечная Федерация +department-SPN = Союз Прогрессивных Народов department-UnionOfSovietSocialistPlanets = Союз Советских Социалистических Планет # Outpost @@ -84,3 +85,12 @@ job-name-tsf-crew = ТСФ Экипаж «Халкиона» job-name-tsf-crewofficer = ТСФ Офицер «Халкиона» job-name-nt-medic-pilot = Пилот TTI job-name-nt-medic-gunner = Стрелок TTI + +forge-job-name-spn-council-member = СПН Член Совета +forge-job-name-spn-union-diplomat = СПН Дипломат Союза +forge-job-name-spn-fleet-officer = СПН Офицер Флота +forge-job-name-spn-squad-leader = СПН Командир Звена +forge-job-name-spn-corpsman = СПН Санитар +forge-job-name-spn-sapper = СПН Сапёр +forge-job-name-spn-rifleman = СПН Пехотинец +forge-job-name-spn-trainee = СПН Курсант diff --git a/Resources/Locale/ru-RU/_Forge/loadout.ftl b/Resources/Locale/ru-RU/_Forge/loadout.ftl new file mode 100644 index 00000000000..0fc0eaae4f6 --- /dev/null +++ b/Resources/Locale/ru-RU/_Forge/loadout.ftl @@ -0,0 +1,2 @@ +loadout-spn-boots-black = чёрные ботинки СПН +loadout-spn-boots-jungle = камуфляжные ботинки СПН diff --git a/Resources/Locale/ru-RU/_Forge/prototypes/entities/objects/devices/circuitboards/computer.ftl b/Resources/Locale/ru-RU/_Forge/prototypes/entities/objects/devices/circuitboards/computer.ftl index 19e09bf910f..8789894abc6 100644 --- a/Resources/Locale/ru-RU/_Forge/prototypes/entities/objects/devices/circuitboards/computer.ftl +++ b/Resources/Locale/ru-RU/_Forge/prototypes/entities/objects/devices/circuitboards/computer.ftl @@ -8,5 +8,5 @@ ent-TsfRankComputerCircuitboard = плата консоли должностей .desc = Печатная плата компьютера для консоли должностей ТСФ. ent-TtiRankComputerCircuitboard = плата консоли должностей TTI .desc = Печатная плата компьютера для консоли должностей TTI. -ent-UspRankComputerCircuitboard = плата консоли должностей USSP +ent-UspRankComputerCircuitboard = плата консоли должностей СПН .desc = Печатная плата компьютера для консоли должностей USSP. diff --git a/Resources/Locale/ru-RU/_Forge/radio.ftl b/Resources/Locale/ru-RU/_Forge/radio.ftl index 24f7e94c99e..69f1ab861d4 100644 --- a/Resources/Locale/ru-RU/_Forge/radio.ftl +++ b/Resources/Locale/ru-RU/_Forge/radio.ftl @@ -23,3 +23,5 @@ chat-radio-tl = TechnicLogistic chat-radio-harmony = Harmony chat-radio-drake-industries = Drake Industries chat-radio-nexus = Nexus +chat-radio-spn = ТАККОММ СПН +chat-radio-spn-command = СТРАТКОММ СПН diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/accesses.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/accesses.ftl index e44be1ec358..6948d354da5 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/accesses.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/accesses.ftl @@ -10,5 +10,6 @@ id-card-access-level-tsf-diplomacy = Дипломатия Федерации id-card-access-level-tsf-sec-apartment = Командование ТСФ id-card-access-level-renegate-sec-apartment = Командование Ренегатов id-card-access-level-empire-sec-apartment = Командование Империи +id-card-access-level-spn-sec-apartment = Командование СПН id-card-access-level-basic-remnant = Предтеч diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/catalog/fills/boxes/emergency.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/catalog/fills/boxes/emergency.ftl index 5e9c5c16af8..70f102fa7d4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/catalog/fills/boxes/emergency.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/catalog/fills/boxes/emergency.ftl @@ -4,3 +4,9 @@ ent-EmpireBoxSurvivalMonoNitrogenExtended = { ent-BoxSurvivalMonoNitrogenExtende ent-EmpireBoxSurvivalMonoOxygenExtended = { ent-BoxSurvivalMonoOxygenExtended } .desc = { ent-BoxSurvivalMonoOxygenExtended.desc } .suffix = Кислород, Империя +ent-SpnBoxSurvivalMonoNitrogenExtended = { ent-BoxSurvivalMonoNitrogenExtended } + .desc = { ent-BoxSurvivalMonoNitrogenExtended.desc } + .suffix = Азот, СПН +ent-SpnBoxSurvivalMonoOxygenExtended = { ent-BoxSurvivalMonoOxygenExtended } + .desc = { ent-BoxSurvivalMonoOxygenExtended.desc } + .suffix = Кислород, СПН diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/clothing/ears/headsets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/clothing/ears/headsets.ftl index 330d63e5c1d..2e7710132c1 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/clothing/ears/headsets.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/clothing/ears/headsets.ftl @@ -22,3 +22,9 @@ ent-ClothingHeadsetRenegade = гарнитура ренегатов ent-ClothingHeadsetMdMedical = медицинская гарнитура TTI .desc = Гарнитура с особым ключом шифрования для сотрудников Травмы Тима. + +ent-ClothingHeadsetSpn = гарнитура СПН + .desc = Модульная гарнитура СПН с тактическим ключом шифрования. + +ent-ClothingHeadsetSpnCommand = командная гарнитура СПН + .desc = Командная гарнитура СПН с тактическим и командным ключами шифрования. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/clothing/mask/masks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/clothing/mask/masks.ftl index f5d9c0891af..6012a8c8c23 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/clothing/mask/masks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/clothing/mask/masks.ftl @@ -2,5 +2,7 @@ ent-ClothingMaskGasContractor = противогаз DCN™ .desc = Плотно прилегающая тактическая маска, которую можно подключить к дыхательному баллону. ent-ClothingMaskGasRenegate = противогаз ренегатов .desc = Базовый военный противогаз с оранжевыми линзами. +ent-ClothingMaskGasSpn = противогаз СПН + .desc = Стандартный противогаз Союза Прогрессивных Народов. ent-ClothingMaskGasNexus = противогаз VSS .desc = Базовый военный противогаз компании Vanguard Security Systems. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/clothing/belt/spn.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/clothing/belt/spn.ftl new file mode 100644 index 00000000000..4a4c6261eaa --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/clothing/belt/spn.ftl @@ -0,0 +1,4 @@ +ent-ClothingBeltSpnBrown = тактический пояс СПН + .desc = Устаревший, но надёжный тактический пояс армии СПН. +ent-ClothingBeltSpnCoSabreSheath = кобура шпаги CO СПН + .desc = Парадная кобура для офицерской шпаги. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/clothing/head/spn.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/clothing/head/spn.ftl new file mode 100644 index 00000000000..bee5de42980 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/clothing/head/spn.ftl @@ -0,0 +1,10 @@ +ent-ClothingHeadHatSpnCap = кепка курсанта СПН + .desc = Полевая кепка UL2 для курсантов Союза Прогрессивных Народов. +ent-ClothingHeadHatSpnBeret = берет пехотинца СПН + .desc = Берет UL3 стандартной пехоты СПН. +ent-ClothingHeadHatSpnPeaked = фуражка UL3 СПН + .desc = Офицерская фуражка UL3 для командного состава СПН. +ent-ClothingHeadHatSpnPeakedDiplomat = фуражка UL3 PaP СПН + .desc = Фуражка UL3 дипломатического корпуса СПН. +ent-ClothingHeadHatSpnKomWhite = фуражка UL5 СПН + .desc = Белая фуражка UL5 C-1 для членов совета СПН. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/clothing/outerclothing/spn.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/clothing/outerclothing/spn.ftl new file mode 100644 index 00000000000..85b2feb79aa --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/clothing/outerclothing/spn.ftl @@ -0,0 +1,14 @@ +ent-ClothingOuterCoatSpnOfficer = куртка UL4 офицера СПН + .desc = Лёгкая куртка командного состава СПН. +ent-ClothingOuterCoatSpnSenior = куртка UL4 старшего офицера СПН + .desc = Куртка старшего офицерского состава СПН. +ent-ClothingOuterCoatSpnMp = камуфляжная куртка UL4 СПН + .desc = Лёгкая камуфляжная куртка для низкоугроженных постов. +ent-ClothingOuterCoatSpnPap = куртка PaP СПН + .desc = Верхняя одежда дипломатического корпуса СПН. +ent-ClothingOuterCoatSpnKomWhite = куртка UL5-W СПН + .desc = Белая бронированная куртка командования. +ent-ClothingOuterArmorSpnArmy = броня 6B80 СПН + .desc = Устаревший бронежилет тыловых подразделений. +ent-ClothingOuterArmorSpnSofPlated = усиленный жилет CCC5-L СПН + .desc = Вариант CCC5-L с дополнительными пластинами. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/clothing/shoes/spn.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/clothing/shoes/spn.ftl new file mode 100644 index 00000000000..1998ae0f2d5 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/clothing/shoes/spn.ftl @@ -0,0 +1,11 @@ +ent-ClothingShoesBootsSpnBlack = чёрные ботинки СПН + .desc = Стандартные чёрные армейские ботинки Союза Прогрессивных Народов. +ent-ClothingShoesBootsSpnJungle = камуфляжные ботинки СПН + .desc = Ботинки в джунглевом камуфляже для полевых подразделений СПН. + +ent-ClothingShoesBootsSpnBlackFilled = { ent-ClothingShoesBootsSpnBlack } + .suffix = { ent-ClothingShoesBootsSpnBlack.suffix }, Заполненный, Боевой нож + .desc = { ent-ClothingShoesBootsSpnBlack.desc } +ent-ClothingShoesBootsSpnJungleFilled = { ent-ClothingShoesBootsSpnJungle } + .suffix = { ent-ClothingShoesBootsSpnJungle.suffix }, Заполненный, Боевой нож + .desc = { ent-ClothingShoesBootsSpnJungle.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/clothing/uniforms/jumpsuits.ftl index 9695a476320..75ca6b56f25 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/clothing/uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/clothing/uniforms/jumpsuits.ftl @@ -65,4 +65,13 @@ ent-ClothingUniformJumpsuitEmpireInq = униформа эклезиарха ent-ClothingUniformJumpsuitEmpireConsul = униформа консула .desc = Форма дипломатического корпуса Империи, предназначенная для церемоний и официальных приёмов. ent-ClothingUniformJumpsuitEmpireInqAlt = униформа эклезиарха - .desc = Тёмный комбинезон в расцветке карательного отряда. Вы не можете не вспоминать все ваши убийства, жутко... \ No newline at end of file + .desc = Тёмный комбинезон в расцветке карательного отряда. Вы не можете не вспоминать все ваши убийства, жутко... + +ent-ClothingUniformSpnArmy = полевая униформа СПН + .desc = Стандартная боевая форма пехоты Союза Прогрессивных Народов. +ent-ClothingUniformSpnOfficer = офицерская униформа СПН + .desc = Форма командного состава СПН. +ent-ClothingUniformSpnCouncilFormal = парадная белая униформа члена совета СПН + .desc = Торжественная белая форма высшего командования СПН. +ent-ClothingUniformSpnPap = дипломатическая униформа СПН + .desc = Повседневная рабочая форма дипломатического корпуса СПН. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/Weapons/guns/Turrets/turrets_spn.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/Weapons/guns/Turrets/turrets_spn.ftl new file mode 100644 index 00000000000..176a8f506d3 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/Weapons/guns/Turrets/turrets_spn.ftl @@ -0,0 +1,3 @@ +ent-WeaponTurretSpn = { ent-BaseWeaponTurret } + .desc = Автоматическая баллистическая турель с СПН IFF: открывает огонь по всем целям, кроме зарегистрированного персонала СПН. + .suffix = СПН diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/Weapons/melee/spn_ceremonial_sabre.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/Weapons/melee/spn_ceremonial_sabre.ftl new file mode 100644 index 00000000000..c872afac17c --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/Weapons/melee/spn_ceremonial_sabre.ftl @@ -0,0 +1,2 @@ +ent-SpnCeremonialSabre = парадная шпага СПН + .desc = Церемониальная шпага высшего командования СПН, бережно сохранённая в отличном состоянии. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/devices/encryption_keys.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/devices/encryption_keys.ftl index 98977d4f40b..7ed2cc64521 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/devices/encryption_keys.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/devices/encryption_keys.ftl @@ -55,3 +55,7 @@ ent-EncryptionKeyTsfTech = технический ключ шифрования ent-EncryptionKeyTsfCom = командный ключ шифрования ТСФ .desc = { ent-EncryptionKeyNfsd.desc } +ent-EncryptionKeySpn = ключ шифрования СПН + .desc = Ключ шифрования тактического канала Союза Прогрессивных Народов. +ent-EncryptionKeySpnCommand = командный ключ шифрования СПН + .desc = Ключ шифрования командного состава СПН. Открывает тактический и командный каналы. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/devices/secapartment.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/devices/secapartment.ftl index 7fbe3c8c682..4fbfe582222 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/devices/secapartment.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/devices/secapartment.ftl @@ -26,9 +26,9 @@ ent-EmpireSecApartmentTabletEmpty = { ent-EmpireSecApartmentTablet } .desc = { ent-EmpireSecApartmentTablet.desc } .suffix = НЕ СПАВНИТЬ -ent-USSPSecApartmentTablet = портативный контроль персонала - .desc = Портативное устройство для контроля персонала, организации отрядов и координации действий. - .suffix = НЕ СПАВНИТЬ -ent-USSPSecApartmentTabletEmpty = { ent-USSPSecApartmentTablet } - .desc = { ent-USSPSecApartmentTablet.desc } - .suffix = НЕ СПАВНИТЬ +ent-SpnSecApartmentTablet = портативный контроль персонала СПН + .desc = Портативное устройство Союза Прогрессивных Народов для контроля персонала, организации отрядов и координации действий. + .suffix = Заряженный +ent-SpnSecApartmentTabletEmpty = { ent-SpnSecApartmentTablet } + .desc = { ent-SpnSecApartmentTablet.desc } + .suffix = Пустой diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/misc/implanters.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/misc/implanters.ftl index bbdd17c6050..3dec4c9ff29 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/misc/implanters.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/misc/implanters.ftl @@ -12,4 +12,7 @@ ent-TTITrackingImplanter = имплантер "Трекер TTI" .suffix = Трекер TTI ent-EmpireTrackingImplanter = имплантер "Трекер СИВ" .desc = Одноразовый шприц, специально предназначенный для введения подкожных имплантов. - .suffix = Трекер СИВ \ No newline at end of file + .suffix = Трекер СИВ +ent-SpnTrackingImplanter = имплантер "Слежение СПН" + .desc = Одноразовый шприц, специально предназначенный для введения подкожных имплантов. + .suffix = Слежение СПН \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/misc/subdermal_implants.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/misc/subdermal_implants.ftl index 6cb6be8203f..9847304b4f0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/misc/subdermal_implants.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/misc/subdermal_implants.ftl @@ -10,3 +10,5 @@ ent-TTITrackingImplant = имплант трекер TTI .desc = Этот имплант показывает местоположения пользователя для сервера мониторинга НТ и оповещает о смерти в канал Траума Тим. ent-EmpireTrackingImplant = имплант трекер СИВ .desc = Этот имплант показывает местоположения пользователя для сервера мониторинга СИВ и оповещает о смерти в канал Империи. +ent-SpnTrackingImplant = имплант слежения СПН + .desc = Этот имплант показывает местоположение носителя для сервера мониторинга СПН и оповещает о смерти в канал Союза Прогрессивных Народов. diff --git a/Resources/Maps/_Mono/Test/dev_map.yml b/Resources/Maps/_Mono/Test/dev_map.yml index bb07a8831c5..aaa5b1741f5 100644 --- a/Resources/Maps/_Mono/Test/dev_map.yml +++ b/Resources/Maps/_Mono/Test/dev_map.yml @@ -8007,6 +8007,62 @@ entities: - type: Transform pos: -4.5,2.5 parent: 2 +- proto: ForgeSpawnPointSpnTrainee + entities: + - uid: 100010 + components: + - type: Transform + pos: -5.5,6.5 + parent: 2 +- proto: ForgeSpawnPointSpnRifleman + entities: + - uid: 100011 + components: + - type: Transform + pos: -5.5,5.5 + parent: 2 +- proto: ForgeSpawnPointSpnFleetOfficer + entities: + - uid: 100012 + components: + - type: Transform + pos: -5.5,4.5 + parent: 2 +- proto: ForgeSpawnPointSpnCouncilMember + entities: + - uid: 100013 + components: + - type: Transform + pos: -5.5,3.5 + parent: 2 +- proto: ForgeSpawnPointSpnUnionDiplomat + entities: + - uid: 100014 + components: + - type: Transform + pos: -5.5,2.5 + parent: 2 +- proto: ForgeSpawnPointSpnSquadLeader + entities: + - uid: 100015 + components: + - type: Transform + pos: -5.5,1.5 + parent: 2 +- proto: ForgeSpawnPointSpnCorpsman + entities: + - uid: 100016 + components: + - type: Transform + pos: -5.5,0.5 + parent: 2 +- proto: ForgeSpawnPointSpnSapper + entities: + - uid: 100017 + components: + - type: Transform + pos: -5.5,-0.5 + parent: 2 - proto: SpawnPointSecurityGuard entities: - uid: 1148 diff --git a/Resources/Prototypes/_Forge/Access/spn.yml b/Resources/Prototypes/_Forge/Access/spn.yml new file mode 100644 index 00000000000..4bd600fafd5 --- /dev/null +++ b/Resources/Prototypes/_Forge/Access/spn.yml @@ -0,0 +1,3 @@ +- type: accessLevel + id: SpnSecApartment + name: id-card-access-level-spn-sec-apartment diff --git a/Resources/Prototypes/_Forge/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/_Forge/Catalog/Fills/Boxes/emergency.yml index bd7d2bd9b74..7ffdcbe65d8 100644 --- a/Resources/Prototypes/_Forge/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/_Forge/Catalog/Fills/Boxes/emergency.yml @@ -57,3 +57,33 @@ - id: MonoMRE # Mono - replace PSB and water bottle w/ MRE - id: CrowbarPocket - id: HandHeldMassScanner + +- type: entity + parent: BoxBaseSurvivalMono + id: SpnBoxSurvivalMonoOxygenExtended + suffix: Oxygen, SPN + components: + - type: StorageFill + contents: + - id: DoubleEmergencyOxygenTankFilled + - id: SpaceMedipen + - id: EmergencyMedipen + - id: ClothingMaskGasSpn + - id: MonoMRE + - id: CrowbarPocket + - id: HandHeldMassScanner + +- type: entity + parent: BoxBaseSurvivalMono + id: SpnBoxSurvivalMonoNitrogenExtended + suffix: Nitrogen, SPN + components: + - type: StorageFill + contents: + - id: DoubleEmergencyNitrogenTankFilled + - id: SpaceMedipen + - id: EmergencyMedipen + - id: ClothingMaskGasSpn + - id: MonoMRE + - id: CrowbarPocket + - id: HandHeldMassScanner diff --git a/Resources/Prototypes/_Forge/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/_Forge/Entities/Clothing/Ears/headsets.yml index 7e509a23dd7..60c3527eb22 100644 --- a/Resources/Prototypes/_Forge/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/_Forge/Entities/Clothing/Ears/headsets.yml @@ -214,3 +214,37 @@ - EncryptionKeyNfsd - EncryptionKeyTsfTech - EncryptionKeyTsfCom + +- type: entity + parent: ClothingHeadset + id: ClothingHeadsetSpn + name: SPN headset + suffix: СПН + components: + - type: Sprite + sprite: Clothing/Ears/Headsets/security.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/Ears/Headsets/SPP/spp.rsi + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyCommon + - EncryptionKeySpn + +- type: entity + parent: ClothingHeadset + id: ClothingHeadsetSpnCommand + name: SPN command headset + suffix: СПН + components: + - type: Sprite + sprite: Clothing/Ears/Headsets/security.rsi + state: icon_alt + - type: Clothing + sprite: Clothing/Ears/Headsets/security.rsi + equippedPrefix: alt + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyCommon + - EncryptionKeySpnCommand diff --git a/Resources/Prototypes/_Forge/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_Forge/Entities/Clothing/Eyes/glasses.yml index 13db3baf97a..a9e275b3f23 100644 --- a/Resources/Prototypes/_Forge/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/_Forge/Entities/Clothing/Eyes/glasses.yml @@ -103,6 +103,19 @@ flashDurationMultiplier: 2.75 isEquipment: true +#region SPN +- type: entity + parent: ClothingEyesGlassesSecurity + id: ClothingEyesGlassesSpn + name: SPN security visor + suffix: СПН + description: Upgraded sunglasses that provide flash immunity and a security HUD. + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/Eyes/Glasses/security_glasses.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/Eyes/Glasses/security_glasses.rsi + - type: entity parent: [ClothingEyesBase, ShowSecurityIcons] id: ClothingEyesGlassesViperGroup @@ -113,4 +126,4 @@ sprite: Forge/Clothing/Eyes/Goggles/vipergroup.rsi - type: Clothing sprite: Forge/Clothing/Eyes/Goggles/vipergroup.rsi - - type: FlashImmunity \ No newline at end of file + - type: FlashImmunity diff --git a/Resources/Prototypes/_Forge/Entities/Clothing/Mask/gasmask.yml b/Resources/Prototypes/_Forge/Entities/Clothing/Mask/gasmask.yml index 09201c76860..ab7135f7711 100644 --- a/Resources/Prototypes/_Forge/Entities/Clothing/Mask/gasmask.yml +++ b/Resources/Prototypes/_Forge/Entities/Clothing/Mask/gasmask.yml @@ -42,6 +42,21 @@ - type: Clothing sprite: Forge/Clothing/Mask/nexus_mask.rsi +#region SPN +- type: entity + parent: ClothingMaskGasSecurity + id: ClothingMaskGasSpn + name: SPN gas mask + suffix: СПН + description: A standard issue SPN gas mask. + components: + - type: Item + size: Tiny + - type: Sprite + sprite: _RMC14/Objects/Clothing/Mask/spp_commando_coif.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/Mask/spp_commando_coif.rsi + - type: entity parent: [ClothingMaskGas, BaseFactionGearOtherFactionT0] id: ClothingMaskGasTL diff --git a/Resources/Prototypes/_Forge/Entities/Clothing/Shoes/spn.yml b/Resources/Prototypes/_Forge/Entities/Clothing/Shoes/spn.yml new file mode 100644 index 00000000000..47b66deadad --- /dev/null +++ b/Resources/Prototypes/_Forge/Entities/Clothing/Shoes/spn.yml @@ -0,0 +1,37 @@ +- type: entity + parent: ClothingShoesMilitaryBase + id: ClothingShoesBootsSpnBlack + name: SPN black boots + suffix: СПН + description: Standard-issue black combat boots of the Union of Progressive Peoples. + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/Shoes/Boots/black.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/Shoes/Boots/black.rsi + +- type: entity + parent: ClothingShoesMilitaryBase + id: ClothingShoesBootsSpnJungle + name: SPN jungle boots + suffix: СПН + description: Jungle-pattern combat boots issued to SPN field units. + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/Shoes/Boots/jungle.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/Shoes/Boots/jungle.rsi + +- type: entity + id: ClothingShoesBootsSpnBlackFilled + suffix: Filled, Combat Knife + parent: + - ClothingShoesBootsSpnBlack + - ClothingShoesBootsSecFilled + +- type: entity + id: ClothingShoesBootsSpnJungleFilled + suffix: Filled, Combat Knife + parent: + - ClothingShoesBootsSpnJungle + - ClothingShoesBootsSecFilled diff --git a/Resources/Prototypes/_Forge/Entities/Clothing/Uniforms/spn.yml b/Resources/Prototypes/_Forge/Entities/Clothing/Uniforms/spn.yml new file mode 100644 index 00000000000..4037f3b25f1 --- /dev/null +++ b/Resources/Prototypes/_Forge/Entities/Clothing/Uniforms/spn.yml @@ -0,0 +1,60 @@ +- type: entity + abstract: true + parent: ClothingUniformBase + id: ClothingUniformSpnBase + components: + - type: Item + inhandVisuals: + left: [] + right: [] + - type: SuitSensor + randomMode: false + mode: SensorOff + +- type: entity + parent: ClothingUniformSpnBase + id: ClothingUniformSpnArmy + name: SPN army uniform + suffix: СПН + description: Standard field uniform of SPN infantry. + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/Uniforms/SPP/army.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/Uniforms/SPP/army.rsi + +- type: entity + parent: ClothingUniformSpnBase + id: ClothingUniformSpnOfficer + name: SPN officer uniform + suffix: СПН + description: Dress uniform issued to SPN command staff. + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/Uniforms/SPP/officer.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/Uniforms/SPP/officer.rsi + +- type: entity + parent: ClothingUniformSpnBase + id: ClothingUniformSpnCouncilFormal + name: SPN council formal uniform + suffix: СПН + description: White formal dress uniform worn by SPN council members. + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/Uniforms/Command/CO/formal_white.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/Uniforms/Command/CO/formal_white.rsi + +- type: entity + parent: ClothingUniformSpnBase + id: ClothingUniformSpnPap + name: SPN diplomatic work uniform + suffix: СПН + description: Everyday working uniform of the SPN diplomatic corps. + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/Uniforms/SPP/pap.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/Uniforms/SPP/pap.rsi diff --git a/Resources/Prototypes/_Forge/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Forge/Entities/Markers/Spawners/jobs.yml index 1a4076aa06e..27b6ebdcf80 100644 --- a/Resources/Prototypes/_Forge/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_Forge/Entities/Markers/Spawners/jobs.yml @@ -201,3 +201,81 @@ components: - type: SpawnPoint job_id: TsfRecruit + +- type: entity + id: ForgeSpawnPointSpnTrainee + parent: SpawnPointJobBase + name: spawn point Spn Trainee + suffix: СПН + components: + - type: SpawnPoint + job_id: SpnTrainee + - type: Sprite + layers: + - sprite: Markers/jobs.rsi + state: green + - sprite: Structures/Decoration/banner.rsi + state: banner-red + +- type: entity + id: ForgeSpawnPointSpnRifleman + parent: ForgeSpawnPointSpnTrainee + name: spawn point Spn Rifleman + suffix: СПН + components: + - type: SpawnPoint + job_id: SpnRifleman + +- type: entity + id: ForgeSpawnPointSpnFleetOfficer + parent: ForgeSpawnPointSpnTrainee + name: spawn point Spn Fleet Officer + suffix: СПН + components: + - type: SpawnPoint + job_id: SpnFleetOfficer + +- type: entity + id: ForgeSpawnPointSpnCouncilMember + parent: ForgeSpawnPointSpnTrainee + name: spawn point Spn Council Member + suffix: СПН + components: + - type: SpawnPoint + job_id: SpnCouncilMember + +- type: entity + id: ForgeSpawnPointSpnUnionDiplomat + parent: ForgeSpawnPointSpnTrainee + name: spawn point Spn Union Diplomat + suffix: СПН + components: + - type: SpawnPoint + job_id: SpnUnionDiplomat + +- type: entity + id: ForgeSpawnPointSpnSquadLeader + parent: ForgeSpawnPointSpnTrainee + name: spawn point Spn Squad Leader + suffix: СПН + components: + - type: SpawnPoint + job_id: SpnSquadLeader + +- type: entity + id: ForgeSpawnPointSpnCorpsman + parent: ForgeSpawnPointSpnTrainee + name: spawn point Spn Corpsman + suffix: СПН + components: + - type: SpawnPoint + job_id: SpnCorpsman + +- type: entity + id: ForgeSpawnPointSpnSapper + parent: ForgeSpawnPointSpnTrainee + name: spawn point Spn Sapper + suffix: СПН + components: + - type: SpawnPoint + job_id: SpnSapper diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/_Forge/Entities/Objects/Devices/encryption_keys.yml index 37cbde71806..8ac8e923315 100644 --- a/Resources/Prototypes/_Forge/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/_Forge/Entities/Objects/Devices/encryption_keys.yml @@ -379,3 +379,42 @@ layers: - state: crypt_nexus - state: nexus_label + +- type: entity + parent: EncryptionKey + id: EncryptionKeySpn + suffix: СПН + name: SPN encryption key + description: An encryption key for SPN tactical communications. + components: + - type: EncryptionKey + channels: + - Spn + defaultChannel: Spn + - type: Item + sprite: Forge/Objects/Devices/encryption_keys.rsi + - type: Sprite + sprite: Forge/Objects/Devices/encryption_keys.rsi + layers: + - state: crypt_rusted + - state: ussp_label + +- type: entity + parent: EncryptionKey + id: EncryptionKeySpnCommand + suffix: СПН + name: SPN command encryption key + description: An encryption key for SPN command staff. Grants tactical and command net access. + components: + - type: EncryptionKey + channels: + - Spn + - SpnCommand + defaultChannel: SpnCommand + - type: Item + sprite: Forge/Objects/Devices/encryption_keys.rsi + - type: Sprite + sprite: Forge/Objects/Devices/encryption_keys.rsi + layers: + - state: crypt_red_alt + - state: ussp_label diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Devices/secapartment.yml b/Resources/Prototypes/_Forge/Entities/Objects/Devices/secapartment.yml index 0527ebbb1ce..71dd6b5bd34 100644 --- a/Resources/Prototypes/_Forge/Entities/Objects/Devices/secapartment.yml +++ b/Resources/Prototypes/_Forge/Entities/Objects/Devices/secapartment.yml @@ -281,10 +281,10 @@ - type: entity parent: [ BaseItem, PowerCellSlotHighItem ] - id: USSPSecApartmentTablet + id: SpnSecApartmentTablet name: portable personnel monitor description: "A portable device for monitoring personnel, organizing squads, and coordinating actions." - suffix: НЕ СПАВНИТЬ + suffix: Powered components: - type: Sprite sprite: Forge/Objects/Devices/secapartments/USSP.rsi @@ -309,10 +309,14 @@ - type: ToggleCellDraw - type: ActivatableUIRequiresPowerCell - type: SecApartment - department: UnionOfSovietSocialistPlanets - requireUserDepartment: false + department: SPN + requireUserDepartment: true squadIconPrefix: USSPSquadIcon - uiTheme: SecApUiThemeUSSP + uiTheme: SecApUiThemeSPN + - type: AccessReader + requiredCompany: SPN + access: [["SpnSecApartment"]] + - type: ActivatableUIRequiresAccess - type: CrewMonitoringConsole - type: DeviceNetwork deviceNetId: Wireless @@ -329,9 +333,9 @@ False: { visible: false } - type: entity - id: USSPSecApartmentTabletEmpty - parent: USSPSecApartmentTablet - suffix: НЕ СПАВНИТЬ + id: SpnSecApartmentTabletEmpty + parent: SpnSecApartmentTablet + suffix: Empty components: - type: Sprite layers: diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/_Forge/Entities/Objects/Misc/implanters.yml index 7a509df14d7..6c05dfa913e 100644 --- a/Resources/Prototypes/_Forge/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/_Forge/Entities/Objects/Misc/implanters.yml @@ -21,6 +21,14 @@ components: - type: Implanter implant: ImplantGuard + +- type: entity + id: SpnMindShieldImplanter + parent: BaseImplantOnlyImplanter + suffix: SPN mindshield + components: + - type: Implanter + implant: SpnMindShieldImplant # Factions tracking implanters - type: entity @@ -61,4 +69,12 @@ parent: BaseImplantOnlyImplanter components: - type: Implanter - implant: EmpireTrackingImplant \ No newline at end of file + implant: EmpireTrackingImplant + +- type: entity + id: SpnTrackingImplanter + suffix: SPN tracking + parent: BaseImplantOnlyImplanter + components: + - type: Implanter + implant: SpnTrackingImplant \ No newline at end of file diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/_Forge/Entities/Objects/Misc/subdermal_implants.yml index c92d76b7a05..8677d3aa3f0 100644 --- a/Resources/Prototypes/_Forge/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/_Forge/Entities/Objects/Misc/subdermal_implants.yml @@ -81,6 +81,18 @@ permanent: false - type: GuardImplant +- type: entity + parent: ImplantGuard + id: SpnMindShieldImplant + suffix: СПН + categories: [ HideSpawnMenu ] + components: + - type: SubdermalImplant + permanent: false + onAdd: + - type: Guard + guardStatusIcon: SpnMindShieldIcon + # Factions Tracking Implants - type: entity parent: BaseSubdermalImplant @@ -203,3 +215,18 @@ - type: Rattle radioChannel: "Empire" language: "Freespeak" + +- type: entity + parent: BaseSubdermalImplant + id: SpnTrackingImplant + name: SPN tracking implant + description: This implant has a tracking device monitor for the SPN radio channel. + categories: [ HideSpawnMenu ] + components: + - type: SubdermalImplant + - type: TriggerOnMobstateChange + mobState: + - Critical + - Dead + - type: Rattle + radioChannel: "Spn" diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Weapons/Guns/Turrets/turrets_spn.yml b/Resources/Prototypes/_Forge/Entities/Objects/Weapons/Guns/Turrets/turrets_spn.yml new file mode 100644 index 00000000000..692c71f4d5b --- /dev/null +++ b/Resources/Prototypes/_Forge/Entities/Objects/Weapons/Guns/Turrets/turrets_spn.yml @@ -0,0 +1,10 @@ +- type: entity + parent: BaseWeaponBallisticTurret + id: WeaponTurretSpn + name: ballistic turret + suffix: SPN + description: A sentry programmed to fire on anyone not registered as SPN personnel. + components: + - type: NpcFactionMember + factions: + - SpnTurret diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Weapons/Melee/spn_ceremonial_sabre.yml b/Resources/Prototypes/_Forge/Entities/Objects/Weapons/Melee/spn_ceremonial_sabre.yml new file mode 100644 index 00000000000..1e75536e19a --- /dev/null +++ b/Resources/Prototypes/_Forge/Entities/Objects/Weapons/Melee/spn_ceremonial_sabre.yml @@ -0,0 +1,32 @@ +# Forge-Change: SPN ceremonial sabre (RMC-14 co_sabre texture). + +- type: entity + name: SPN ceremonial sabre + parent: BaseSword + id: SpnCeremonialSabre + suffix: СПН + description: A ceremonial sabre of the SPN high command. Well cared for and kept in top condition. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Melee/co_sabre.rsi + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Slash: 25 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Reflect + reflectProb: 0.3 + spread: 90 + - type: Item + sprite: _RMC14/Objects/Weapons/Melee/co_sabre.rsi + - type: Tag + tags: + - CaptainSabre + - type: DisarmMalus + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage diff --git a/Resources/Prototypes/_Forge/Entities/Structures/Machines/Computers/computers_job_preset.yml b/Resources/Prototypes/_Forge/Entities/Structures/Machines/Computers/computers_job_preset.yml index fc7f31c4354..0bc1d986588 100644 --- a/Resources/Prototypes/_Forge/Entities/Structures/Machines/Computers/computers_job_preset.yml +++ b/Resources/Prototypes/_Forge/Entities/Structures/Machines/Computers/computers_job_preset.yml @@ -155,16 +155,19 @@ - type: entity parent: BaseComputerJobPreset id: ComputerUspRank - name: Консоль должностей СССП - description: Терминал для назначения должностей СССП и предустановленных доступов. + name: Консоль должностей СПН + description: Терминал для назначения должностей Союза Прогрессивных Народов и предустановленных доступов. components: - type: JobPresetIdCardConsole + bodyImplants: + - SpnMindShieldImplant rankPresets: - - USSPCommissar - - USSPSergeant - - USSPMedic - - USSPCorporal - - USSPRifleman + - SpnFleetOfficer + - SpnSquadLeader + - SpnCorpsman + - SpnSapper + - SpnRifleman + - SpnTrainee - type: Sprite sprite: Structures/Machines/computers.rsi layers: diff --git a/Resources/Prototypes/_Forge/Entities/Structures/Machines/telecomms.yml b/Resources/Prototypes/_Forge/Entities/Structures/Machines/telecomms.yml index f897569efb7..599c62ba125 100644 --- a/Resources/Prototypes/_Forge/Entities/Structures/Machines/telecomms.yml +++ b/Resources/Prototypes/_Forge/Entities/Structures/Machines/telecomms.yml @@ -23,3 +23,16 @@ key_slots: - EncryptionKeyEmpire - EncryptionKeyEmpireCommand + +- type: entity + parent: TelecomServer + id: TelecomServerSpn + name: SPN telecom server + suffix: СПН + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyCommon + - EncryptionKeySpn + - EncryptionKeySpnCommand diff --git a/Resources/Prototypes/_Forge/Loadouts/SPN/bags.yml b/Resources/Prototypes/_Forge/Loadouts/SPN/bags.yml new file mode 100644 index 00000000000..ddd0a3bebb3 --- /dev/null +++ b/Resources/Prototypes/_Forge/Loadouts/SPN/bags.yml @@ -0,0 +1,4 @@ +- type: loadout + id: SpnClothingBackpackSatchelLeather + equipment: + back: ClothingBackpackSatchelLeather diff --git a/Resources/Prototypes/_Forge/Loadouts/SPN/belt.yml b/Resources/Prototypes/_Forge/Loadouts/SPN/belt.yml new file mode 100644 index 00000000000..4e5b9a24e86 --- /dev/null +++ b/Resources/Prototypes/_Forge/Loadouts/SPN/belt.yml @@ -0,0 +1,9 @@ +- type: loadout + id: SpnClothingBeltBrown + equipment: + belt: ClothingBeltSpnBrown + +- type: loadout + id: SpnClothingBeltCoSabreSheath + equipment: + belt: ClothingBeltSpnCoSabreSheath diff --git a/Resources/Prototypes/_Forge/Loadouts/SPN/ears.yml b/Resources/Prototypes/_Forge/Loadouts/SPN/ears.yml new file mode 100644 index 00000000000..e06dda50e0d --- /dev/null +++ b/Resources/Prototypes/_Forge/Loadouts/SPN/ears.yml @@ -0,0 +1,37 @@ +- type: loadout + id: SpnHeadset + effects: + - !type:SpeciesBlacklistLoadoutEffect + blacklist: + - IPC + equipment: + ears: ClothingHeadsetSpn + +- type: loadout + id: SpnHeadsetCommand + effects: + - !type:SpeciesBlacklistLoadoutEffect + blacklist: + - IPC + equipment: + ears: ClothingHeadsetSpnCommand + +- type: loadoutGroup + id: SpnEars + name: loadout-group-contractor-ears + hidden: true + minLimit: 1 + loadouts: + - SpnHeadset + fallbacks: + - SpnHeadset + +- type: loadoutGroup + id: SpnEarsCommand + name: loadout-group-contractor-ears + hidden: true + minLimit: 1 + loadouts: + - SpnHeadsetCommand + fallbacks: + - SpnHeadsetCommand diff --git a/Resources/Prototypes/_Forge/Loadouts/SPN/eyes.yml b/Resources/Prototypes/_Forge/Loadouts/SPN/eyes.yml new file mode 100644 index 00000000000..d90198c2563 --- /dev/null +++ b/Resources/Prototypes/_Forge/Loadouts/SPN/eyes.yml @@ -0,0 +1,4 @@ +- type: loadout + id: SpnClothingEyesGlasses + equipment: + eyes: ClothingEyesGlassesSpn diff --git a/Resources/Prototypes/_Forge/Loadouts/SPN/head.yml b/Resources/Prototypes/_Forge/Loadouts/SPN/head.yml new file mode 100644 index 00000000000..67a91bdcc39 --- /dev/null +++ b/Resources/Prototypes/_Forge/Loadouts/SPN/head.yml @@ -0,0 +1,24 @@ +- type: loadout + id: SpnClothingHeadCap + equipment: + head: ClothingHeadHatSpnCap + +- type: loadout + id: SpnClothingHeadBeret + equipment: + head: ClothingHeadHatSpnBeret + +- type: loadout + id: SpnClothingHeadPeaked + equipment: + head: ClothingHeadHatSpnPeaked + +- type: loadout + id: SpnClothingHeadPeakedDiplomat + equipment: + head: ClothingHeadHatSpnPeakedDiplomat + +- type: loadout + id: SpnClothingHeadKomWhite + equipment: + head: ClothingHeadHatSpnKomWhite diff --git a/Resources/Prototypes/_Forge/Loadouts/SPN/jumpsuit.yml b/Resources/Prototypes/_Forge/Loadouts/SPN/jumpsuit.yml new file mode 100644 index 00000000000..4e51017c0d2 --- /dev/null +++ b/Resources/Prototypes/_Forge/Loadouts/SPN/jumpsuit.yml @@ -0,0 +1,19 @@ +- type: loadout + id: SpnClothingJumpsuitArmy + equipment: + jumpsuit: ClothingUniformSpnArmy + +- type: loadout + id: SpnClothingJumpsuitOfficer + equipment: + jumpsuit: ClothingUniformSpnOfficer + +- type: loadout + id: SpnClothingJumpsuitCouncil + equipment: + jumpsuit: ClothingUniformSpnCouncilFormal + +- type: loadout + id: SpnClothingJumpsuitPap + equipment: + jumpsuit: ClothingUniformSpnPap diff --git a/Resources/Prototypes/_Forge/Loadouts/SPN/loadout_groups.yml b/Resources/Prototypes/_Forge/Loadouts/SPN/loadout_groups.yml new file mode 100644 index 00000000000..ee50039b011 --- /dev/null +++ b/Resources/Prototypes/_Forge/Loadouts/SPN/loadout_groups.yml @@ -0,0 +1,180 @@ +- type: loadoutGroup + id: SpnShoes + name: loadout-group-contractor-shoes + minLimit: 1 + maxLimit: 1 + loadouts: + - SpnClothingShoesBootsBlack + - SpnClothingShoesBootsJungle + fallbacks: + - SpnClothingShoesBootsBlack + +- type: loadoutGroup + id: SpnEyes + name: loadout-group-contractor-glasses + minLimit: 1 + loadouts: + - SpnClothingEyesGlasses + fallbacks: + - SpnClothingEyesGlasses + +- type: loadoutGroup + id: SpnHeadTrainee + name: loadout-group-contractor-head + minLimit: 1 + loadouts: + - SpnClothingHeadCap + fallbacks: + - SpnClothingHeadCap + +- type: loadoutGroup + id: SpnHeadRifleman + name: loadout-group-contractor-head + minLimit: 1 + loadouts: + - SpnClothingHeadBeret + fallbacks: + - SpnClothingHeadBeret + +- type: loadoutGroup + id: SpnHeadFleetOfficer + name: loadout-group-contractor-head + minLimit: 1 + loadouts: + - SpnClothingHeadPeaked + fallbacks: + - SpnClothingHeadPeaked + +- type: loadoutGroup + id: SpnHeadDiplomat + name: loadout-group-contractor-head + minLimit: 1 + loadouts: + - SpnClothingHeadPeakedDiplomat + fallbacks: + - SpnClothingHeadPeakedDiplomat + +- type: loadoutGroup + id: SpnHeadCouncil + name: loadout-group-contractor-head + minLimit: 1 + loadouts: + - SpnClothingHeadKomWhite + fallbacks: + - SpnClothingHeadKomWhite + +- type: loadoutGroup + id: SpnJumpsuitArmy + name: loadout-group-contractor-jumpsuit + minLimit: 1 + loadouts: + - SpnClothingJumpsuitArmy + fallbacks: + - SpnClothingJumpsuitArmy + +- type: loadoutGroup + id: SpnJumpsuitOfficer + name: loadout-group-contractor-jumpsuit + minLimit: 1 + loadouts: + - SpnClothingJumpsuitOfficer + fallbacks: + - SpnClothingJumpsuitOfficer + +- type: loadoutGroup + id: SpnJumpsuitCouncil + name: loadout-group-contractor-jumpsuit + minLimit: 1 + loadouts: + - SpnClothingJumpsuitCouncil + fallbacks: + - SpnClothingJumpsuitCouncil + +- type: loadoutGroup + id: SpnJumpsuitPap + name: loadout-group-contractor-jumpsuit + minLimit: 1 + loadouts: + - SpnClothingJumpsuitPap + fallbacks: + - SpnClothingJumpsuitPap + +- type: loadoutGroup + id: SpnBelt + name: loadout-group-contractor-belt + minLimit: 1 + maxLimit: 1 + loadouts: + - SpnClothingBeltBrown + fallbacks: + - SpnClothingBeltBrown + +- type: loadoutGroup + id: SpnBeltCouncil + name: loadout-group-contractor-belt + minLimit: 1 + maxLimit: 1 + loadouts: + - SpnClothingBeltCoSabreSheath + fallbacks: + - SpnClothingBeltCoSabreSheath + +- type: loadoutGroup + id: SpnBackpackDiplomat + name: loadout-group-contractor-backpack + minLimit: 1 + loadouts: + - SpnClothingBackpackSatchelLeather + fallbacks: + - SpnClothingBackpackSatchelLeather + +- type: loadoutGroup + id: SpnOuterClothingCouncil + name: loadout-group-contractor-outerclothing + minLimit: 1 + loadouts: + - SpnClothingOuterKomWhite + - SpnClothingOuterSofPlated + fallbacks: + - SpnClothingOuterKomWhite + +- type: loadoutGroup + id: SpnOuterClothingFleetOfficer + name: loadout-group-contractor-outerclothing + minLimit: 1 + loadouts: + - SpnClothingOuterSenior + - SpnClothingOuterArmy + fallbacks: + - SpnClothingOuterSenior + +- type: loadoutGroup + id: SpnOuterClothingDiplomat + name: loadout-group-contractor-outerclothing + minLimit: 1 + loadouts: + - SpnClothingOuterPap + - SpnClothingOuterArmy + fallbacks: + - SpnClothingOuterPap + +- type: loadoutGroup + id: SpnOuterClothingArmy + name: loadout-group-contractor-outerclothing + minLimit: 1 + loadouts: + - SpnClothingOuterArmy + fallbacks: + - SpnClothingOuterArmy + +- type: loadoutGroup + id: SpnBoxSurvival + name: loadout-group-contractor-survival-box + hidden: true + minLimit: 1 + loadouts: + - SpnBoxSurvivalNFOxygenExtended + - SpnBoxSurvivalNFNitrogenExtended + fallbacks: + - SpnBoxSurvivalNFOxygenExtended + - SpnBoxSurvivalNFNitrogenExtended diff --git a/Resources/Prototypes/_Forge/Loadouts/SPN/outerclothing.yml b/Resources/Prototypes/_Forge/Loadouts/SPN/outerclothing.yml new file mode 100644 index 00000000000..9cf7fb6c7c0 --- /dev/null +++ b/Resources/Prototypes/_Forge/Loadouts/SPN/outerclothing.yml @@ -0,0 +1,24 @@ +- type: loadout + id: SpnClothingOuterKomWhite + equipment: + outerClothing: ClothingOuterCoatSpnKomWhite + +- type: loadout + id: SpnClothingOuterSofPlated + equipment: + outerClothing: ClothingOuterArmorSpnSofPlated + +- type: loadout + id: SpnClothingOuterSenior + equipment: + outerClothing: ClothingOuterCoatSpnSenior + +- type: loadout + id: SpnClothingOuterPap + equipment: + outerClothing: ClothingOuterCoatSpnPap + +- type: loadout + id: SpnClothingOuterArmy + equipment: + outerClothing: ClothingOuterArmorSpnArmy diff --git a/Resources/Prototypes/_Forge/Loadouts/SPN/role_loadouts_spn.yml b/Resources/Prototypes/_Forge/Loadouts/SPN/role_loadouts_spn.yml new file mode 100644 index 00000000000..b8221380ce8 --- /dev/null +++ b/Resources/Prototypes/_Forge/Loadouts/SPN/role_loadouts_spn.yml @@ -0,0 +1,197 @@ +- type: roleLoadout + id: JobSpnCouncilMember + groups: + - SpnHeadCouncil + - SpnJumpsuitCouncil + - TsfmcGloves + - USSPBackpackSergeant + - SpnOuterClothingCouncil + - SpnShoes + - TsfmcBalaclava + - SpnEyes + - SpnBeltCouncil + - SpnBoxSurvival + - USSPCommissarPDA + - ContractorWallet + - ContractorCartridge + - ContractorEncryptionKey + - ContractorFun + - ContractorTrinkets + - NfsdSpeciesSpecific + - UsspFirearm + - UsspMag + - FactionArmorPlates + canCustomizeName: true + +- type: roleLoadout + id: JobSpnUnionDiplomat + groups: + - SpnHeadDiplomat + - SpnJumpsuitPap + - TsfmcGloves + - SpnBackpackDiplomat + - SpnOuterClothingDiplomat + - SpnShoes + - TsfmcBalaclava + - SpnEyes + - SpnBelt + - SpnBoxSurvival + - USSPSergeantPDA + - ContractorWallet + - ContractorCartridge + - ContractorEncryptionKey + - ContractorFun + - ContractorTrinkets + - NfsdSpeciesSpecific + - FactionArmorPlates + canCustomizeName: true + +- type: roleLoadout + id: JobSpnFleetOfficer + groups: + - SpnHeadFleetOfficer + - SpnJumpsuitOfficer + - TsfmcGloves + - USSPBackpack + - SpnOuterClothingFleetOfficer + - SpnShoes + - TsfmcBalaclava + - SpnEyes + - SpnBelt + - SpnBoxSurvival + - USSPSergeantPDA + - ContractorWallet + - ContractorCartridge + - ContractorEncryptionKey + - ContractorFun + - ContractorTrinkets + - NfsdSpeciesSpecific + - UsspFirearm + - UsspMag + - FactionArmorPlates + canCustomizeName: true + +- type: roleLoadout + id: JobSpnSquadLeader + groups: + - USSPHead + - USSPJumpsuit + - TsfmcGloves + - USSPBackpack + - USSPOuterClothing + - SpnShoes + - TsfmcBalaclava + - SpnEyes + - SpnBelt + - SpnBoxSurvival + - USSPCorporalPDA + - ContractorWallet + - ContractorCartridge + - ContractorEncryptionKey + - ContractorFun + - ContractorTrinkets + - NfsdSpeciesSpecific + - UsspFirearm + - UsspMag + - FactionArmorPlates + canCustomizeName: true + +- type: roleLoadout + id: JobSpnCorpsman + groups: + - USSPHead + - USSPJumpsuit + - TsfmcBrigmedicGloves + - USSPBackpack + - USSPOuterClothing + - SpnShoes + - TsfmcBalaclava + - SpnEyes + - SpnBelt + - SpnBoxSurvival + - USSPMedicPDA + - ContractorWallet + - ContractorCartridge + - ContractorEncryptionKey + - ContractorFun + - ContractorTrinkets + - NfsdSpeciesSpecific + - UsspFirearm + - UsspMag + - FactionArmorPlates + canCustomizeName: true + +- type: roleLoadout + id: JobSpnSapper + groups: + - USSPHead + - USSPJumpsuit + - TsfmcGloves + - USSPBackpack + - USSPOuterClothing + - SpnShoes + - TsfmcBalaclava + - SpnEyes + - SpnBelt + - SpnBoxSurvival + - USSPCorporalPDA + - ContractorWallet + - ContractorCartridge + - ContractorEncryptionKey + - ContractorFun + - ContractorTrinkets + - NfsdSpeciesSpecific + - UsspFirearm + - UsspMag + - FactionArmorPlates + canCustomizeName: true + +- type: roleLoadout + id: JobSpnRifleman + groups: + - SpnHeadRifleman + - SpnJumpsuitArmy + - TsfmcGloves + - USSPBackpack + - SpnOuterClothingArmy + - SpnShoes + - TsfmcBalaclava + - SpnEyes + - SpnBelt + - SpnBoxSurvival + - USSPRiflemanPDA + - ContractorWallet + - ContractorCartridge + - ContractorEncryptionKey + - ContractorFun + - ContractorTrinkets + - NfsdSpeciesSpecific + - UsspFirearm + - UsspMag + - FactionArmorPlates + canCustomizeName: true + +- type: roleLoadout + id: JobSpnTrainee + groups: + - SpnHeadTrainee + - SpnJumpsuitArmy + - TsfmcGloves + - USSPBackpack + - SpnOuterClothingArmy + - SpnShoes + - TsfmcBalaclava + - SpnEyes + - SpnBelt + - SpnBoxSurvival + - USSPRiflemanPDA + - ContractorWallet + - ContractorCartridge + - ContractorEncryptionKey + - ContractorFun + - ContractorTrinkets + - NfsdSpeciesSpecific + - UsspFirearm + - UsspMag + - FactionArmorPlates + canCustomizeName: true diff --git a/Resources/Prototypes/_Forge/Loadouts/SPN/shoes.yml b/Resources/Prototypes/_Forge/Loadouts/SPN/shoes.yml new file mode 100644 index 00000000000..b3a295918b6 --- /dev/null +++ b/Resources/Prototypes/_Forge/Loadouts/SPN/shoes.yml @@ -0,0 +1,11 @@ +- type: loadout + id: SpnClothingShoesBootsBlack + name: loadout-spn-boots-black + equipment: + shoes: ClothingShoesBootsSpnBlackFilled + +- type: loadout + id: SpnClothingShoesBootsJungle + name: loadout-spn-boots-jungle + equipment: + shoes: ClothingShoesBootsSpnJungleFilled diff --git a/Resources/Prototypes/_Forge/Roles/Jobs/SPN/corpsman.yml b/Resources/Prototypes/_Forge/Roles/Jobs/SPN/corpsman.yml new file mode 100644 index 00000000000..c1d44b105b1 --- /dev/null +++ b/Resources/Prototypes/_Forge/Roles/Jobs/SPN/corpsman.yml @@ -0,0 +1,35 @@ +- type: job + id: SpnCorpsman + name: forge-job-name-spn-corpsman + description: forge-job-desc-spn-corpsman + playTimeTracker: JobSpnCorpsman + startingGear: SpnCorpsmanGear + alwaysUseSpawner: true + setPreference: false + overrideConsoleVisibility: true + icon: JobIconSpnCorpsman + supervisors: job-supervisors-spn-fleet-officer + canBeAntag: false + weight: 95 + displayWeight: 40 + assignedCompany: SPN + assignedNationality: USSP + special: + - !type:AddImplantSpecial + implants: [ SpnMindShieldImplant, SpnTrackingImplant ] + - !type:AddComponentSpecial + components: + - type: MailDisabled + - type: SpecialSectorStationRecord + recordGeneration: FalseRecord + - type: NpcFactionMember + factions: + - Spn + - !type:AddLanguageSpecial + languagesSpoken: + - NovaCygniBasic + languagesUnderstood: + - NovaCygniBasic + accessGroups: + - GeneralAccess + - USSPLow diff --git a/Resources/Prototypes/_Forge/Roles/Jobs/SPN/council_member.yml b/Resources/Prototypes/_Forge/Roles/Jobs/SPN/council_member.yml new file mode 100644 index 00000000000..ceb5d179bd4 --- /dev/null +++ b/Resources/Prototypes/_Forge/Roles/Jobs/SPN/council_member.yml @@ -0,0 +1,46 @@ +- type: job + id: SpnCouncilMember + name: forge-job-name-spn-council-member + description: forge-job-desc-spn-council-member + playTimeTracker: JobSpnCouncilMember + requirements: + - !type:DepartmentTimeRequirement + department: SPN + time: 108000 # 30 hours + - !type:OverallPlaytimeRequirement + time: 129600 + - !type:RoleTimeRequirement + role: JobSpnFleetOfficer + time: 64800 + startingGear: SpnCouncilMemberGear + alwaysUseSpawner: true + hideConsoleVisibility: true + setPreference: true + icon: JobIconSpnCouncilMember + supervisors: job-supervisors-spn-council + canBeAntag: false + weight: 180 + displayWeight: 60 + assignedCompany: SPN + assignedNationality: USSP + special: + - !type:AddImplantSpecial + implants: [ SpnMindShieldImplant, SpnTrackingImplant ] + - !type:AddComponentSpecial + components: + - type: MailDisabled + - type: SpecialSectorStationRecord + recordGeneration: FalseRecord + - type: NpcFactionMember + factions: + - Spn + - !type:AddLanguageSpecial + languagesSpoken: + - NovaCygniBasic + languagesUnderstood: + - NovaCygniBasic + access: + - SpnSecApartment + accessGroups: + - GeneralAccess + - USSPAA diff --git a/Resources/Prototypes/_Forge/Roles/Jobs/SPN/fleet_officer.yml b/Resources/Prototypes/_Forge/Roles/Jobs/SPN/fleet_officer.yml new file mode 100644 index 00000000000..b00e23a2033 --- /dev/null +++ b/Resources/Prototypes/_Forge/Roles/Jobs/SPN/fleet_officer.yml @@ -0,0 +1,40 @@ +- type: job + id: SpnFleetOfficer + name: forge-job-name-spn-fleet-officer + description: forge-job-desc-spn-fleet-officer + playTimeTracker: JobSpnFleetOfficer + requirements: + - !type:OverallPlaytimeRequirement + time: 48000 + - !type:DepartmentTimeRequirement + department: SPN + time: 43200 + startingGear: SpnFleetOfficerGear + alwaysUseSpawner: true + setPreference: true + icon: JobIconSpnFleetOfficer + supervisors: job-supervisors-spn-council + canBeAntag: false + weight: 130 + displayWeight: 50 + assignedCompany: SPN + assignedNationality: USSP + special: + - !type:AddImplantSpecial + implants: [ SpnMindShieldImplant, SpnTrackingImplant ] + - !type:AddComponentSpecial + components: + - type: MailDisabled + - type: SpecialSectorStationRecord + recordGeneration: FalseRecord + - type: NpcFactionMember + factions: + - Spn + - !type:AddLanguageSpecial + languagesSpoken: + - NovaCygniBasic + languagesUnderstood: + - NovaCygniBasic + accessGroups: + - GeneralAccess + - USSPHigh diff --git a/Resources/Prototypes/_Forge/Roles/Jobs/SPN/rifleman.yml b/Resources/Prototypes/_Forge/Roles/Jobs/SPN/rifleman.yml new file mode 100644 index 00000000000..32c76e8e739 --- /dev/null +++ b/Resources/Prototypes/_Forge/Roles/Jobs/SPN/rifleman.yml @@ -0,0 +1,40 @@ +- type: job + id: SpnRifleman + name: forge-job-name-spn-rifleman + description: forge-job-desc-spn-rifleman + playTimeTracker: JobSpnRifleman + requirements: + - !type:OverallPlaytimeRequirement + time: 72000 + - !type:RoleTimeRequirement + role: JobSpnTrainee + time: 18000 + startingGear: SpnRiflemanGear + alwaysUseSpawner: true + setPreference: true + icon: JobIconSpnRifleman + supervisors: job-supervisors-spn-fleet-officer + canBeAntag: false + weight: 70 + displayWeight: 30 + assignedCompany: SPN + assignedNationality: USSP + special: + - !type:AddImplantSpecial + implants: [ SpnMindShieldImplant, SpnTrackingImplant ] + - !type:AddComponentSpecial + components: + - type: MailDisabled + - type: SpecialSectorStationRecord + recordGeneration: FalseRecord + - type: NpcFactionMember + factions: + - Spn + - !type:AddLanguageSpecial + languagesSpoken: + - NovaCygniBasic + languagesUnderstood: + - NovaCygniBasic + accessGroups: + - GeneralAccess + - USSPLow diff --git a/Resources/Prototypes/_Forge/Roles/Jobs/SPN/sapper.yml b/Resources/Prototypes/_Forge/Roles/Jobs/SPN/sapper.yml new file mode 100644 index 00000000000..825627101e3 --- /dev/null +++ b/Resources/Prototypes/_Forge/Roles/Jobs/SPN/sapper.yml @@ -0,0 +1,35 @@ +- type: job + id: SpnSapper + name: forge-job-name-spn-sapper + description: forge-job-desc-spn-sapper + playTimeTracker: JobSpnSapper + startingGear: SpnSapperGear + alwaysUseSpawner: true + setPreference: false + overrideConsoleVisibility: true + icon: JobIconSpnSapper + supervisors: job-supervisors-spn-fleet-officer + canBeAntag: false + weight: 85 + displayWeight: 38 + assignedCompany: SPN + assignedNationality: USSP + special: + - !type:AddImplantSpecial + implants: [ SpnMindShieldImplant, SpnTrackingImplant ] + - !type:AddComponentSpecial + components: + - type: MailDisabled + - type: SpecialSectorStationRecord + recordGeneration: FalseRecord + - type: NpcFactionMember + factions: + - Spn + - !type:AddLanguageSpecial + languagesSpoken: + - NovaCygniBasic + languagesUnderstood: + - NovaCygniBasic + accessGroups: + - GeneralAccess + - USSPLow diff --git a/Resources/Prototypes/_Forge/Roles/Jobs/SPN/squad_leader.yml b/Resources/Prototypes/_Forge/Roles/Jobs/SPN/squad_leader.yml new file mode 100644 index 00000000000..b4ba7df518d --- /dev/null +++ b/Resources/Prototypes/_Forge/Roles/Jobs/SPN/squad_leader.yml @@ -0,0 +1,35 @@ +- type: job + id: SpnSquadLeader + name: forge-job-name-spn-squad-leader + description: forge-job-desc-spn-squad-leader + playTimeTracker: JobSpnSquadLeader + startingGear: SpnSquadLeaderGear + alwaysUseSpawner: true + setPreference: false + overrideConsoleVisibility: true + icon: JobIconSpnSquadLeader + supervisors: job-supervisors-spn-fleet-officer + canBeAntag: false + weight: 110 + displayWeight: 45 + assignedCompany: SPN + assignedNationality: USSP + special: + - !type:AddImplantSpecial + implants: [ SpnMindShieldImplant, SpnTrackingImplant ] + - !type:AddComponentSpecial + components: + - type: MailDisabled + - type: SpecialSectorStationRecord + recordGeneration: FalseRecord + - type: NpcFactionMember + factions: + - Spn + - !type:AddLanguageSpecial + languagesSpoken: + - NovaCygniBasic + languagesUnderstood: + - NovaCygniBasic + accessGroups: + - GeneralAccess + - USSPLow diff --git a/Resources/Prototypes/_Forge/Roles/Jobs/SPN/starting_gear.yml b/Resources/Prototypes/_Forge/Roles/Jobs/SPN/starting_gear.yml new file mode 100644 index 00000000000..7b62907b82b --- /dev/null +++ b/Resources/Prototypes/_Forge/Roles/Jobs/SPN/starting_gear.yml @@ -0,0 +1,57 @@ +- type: startingGear + parent: USSPCommissarGear + id: SpnCouncilMemberGear + equipment: + ears: ClothingHeadsetSpnCommand + pocket1: WeaponRevolverMateba + pocket2: SpeedLoader45_magnumFMJ + storage: + back: + - RadioHandheldNF + - SpnSecApartmentTablet + +- type: startingGear + parent: USSPSergeantGear + id: SpnFleetOfficerGear + equipment: + ears: ClothingHeadsetSpnCommand + +- type: startingGear + id: SpnUnionDiplomatGear + equipment: + ears: ClothingHeadsetSpnCommand + pocket1: WeaponRevolverFitz + pocket2: SpeedLoader45_magnumFMJ + storage: + back: + - RadioHandheldNF + +- type: startingGear + parent: USSPCorporalGear + id: SpnSquadLeaderGear + equipment: + ears: ClothingHeadsetSpn + +- type: startingGear + parent: USSPMedicGear + id: SpnCorpsmanGear + equipment: + ears: ClothingHeadsetSpn + +- type: startingGear + parent: USSPCorporalGear + id: SpnSapperGear + equipment: + ears: ClothingHeadsetSpn + +- type: startingGear + parent: USSPRiflemanGear + id: SpnRiflemanGear + equipment: + ears: ClothingHeadsetSpn + +- type: startingGear + parent: USSPRiflemanGear + id: SpnTraineeGear + equipment: + ears: ClothingHeadsetSpn diff --git a/Resources/Prototypes/_Forge/Roles/Jobs/SPN/survival.yml b/Resources/Prototypes/_Forge/Roles/Jobs/SPN/survival.yml new file mode 100644 index 00000000000..b6776123e0b --- /dev/null +++ b/Resources/Prototypes/_Forge/Roles/Jobs/SPN/survival.yml @@ -0,0 +1,19 @@ +- type: loadout + id: SpnBoxSurvivalNFOxygenExtended + name: extended-oxygen survival box + hideEffects: + - !type:GroupLoadoutEffect + proto: OxygenBreatherNF + storage: + back: + - SpnBoxSurvivalMonoOxygenExtended + +- type: loadout + id: SpnBoxSurvivalNFNitrogenExtended + name: extended-nitrogen survival box + hideEffects: + - !type:GroupLoadoutEffect + proto: NitrogenBreatherNF + storage: + back: + - SpnBoxSurvivalMonoNitrogenExtended diff --git a/Resources/Prototypes/_Forge/Roles/Jobs/SPN/trainee.yml b/Resources/Prototypes/_Forge/Roles/Jobs/SPN/trainee.yml new file mode 100644 index 00000000000..b538a87ec50 --- /dev/null +++ b/Resources/Prototypes/_Forge/Roles/Jobs/SPN/trainee.yml @@ -0,0 +1,37 @@ +- type: job + id: SpnTrainee + name: forge-job-name-spn-trainee + description: forge-job-desc-spn-trainee + playTimeTracker: JobSpnTrainee + requirements: + - !type:OverallPlaytimeRequirement + time: 21600 + startingGear: SpnTraineeGear + alwaysUseSpawner: true + setPreference: true + icon: JobIconSpnTrainee + supervisors: job-supervisors-spn-fleet-officer + canBeAntag: false + weight: 50 + displayWeight: 25 + assignedCompany: SPN + assignedNationality: USSP + special: + - !type:AddImplantSpecial + implants: [ SpnMindShieldImplant, SpnTrackingImplant ] + - !type:AddComponentSpecial + components: + - type: MailDisabled + - type: SpecialSectorStationRecord + recordGeneration: FalseRecord + - type: NpcFactionMember + factions: + - Spn + - !type:AddLanguageSpecial + languagesSpoken: + - NovaCygniBasic + languagesUnderstood: + - NovaCygniBasic + accessGroups: + - GeneralAccess + - USSPLow diff --git a/Resources/Prototypes/_Forge/Roles/Jobs/SPN/union_diplomat.yml b/Resources/Prototypes/_Forge/Roles/Jobs/SPN/union_diplomat.yml new file mode 100644 index 00000000000..ecfc76ff60e --- /dev/null +++ b/Resources/Prototypes/_Forge/Roles/Jobs/SPN/union_diplomat.yml @@ -0,0 +1,39 @@ +- type: job + id: SpnUnionDiplomat + name: forge-job-name-spn-union-diplomat + description: forge-job-desc-spn-union-diplomat + playTimeTracker: JobSpnUnionDiplomat + requirements: + - !type:OverallPlaytimeRequirement + time: 43200 + whitelisted: true + startingGear: SpnUnionDiplomatGear + alwaysUseSpawner: true + hideConsoleVisibility: true + setPreference: true + icon: JobIconSpnUnionDiplomat + supervisors: job-supervisors-nobody + canBeAntag: false + weight: 160 + displayWeight: 55 + assignedCompany: SPN + assignedNationality: USSP + special: + - !type:AddImplantSpecial + implants: [ SpnMindShieldImplant, SpnTrackingImplant ] + - !type:AddComponentSpecial + components: + - type: MailDisabled + - type: SpecialSectorStationRecord + recordGeneration: FalseRecord + - type: NpcFactionMember + factions: + - Spn + - !type:AddLanguageSpecial + languagesSpoken: + - NovaCygniBasic + languagesUnderstood: + - NovaCygniBasic + accessGroups: + - GeneralAccess + - USSPHigh diff --git a/Resources/Prototypes/_Forge/Roles/Jobs/departments.yml b/Resources/Prototypes/_Forge/Roles/Jobs/departments.yml index 966deef34e4..39b93378d4e 100644 --- a/Resources/Prototypes/_Forge/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_Forge/Roles/Jobs/departments.yml @@ -54,3 +54,19 @@ - TsfSl - TsfCrew - TsfCrewOfficer + +- type: department + id: SPN + name: department-SPN + description: department-SPN-description + color: "#B01340" + weight: 45 + roles: + - SpnCouncilMember + - SpnUnionDiplomat + - SpnFleetOfficer + - SpnSquadLeader + - SpnCorpsman + - SpnSapper + - SpnRifleman + - SpnTrainee diff --git a/Resources/Prototypes/_Forge/Roles/play_time_trackers.yml b/Resources/Prototypes/_Forge/Roles/play_time_trackers.yml index 1512499fc6b..21f214c8aaf 100644 --- a/Resources/Prototypes/_Forge/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_Forge/Roles/play_time_trackers.yml @@ -116,3 +116,27 @@ - type: playTimeTracker id: JobNtCook + +- type: playTimeTracker + id: JobSpnCouncilMember + +- type: playTimeTracker + id: JobSpnUnionDiplomat + +- type: playTimeTracker + id: JobSpnFleetOfficer + +- type: playTimeTracker + id: JobSpnSquadLeader + +- type: playTimeTracker + id: JobSpnCorpsman + +- type: playTimeTracker + id: JobSpnSapper + +- type: playTimeTracker + id: JobSpnRifleman + +- type: playTimeTracker + id: JobSpnTrainee diff --git a/Resources/Prototypes/_Forge/StatusIcon/job.yml b/Resources/Prototypes/_Forge/StatusIcon/job.yml index dc120e8c831..88c6cf1fbb5 100644 --- a/Resources/Prototypes/_Forge/StatusIcon/job.yml +++ b/Resources/Prototypes/_Forge/StatusIcon/job.yml @@ -300,3 +300,69 @@ sprite: /Textures/Forge/Interface/Misc/job_icons.rsi state: nt_medgunner jobName: job-name-nt-medic-gunner + +# region SPN + +- type: jobIcon + parent: JobIcon + id: JobIconSpnCouncilMember + icon: + sprite: /Textures/Forge/Interface/Misc/job_icons.rsi + state: spn_soviet + jobName: forge-job-name-spn-council-member + +- type: jobIcon + parent: JobIcon + id: JobIconSpnUnionDiplomat + icon: + sprite: /Textures/Forge/Interface/Misc/job_icons.rsi + state: spn_diplom + jobName: forge-job-name-spn-union-diplomat + +- type: jobIcon + parent: JobIcon + id: JobIconSpnFleetOfficer + icon: + sprite: /Textures/Forge/Interface/Misc/job_icons.rsi + state: spn_officer + jobName: forge-job-name-spn-fleet-officer + +- type: jobIcon + parent: JobIcon + id: JobIconSpnSquadLeader + icon: + sprite: /Textures/Forge/Interface/Misc/job_icons.rsi + state: spn_com + jobName: forge-job-name-spn-squad-leader + +- type: jobIcon + parent: JobIcon + id: JobIconSpnCorpsman + icon: + sprite: /Textures/Forge/Interface/Misc/job_icons.rsi + state: spn_med + jobName: forge-job-name-spn-corpsman + +- type: jobIcon + parent: JobIcon + id: JobIconSpnSapper + icon: + sprite: /Textures/Forge/Interface/Misc/job_icons.rsi + state: spn_saper + jobName: forge-job-name-spn-sapper + +- type: jobIcon + parent: JobIcon + id: JobIconSpnRifleman + icon: + sprite: /Textures/Forge/Interface/Misc/job_icons.rsi + state: spn_walk + jobName: forge-job-name-spn-rifleman + +- type: jobIcon + parent: JobIcon + id: JobIconSpnTrainee + icon: + sprite: /Textures/Forge/Interface/Misc/job_icons.rsi + state: spn_curs + jobName: forge-job-name-spn-trainee diff --git a/Resources/Prototypes/_Forge/StatusIcon/security.yml b/Resources/Prototypes/_Forge/StatusIcon/security.yml new file mode 100644 index 00000000000..6d2b30f4847 --- /dev/null +++ b/Resources/Prototypes/_Forge/StatusIcon/security.yml @@ -0,0 +1,9 @@ +- type: securityIcon + id: SpnMindShieldIcon + priority: 2 + locationPreference: Right + layer: Mod + isShaded: true + icon: + sprite: /Textures/Forge/Interface/Misc/job_icons.rsi + state: spn_mindshield diff --git a/Resources/Prototypes/_Forge/ai_factions.yml b/Resources/Prototypes/_Forge/ai_factions.yml index 0a3f74e258c..7a90e7390ad 100644 --- a/Resources/Prototypes/_Forge/ai_factions.yml +++ b/Resources/Prototypes/_Forge/ai_factions.yml @@ -19,3 +19,27 @@ - MD - ContrabandDetection defaultHostile: true + +# SPN — NPC faction relations (see USSP / USSPTurret pattern) + +- type: npcFaction + id: Spn + neutral: + - CC + - NanoTrasen + - SimpleNeutral + - Mouse + defaultHostile: true + +- type: npcFaction + id: SpnTurret + friendly: + - Spn + neutral: + - NanoTrasen + - Cat + - PetsNT + - SimpleNeutral + - MD + - Mouse + defaultHostile: true diff --git a/Resources/Prototypes/_Forge/company.yml b/Resources/Prototypes/_Forge/company.yml index ee06a51ddc7..a986bccbb5c 100644 --- a/Resources/Prototypes/_Forge/company.yml +++ b/Resources/Prototypes/_Forge/company.yml @@ -41,3 +41,20 @@ description: renegate-resistance-description color: "#6B2D2D" whitelisted: true + +# Forge-Change: SPN faction company (not USSP / СССП(К) contractor). +- type: company + id: SPN + form: Antagonist + name: Союз Прогрессивных Народов + color: "#B01340" + whitelisted: true + hidden: true + special: + - !type:PlaySpawnSoundSpecial + sound: + path: /Audio/Ambience/Antag/headrev_start.ogg + params: + volume: -5 + variation: 0.2 + image: /Textures/_Mono/Companies/USSP.png diff --git a/Resources/Prototypes/_Forge/radio_channels.yml b/Resources/Prototypes/_Forge/radio_channels.yml index 19c50ea9290..c9b16a1f21c 100644 --- a/Resources/Prototypes/_Forge/radio_channels.yml +++ b/Resources/Prototypes/_Forge/radio_channels.yml @@ -126,3 +126,19 @@ keycode: 'n' frequency: 7011 color: "#1a5f9b" + +- type: radioChannel + id: Spn + name: chat-radio-spn + keycode: 's' + frequency: 1726 + color: "#b2224b" + longRange: true + +- type: radioChannel + id: SpnCommand + name: chat-radio-spn-command + keycode: 'q' + frequency: 1727 + color: "#ff0026" + longRange: true diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/commissar.yml b/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/commissar.yml index f2c07279edb..29c8d3ef3d6 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/commissar.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/commissar.yml @@ -17,6 +17,7 @@ time: 144000 # 40 hrs startingGear: USSPCommissarGear alwaysUseSpawner: true + setPreference: false # Forge-Change: replaced by SPN roles hideConsoleVisibility: true icon: "JobIconHeadOfSecurity" # TODO - new USSP icons supervisors: job-supervisors-ussp-highcomm diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/corporal.yml b/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/corporal.yml index 6fcf31f3f8d..0d01c143ae0 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/corporal.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/corporal.yml @@ -11,6 +11,7 @@ time: 14400 # 4 hrs startingGear: USSPCorporalGear alwaysUseSpawner: true + setPreference: false # Forge-Change: replaced by SPN roles hideConsoleVisibility: true icon: "JobIconSecurityOfficer" # TODO - new USSP icons supervisors: job-supervisors-ussp-sergeant diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/medic.yml b/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/medic.yml index 4a66d8ec731..bba67091c64 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/medic.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/medic.yml @@ -11,6 +11,7 @@ time: 14400 # 4 hrs startingGear: USSPMedicGear alwaysUseSpawner: true + setPreference: false # Forge-Change: replaced by SPN roles hideConsoleVisibility: true icon: "JobIconBrigmedic" # TODO - new USSP icons supervisors: job-supervisors-ussp-sergeant diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/rifleman.yml b/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/rifleman.yml index 0c67641b83c..1d8a0bb68c2 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/rifleman.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/rifleman.yml @@ -8,6 +8,7 @@ time: 32400 # 9 hrs startingGear: USSPRiflemanGear alwaysUseSpawner: true + setPreference: false # Forge-Change: replaced by SPN roles hideConsoleVisibility: true icon: "JobIconSecurityCadet" # TODO - new USSP icons supervisors: job-supervisors-ussp-sergeant diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/sergeant.yml b/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/sergeant.yml index c8e5efdb7f4..74a9c2d5da8 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/sergeant.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/UnionOfSovietSocialistPlanets/sergeant.yml @@ -11,6 +11,7 @@ time: 72000 # 20 hrs startingGear: USSPSergeantGear alwaysUseSpawner: true + setPreference: false # Forge-Change: replaced by SPN roles hideConsoleVisibility: true icon: "JobIconSeniorOfficer" # TODO - new USSP icons supervisors: job-supervisors-ussp-commissars diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/departments.yml b/Resources/Prototypes/_Mono/Roles/Jobs/departments.yml index cf86f66af46..c8fb996cd01 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/departments.yml @@ -15,11 +15,6 @@ description: department-UnionOfSovietSocialistPlanets-description color: "#b2224b" weight: 117 # Master Chief! - roles: - - USSPCommissar - - USSPSergeant - - USSPCorporal - - USSPMedic - - USSPRifleman + roles: [] # Forge-Change: replaced by SPN department primary: false editorHidden: true diff --git a/Resources/Prototypes/_Mono/companies.yml b/Resources/Prototypes/_Mono/companies.yml index a387c18ea10..83aeb01bae1 100644 --- a/Resources/Prototypes/_Mono/companies.yml +++ b/Resources/Prototypes/_Mono/companies.yml @@ -128,24 +128,13 @@ - type: company id: USSP - form: Antagonist - name: СССП(К) # Forge-change: locale and small rename: К = Кораблей + form: Protagonist + name: СССП(К) # Forge-Change: contractor company, not SPN faction color: "#B01340" - whitelisted: false # Mercs are now USSP-pilled. + whitelisted: true + hidden: true description: ussp-description - # Forge-change: add icon, note & special's note: ussp-company-note - icon: USSP - special: - - !type:GiveItemSpecial - prototype: - - EncryptionKeyUssp - - !type:PlaySpawnSoundSpecial - sound: - path: /Audio/Ambience/Antag/headrev_start.ogg - params: - volume: -5 - variation: 0.2 image: /Textures/_Mono/Companies/USSP.png # Major companies diff --git a/Resources/Prototypes/_NF/Maps/debug.yml b/Resources/Prototypes/_NF/Maps/debug.yml index 1d14e7234c9..c73ca637a6b 100644 --- a/Resources/Prototypes/_NF/Maps/debug.yml +++ b/Resources/Prototypes/_NF/Maps/debug.yml @@ -88,6 +88,14 @@ TsfAmbassador: [ -1, -1] TsfRanger: [ -1, -1] TsfRecruit: [ -1, -1] + SpnCouncilMember: [ -1, -1 ] + SpnUnionDiplomat: [ -1, -1 ] + SpnFleetOfficer: [ -1, -1 ] + # SpnSquadLeader: [ -1, -1 ] # Forge-Change: console-only (`setPreference: false`) + # SpnCorpsman: [ -1, -1 ] # Forge-Change: console-only (`setPreference: false`) + # SpnSapper: [ -1, -1 ] # Forge-Change: console-only (`setPreference: false`) + SpnRifleman: [ -1, -1 ] + SpnTrainee: [ -1, -1 ] # Forge-change-end - type: StationDeadDrop maxDeadDrops: 20 # Testing diff --git a/Resources/Prototypes/_RMC14/Entities/Clothing/Belt/spp.yml b/Resources/Prototypes/_RMC14/Entities/Clothing/Belt/spp.yml new file mode 100644 index 00000000000..e7c3f4cae1f --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Clothing/Belt/spp.yml @@ -0,0 +1,46 @@ +# Forge-Change: SPN belts (RMC-14 textures, simple SS14 parents). + +- type: entity + parent: ClothingBeltWebbingsBigBase + id: ClothingBeltSpnBrown + name: SPN tactical belt + suffix: СПН + description: A tactical belt formerly standard for the SPN Army. + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/Belt/spp_brown.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/Belt/spp_brown.rsi + - type: Storage + grid: + - 0,0,1,2 + - 3,0,4,2 + - 6,0,7,2 + - 9,0,10,2 + - type: Item + inhandVisuals: + left: [] + right: [] + +- type: entity + parent: ClothingBeltSheath + id: ClothingBeltSpnCoSabreSheath + name: SPP CO sabre sheath + suffix: СПН + description: An ornate sheath designed to hold a commanding officer's blade. + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi + state: half + - type: Clothing + sprite: _RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi + - type: ItemMapper + mapLayers: + full: + whitelist: + tags: + - CaptainSabre + - type: ContainerFill + containers: + item: + - SpnCeremonialSabre diff --git a/Resources/Prototypes/_RMC14/Entities/Clothing/Head/spp.yml b/Resources/Prototypes/_RMC14/Entities/Clothing/Head/spp.yml new file mode 100644 index 00000000000..e7675d1a6e4 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Clothing/Head/spp.yml @@ -0,0 +1,66 @@ +# Forge-Change: SPN headwear (RMC-14 textures, simple SS14 parents). + +- type: entity + abstract: true + parent: ClothingHeadBase + id: ClothingHeadSpnHatBase + components: + - type: Item + inhandVisuals: + left: [] + right: [] + +- type: entity + parent: ClothingHeadSpnHatBase + id: ClothingHeadHatSpnCap + name: SPP UL2 cap + suffix: СПН + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/Head/SPP/cap.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/Head/SPP/cap.rsi + +- type: entity + parent: ClothingHeadSpnHatBase + id: ClothingHeadHatSpnBeret + name: SPP UL3 beret + suffix: СПН + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/Head/SPP/beret.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/Head/SPP/beret.rsi + +- type: entity + parent: ClothingHeadSpnHatBase + id: ClothingHeadHatSpnPeaked + name: SPP UL3 peaked cap + suffix: СПН + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/Head/SPP/peaked.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/Head/SPP/peaked.rsi + +- type: entity + parent: ClothingHeadSpnHatBase + id: ClothingHeadHatSpnPeakedDiplomat + name: SPP UL3 PaP peaked cap + suffix: СПН + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/Head/SPP/peaked_diplomat.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/Head/SPP/peaked_diplomat.rsi + +- type: entity + parent: ClothingHeadSpnHatBase + id: ClothingHeadHatSpnKomWhite + name: SPP UL5 C-1 peaked cap + suffix: СПН + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/Head/SPP/kommisar_cap_white.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/Head/SPP/kommisar_cap_white.rsi diff --git a/Resources/Prototypes/_RMC14/Entities/Clothing/OuterClothing/spp.yml b/Resources/Prototypes/_RMC14/Entities/Clothing/OuterClothing/spp.yml new file mode 100644 index 00000000000..f185c1e0a27 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Clothing/OuterClothing/spp.yml @@ -0,0 +1,105 @@ +# Forge-Change: SPN outer clothing (RMC-14 textures, simple SS14 parents). + +- type: entity + abstract: true + parent: ClothingOuterStorageBase + id: ClothingOuterSpnCoatBase + components: + - type: Item + inhandVisuals: + left: [] + right: [] + +- type: entity + abstract: true + parent: ClothingOuterArmorBasic + id: ClothingOuterSpnArmorBase + components: + - type: Item + inhandVisuals: + left: [] + right: [] + +- type: entity + parent: ClothingOuterSpnCoatBase + id: ClothingOuterCoatSpnOfficer + name: SPP UL4 officer jacket + suffix: СПН + description: A lightweight jacket issued to officers of the SPP military. + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/OuterClothing/SPP/officer.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/OuterClothing/SPP/officer.rsi + +- type: entity + parent: ClothingOuterSpnCoatBase + id: ClothingOuterCoatSpnSenior + name: SPP UL4 senior officer jacket + suffix: СПН + description: A lightweight jacket issued to senior officers of the SPP military. + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/OuterClothing/SPP/senior.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/OuterClothing/SPP/senior.rsi + +- type: entity + parent: ClothingOuterSpnCoatBase + id: ClothingOuterCoatSpnMp + name: SPP UL4 camouflaged jacket + suffix: СПН + description: A lightweight camouflaged jacket issued to SPP troops in low-threat postings. + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/OuterClothing/SPP/mp.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/OuterClothing/SPP/mp.rsi + +- type: entity + parent: ClothingOuterSpnCoatBase + id: ClothingOuterCoatSpnPap + name: SPP PaP jacket + suffix: СПН + description: Outer jacket of the SPP diplomatic corps. + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/OuterClothing/SPP/pap.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/OuterClothing/SPP/pap.rsi + +- type: entity + parent: ClothingOuterSpnCoatBase + id: ClothingOuterCoatSpnKomWhite + name: SPP UL5-W + suffix: СПН + description: A somewhat armored jacket primarily utilised by naval or marine infantry COs. + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/OuterClothing/SPP/kommisarwhitecoat.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/OuterClothing/SPP/kommisarwhitecoat.rsi + +- type: entity + parent: ClothingOuterSpnArmorBase + id: ClothingOuterArmorSpnArmy + name: SPP 6B80 personal body armor + suffix: СПН + description: An older SPP personal armor system still used by rear-echelon army units. + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/OuterClothing/SPP/army.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/OuterClothing/SPP/army.rsi + +- type: entity + parent: ClothingOuterSpnArmorBase + id: ClothingOuterArmorSpnSofPlated + name: SPP CCC5-L plated tactical vest + suffix: СПН + description: A plated variant of the CCC5-L tactical vest. + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/OuterClothing/SPP/sof_plated.rsi + - type: Clothing + sprite: _RMC14/Objects/Clothing/OuterClothing/SPP/sof_plated.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/secapartment_ui_themes.yml b/Resources/Prototypes/_Wega/secapartment_ui_themes.yml index 089294e228c..9b54062a2c2 100644 --- a/Resources/Prototypes/_Wega/secapartment_ui_themes.yml +++ b/Resources/Prototypes/_Wega/secapartment_ui_themes.yml @@ -440,11 +440,11 @@ -# СССП — тёмный бордо, приглушённое золото (корпус USSP.rsi, без кислотного пергамента) +# СПН — тёмный бордо, приглушённое золото (корпус USSP.rsi, без кислотного пергамента) - type: secApUiTheme - id: SecApUiThemeUSSP + id: SecApUiThemeSPN showLogo: false diff --git a/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/meta.json index 7706712f446..cd00d0a13d7 100644 --- a/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Create by autsaider_m, StRep Eifall, overlord by v6st, emp_ icons by v6st, ren_, tsf_, nt_, doc, paramed by sodakent (discord) for Forge", + "copyright": "Create by autsaider_m, StRep Eifall, overlord by v6st, emp_ icons by v6st, ren_, tsf_, nt_, doc, paramed by sodakent (discord) for Forge, spn_ icons and spn_mindshield by ifi07 (discord) for Forge", "size": { "x": 8, @@ -149,6 +149,37 @@ }, { "name": "nt_medgunner" + }, + { + "name": "spn_com" + }, + { + "name": "spn_officer" + }, + { + "name": "spn_diplom" + }, + { + "name": "spn_med" + }, + { + "name": "spn_saper" + }, + { + "name": "spn_walk" + }, + { + "name": "spn_curs" + }, + { + "name": "spn_soviet" + }, + { + "name": "spn_mindshield", + "delays": + [ + [0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1] + ] } ] } diff --git a/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_com.png b/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_com.png new file mode 100644 index 00000000000..c9c55887960 Binary files /dev/null and b/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_com.png differ diff --git a/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_curs.png b/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_curs.png new file mode 100644 index 00000000000..e1a46cc78d7 Binary files /dev/null and b/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_curs.png differ diff --git a/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_diplom.png b/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_diplom.png new file mode 100644 index 00000000000..098e84a5b0e Binary files /dev/null and b/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_diplom.png differ diff --git a/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_med.png b/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_med.png new file mode 100644 index 00000000000..317861750b6 Binary files /dev/null and b/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_med.png differ diff --git a/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_mindshield.png b/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_mindshield.png new file mode 100644 index 00000000000..705e98e3a14 Binary files /dev/null and b/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_mindshield.png differ diff --git a/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_officer.png b/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_officer.png new file mode 100644 index 00000000000..39159287212 Binary files /dev/null and b/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_officer.png differ diff --git a/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_saper.png b/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_saper.png new file mode 100644 index 00000000000..cb6fb840445 Binary files /dev/null and b/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_saper.png differ diff --git a/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_soviet.png b/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_soviet.png new file mode 100644 index 00000000000..55fdfc359f7 Binary files /dev/null and b/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_soviet.png differ diff --git a/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_walk.png b/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_walk.png new file mode 100644 index 00000000000..f7cad6fd7ce Binary files /dev/null and b/Resources/Textures/Forge/Interface/Misc/job_icons.rsi/spn_walk.png differ diff --git "a/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/MindShield.png" "b/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/MindShield.png" new file mode 100644 index 00000000000..705e98e3a14 Binary files /dev/null and "b/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/MindShield.png" differ diff --git "a/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/com.png" "b/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/com.png" new file mode 100644 index 00000000000..c9c55887960 Binary files /dev/null and "b/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/com.png" differ diff --git "a/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/curs.png" "b/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/curs.png" new file mode 100644 index 00000000000..e1a46cc78d7 Binary files /dev/null and "b/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/curs.png" differ diff --git "a/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/diplom.png" "b/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/diplom.png" new file mode 100644 index 00000000000..098e84a5b0e Binary files /dev/null and "b/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/diplom.png" differ diff --git "a/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/med.png" "b/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/med.png" new file mode 100644 index 00000000000..317861750b6 Binary files /dev/null and "b/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/med.png" differ diff --git "a/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/officer.png" "b/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/officer.png" new file mode 100644 index 00000000000..39159287212 Binary files /dev/null and "b/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/officer.png" differ diff --git "a/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/saper.png" "b/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/saper.png" new file mode 100644 index 00000000000..cb6fb840445 Binary files /dev/null and "b/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/saper.png" differ diff --git "a/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/soviet.rsi.png" "b/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/soviet.rsi.png" new file mode 100644 index 00000000000..55fdfc359f7 Binary files /dev/null and "b/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/soviet.rsi.png" differ diff --git "a/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/walk.png" "b/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/walk.png" new file mode 100644 index 00000000000..f7cad6fd7ce Binary files /dev/null and "b/Resources/Textures/Forge/\320\241\320\241\320\241\320\237/walk.png" differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/equipped-BELT.png b/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/equipped-BELT.png new file mode 100644 index 00000000000..6d8c11e477a Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/full.png b/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/full.png new file mode 100644 index 00000000000..9858a087bf6 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/full.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/half.png b/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/half.png new file mode 100644 index 00000000000..1f6963fc766 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/half.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/icon.png new file mode 100644 index 00000000000..9858a087bf6 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/inhand-left.png b/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/inhand-left.png new file mode 100644 index 00000000000..74e0073f082 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/inhand-left.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/inhand-right.png b/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/inhand-right.png new file mode 100644 index 00000000000..1e95f217d99 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/inhand-right.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/meta.json new file mode 100644 index 00000000000..28457b3f6cf --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Aleksh", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "half" + }, + { + "name": "full" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "sheath_on", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/sheath_on.png b/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/sheath_on.png new file mode 100644 index 00000000000..cdae539bbef Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Belt/co_sabre_sheath.rsi/sheath_on.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/equipped-BELT.png b/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/equipped-BELT.png new file mode 100644 index 00000000000..ee71e89694b Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/full.png b/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/full.png new file mode 100644 index 00000000000..4bb577e1e1d Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/full.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/half.png b/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/half.png new file mode 100644 index 00000000000..6f23a8866e3 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/half.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/icon.png new file mode 100644 index 00000000000..289d170e1a0 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/inhand-left.png b/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/inhand-left.png new file mode 100644 index 00000000000..49c61a81ab5 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/inhand-left.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/inhand-right.png b/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/inhand-right.png new file mode 100644 index 00000000000..2e2943e7b9e Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/inhand-right.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/meta.json new file mode 100644 index 00000000000..92df8b6efa7 --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/Belt/spp_brown.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/168c8a79a3d858a8c531ff7ed0bc3033e47d1d16/icons/obj/items/clothing/belts.dmi, https://github.com/cmss13-devs/cmss13/blob/207f72c0f8ca3762632938b51fd1c41bca2c7747/icons/mob/humans/onmob/belt.dmi, https://github.com/cmss13-devs/cmss13/blob/168c8a79a3d858a8c531ff7ed0bc3033e47d1d16/icons/mob/humans/onmob/items_lefthand_1.dmi, https://github.com/cmss13-devs/cmss13/blob/168c8a79a3d858a8c531ff7ed0bc3033e47d1d16/icons/mob/humans/onmob/items_righthand_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "half" + }, + { + "name": "full" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Ears/Headsets/SPP/spp.rsi/equipped-EARS.png b/Resources/Textures/_RMC14/Objects/Clothing/Ears/Headsets/SPP/spp.rsi/equipped-EARS.png new file mode 100644 index 00000000000..ab5d7bd4b95 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Ears/Headsets/SPP/spp.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Ears/Headsets/SPP/spp.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/Ears/Headsets/SPP/spp.rsi/icon.png new file mode 100644 index 00000000000..e8bfb8053db Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Ears/Headsets/SPP/spp.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Ears/Headsets/SPP/spp.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/Ears/Headsets/SPP/spp.rsi/meta.json new file mode 100644 index 00000000000..ccb8a589ec7 --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/Ears/Headsets/SPP/spp.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EARS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Eyes/Glasses/security_glasses.rsi/equipped-EYES.png b/Resources/Textures/_RMC14/Objects/Clothing/Eyes/Glasses/security_glasses.rsi/equipped-EYES.png new file mode 100644 index 00000000000..79bbd796ce8 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Eyes/Glasses/security_glasses.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Eyes/Glasses/security_glasses.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/Eyes/Glasses/security_glasses.rsi/icon.png new file mode 100644 index 00000000000..5c46dc540b8 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Eyes/Glasses/security_glasses.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Eyes/Glasses/security_glasses.rsi/inhand-left.png b/Resources/Textures/_RMC14/Objects/Clothing/Eyes/Glasses/security_glasses.rsi/inhand-left.png new file mode 100644 index 00000000000..9410b0476fb Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Eyes/Glasses/security_glasses.rsi/inhand-left.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Eyes/Glasses/security_glasses.rsi/inhand-right.png b/Resources/Textures/_RMC14/Objects/Clothing/Eyes/Glasses/security_glasses.rsi/inhand-right.png new file mode 100644 index 00000000000..7a79cc8d936 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Eyes/Glasses/security_glasses.rsi/inhand-right.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Eyes/Glasses/security_glasses.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/Eyes/Glasses/security_glasses.rsi/meta.json new file mode 100644 index 00000000000..f19768c1545 --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/Eyes/Glasses/security_glasses.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/f2b3774f6ca9173e76e7783d88e3c2f765cd385f/icons/obj/items/clothing/glasses.dmi and https://github.com/cmss13-devs/cmss13/blob/0c23c26bc85b7ab45fdb212c84807f0215c0a53e/icons/mob/humans/onmob/eyes.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/beret.rsi/equipped-HELMET.png b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/beret.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..0a102a07592 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/beret.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/beret.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/beret.rsi/icon.png new file mode 100644 index 00000000000..19e1a58ae0a Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/beret.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/beret.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/beret.rsi/meta.json new file mode 100644 index 00000000000..91539469d79 --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/beret.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/obj/items/clothing/cm_hats.dmi, https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/mob/humans/onmob/head_1.dmi", + "size": { + "y": 32, + "x": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "directions": 4, + "name": "equipped-HELMET" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/cap.rsi/equipped-HELMET.png b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/cap.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..f3bf45ea30a Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/cap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/cap.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/cap.rsi/icon.png new file mode 100644 index 00000000000..ede78676ead Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/cap.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/cap.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/cap.rsi/meta.json new file mode 100644 index 00000000000..91539469d79 --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/cap.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/obj/items/clothing/cm_hats.dmi, https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/mob/humans/onmob/head_1.dmi", + "size": { + "y": 32, + "x": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "directions": 4, + "name": "equipped-HELMET" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/kommisar_cap_white.rsi/equipped-HELMET.png b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/kommisar_cap_white.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..c5e531e74bd Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/kommisar_cap_white.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/kommisar_cap_white.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/kommisar_cap_white.rsi/icon.png new file mode 100644 index 00000000000..c3d5b5bb602 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/kommisar_cap_white.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/kommisar_cap_white.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/kommisar_cap_white.rsi/meta.json new file mode 100644 index 00000000000..1f46a87128f --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/kommisar_cap_white.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Based off of https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/obj/items/clothing/cm_hats.dmi, https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/mob/humans/onmob/head_1.dmi, Altered by KompaniLinge on Github", + "size": { + "y": 32, + "x": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "directions": 4, + "name": "equipped-HELMET" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/peaked.rsi/equipped-HELMET.png b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/peaked.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..3d02117a274 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/peaked.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/peaked.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/peaked.rsi/icon.png new file mode 100644 index 00000000000..96cc5eec4a8 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/peaked.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/peaked.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/peaked.rsi/meta.json new file mode 100644 index 00000000000..91539469d79 --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/peaked.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/obj/items/clothing/cm_hats.dmi, https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/mob/humans/onmob/head_1.dmi", + "size": { + "y": 32, + "x": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "directions": 4, + "name": "equipped-HELMET" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/peaked_diplomat.rsi/equipped-HELMET.png b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/peaked_diplomat.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..5cc4dd1f8f0 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/peaked_diplomat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/peaked_diplomat.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/peaked_diplomat.rsi/icon.png new file mode 100644 index 00000000000..da2c1c7139b Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/peaked_diplomat.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/peaked_diplomat.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/peaked_diplomat.rsi/meta.json new file mode 100644 index 00000000000..0a1ff0f068b --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/Head/SPP/peaked_diplomat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/obj/items/clothing/cm_hats.dmi, https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/mob/humans/onmob/head_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "directions": 4, + "name": "equipped-HELMET" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Mask/spp_commando_coif.rsi/equipped-MASK.png b/Resources/Textures/_RMC14/Objects/Clothing/Mask/spp_commando_coif.rsi/equipped-MASK.png new file mode 100644 index 00000000000..f62f8cc4ea0 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Mask/spp_commando_coif.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Mask/spp_commando_coif.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/Mask/spp_commando_coif.rsi/icon.png new file mode 100644 index 00000000000..62c7f498dc7 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Mask/spp_commando_coif.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Mask/spp_commando_coif.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/Mask/spp_commando_coif.rsi/meta.json new file mode 100644 index 00000000000..f943887b651 --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/Mask/spp_commando_coif.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 at https://github.com/cmss13-devs/cmss13/blob/master/icons/obj/items/clothing/masks/masks_by_faction/UPP.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/army.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/army.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..babbb5e8e7a Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/army.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/army.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/army.rsi/icon.png new file mode 100644 index 00000000000..328c08b7b20 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/army.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/army.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/army.rsi/meta.json new file mode 100644 index 00000000000..22636bd877b --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/army.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/master/icons/obj/items/clothing/suits/suits_by_faction/UPP.dmi, https://github.com/cmss13-devs/cmss13/blob/master/icons/mob/humans/onmob/suits/suits_by_faction/UPP.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/kommisarwhitecoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/kommisarwhitecoat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..ac08173c193 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/kommisarwhitecoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/kommisarwhitecoat.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/kommisarwhitecoat.rsi/icon.png new file mode 100644 index 00000000000..30e12231a04 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/kommisarwhitecoat.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/kommisarwhitecoat.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/kommisarwhitecoat.rsi/meta.json new file mode 100644 index 00000000000..98d086de9ed --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/kommisarwhitecoat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Made by KompaniLinge on Github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/mp.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/mp.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..1cbfcb6eaf0 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/mp.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/mp.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/mp.rsi/icon.png new file mode 100644 index 00000000000..f87416d44bd Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/mp.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/mp.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/mp.rsi/meta.json new file mode 100644 index 00000000000..af99a367e68 --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/mp.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/obj/items/clothing/cm_suits.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/officer.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/officer.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..a5dae725321 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/officer.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/officer.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/officer.rsi/icon.png new file mode 100644 index 00000000000..8407614b50a Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/officer.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/officer.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/officer.rsi/meta.json new file mode 100644 index 00000000000..cea44b61067 --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/officer.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/obj/items/clothing/cm_suits.dmi, https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/mob/humans/onmob/suit_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/pap.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/pap.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..ca0a1a62d8c Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/pap.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/pap.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/pap.rsi/icon.png new file mode 100644 index 00000000000..7585c1defc2 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/pap.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/pap.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/pap.rsi/meta.json new file mode 100644 index 00000000000..a43b6ea6211 --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/pap.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/master/icons/obj/items/clothing/suits.dmi, https://github.com/cmss13-devs/cmss13/blob/master/icons/mob/humans/onmob/suit_0.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/senior.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/senior.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..cbcc24e8b6c Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/senior.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/senior.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/senior.rsi/icon.png new file mode 100644 index 00000000000..b45514acc6a Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/senior.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/senior.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/senior.rsi/meta.json new file mode 100644 index 00000000000..cea44b61067 --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/senior.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/obj/items/clothing/cm_suits.dmi, https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/mob/humans/onmob/suit_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/sof_plated.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/sof_plated.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..e256b55ab65 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/sof_plated.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/sof_plated.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/sof_plated.rsi/icon.png new file mode 100644 index 00000000000..10282c2da31 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/sof_plated.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/sof_plated.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/sof_plated.rsi/meta.json new file mode 100644 index 00000000000..b745c623db5 --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/OuterClothing/SPP/sof_plated.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/Zenith00000/cmss13/blob/4392fc4ecb1fba8e8bec166bcbf0cac4c0b2ef64/icons/obj/items/clothing/suits/suits_by_faction/UPP.dmi and https://github.com/cmss13-devs/cmss13/blob/48f0eac6daac63cac0c4284b8434ca67d464baee/icons/mob/humans/onmob/clothing/suits/suits_by_faction/UPP.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/black.rsi/equipped-FEET.png b/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/black.rsi/equipped-FEET.png new file mode 100644 index 00000000000..7e24006bf30 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/black.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/black.rsi/filled.png b/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/black.rsi/filled.png new file mode 100644 index 00000000000..87b8b87a897 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/black.rsi/filled.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/black.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/black.rsi/icon.png new file mode 100644 index 00000000000..d44e274e993 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/black.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/black.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/black.rsi/meta.json new file mode 100644 index 00000000000..386079e96d9 --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/black.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/05eaa3484b1a35aa759300bcfc8f0119f009daae/icons/mob/humans/onmob/feet.dmi, https://github.com/cmss13-devs/cmss13/blob/05eaa3484b1a35aa759300bcfc8f0119f009daae/icons/obj/items/clothing/shoes.dmi, https://github.com/cmss13-devs/cmss13/blob/a15efa985114bf92a98cda275aa8319636ae5abe/icons/obj/items/clothing/shoes.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "filled" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/jungle.rsi/equipped-FEET.png b/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/jungle.rsi/equipped-FEET.png new file mode 100644 index 00000000000..fe57279b27c Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/jungle.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/jungle.rsi/filled.png b/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/jungle.rsi/filled.png new file mode 100644 index 00000000000..bd9cf35c2db Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/jungle.rsi/filled.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/jungle.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/jungle.rsi/icon.png new file mode 100644 index 00000000000..97043c1190d Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/jungle.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/jungle.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/jungle.rsi/meta.json new file mode 100644 index 00000000000..386079e96d9 --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/Shoes/Boots/jungle.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/05eaa3484b1a35aa759300bcfc8f0119f009daae/icons/mob/humans/onmob/feet.dmi, https://github.com/cmss13-devs/cmss13/blob/05eaa3484b1a35aa759300bcfc8f0119f009daae/icons/obj/items/clothing/shoes.dmi, https://github.com/cmss13-devs/cmss13/blob/a15efa985114bf92a98cda275aa8319636ae5abe/icons/obj/items/clothing/shoes.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "filled" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/Command/CO/formal_white.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/Command/CO/formal_white.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..b844412cd3d Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/Command/CO/formal_white.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/Command/CO/formal_white.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/Command/CO/formal_white.rsi/icon.png new file mode 100644 index 00000000000..b8676810965 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/Command/CO/formal_white.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/Command/CO/formal_white.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/Command/CO/formal_white.rsi/meta.json new file mode 100644 index 00000000000..9dfc1dbfd98 --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/Command/CO/formal_white.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/05eaa3484b1a35aa759300bcfc8f0119f009daae/icons/obj/items/clothing/uniforms.dmi, https://github.com/cmss13-devs/cmss13/blob/05eaa3484b1a35aa759300bcfc8f0119f009daae/icons/mob/humans/onmob/uniform_0.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/army.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/army.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..fcbfd8a9e3b Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/army.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/army.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/army.rsi/icon.png new file mode 100644 index 00000000000..6968ad4a885 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/army.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/army.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/army.rsi/meta.json new file mode 100644 index 00000000000..822a10b7a81 --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/army.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/master/icons/mob/humans/onmob/uniforms/uniforms_by_faction/UPP.dmi, https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/obj/items/clothing/uniforms/uniforms_by_faction/UPP.dmi", + "states": [ + { + "directions": 4, + "name": "equipped-INNERCLOTHING" + }, + { + "name": "icon" + } + ], + "version": 1, + "size": { + "y": 32, + "x": 32 + } +} \ No newline at end of file diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/medic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/medic.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..aefbb0e606f Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/medic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/medic.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/medic.rsi/icon.png new file mode 100644 index 00000000000..ed10df9eb75 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/medic.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/medic.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/medic.rsi/meta.json new file mode 100644 index 00000000000..38e1beb222c --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/medic.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/obj/items/clothing/uniforms.dmi, https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/mob/humans/onmob/uniform_0.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/officer.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..58eb2ef0446 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/officer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/officer.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/officer.rsi/icon.png new file mode 100644 index 00000000000..d83522078e1 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/officer.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/officer.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/officer.rsi/meta.json new file mode 100644 index 00000000000..223f5566ec9 --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/officer.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/mob/humans/onmob/uniform_0.dmi, https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/obj/items/clothing/uniforms.dmi", + "states": [ + { + "directions": 4, + "name": "equipped-INNERCLOTHING" + }, + { + "name": "icon" + } + ], + "version": 1, + "size": { + "y": 32, + "x": 32 + } +} \ No newline at end of file diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/pap.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/pap.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..a61ac12f593 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/pap.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/pap.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/pap.rsi/icon.png new file mode 100644 index 00000000000..2d5f54e6933 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/pap.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/pap.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/pap.rsi/meta.json new file mode 100644 index 00000000000..822a10b7a81 --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Clothing/Uniforms/SPP/pap.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/master/icons/mob/humans/onmob/uniforms/uniforms_by_faction/UPP.dmi, https://github.com/cmss13-devs/cmss13/blob/06d35efb20e830eacc57d3c77fea047dadbcdee3/icons/obj/items/clothing/uniforms/uniforms_by_faction/UPP.dmi", + "states": [ + { + "directions": 4, + "name": "equipped-INNERCLOTHING" + }, + { + "name": "icon" + } + ], + "version": 1, + "size": { + "y": 32, + "x": 32 + } +} \ No newline at end of file diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Melee/co_sabre.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Weapons/Melee/co_sabre.rsi/icon.png new file mode 100644 index 00000000000..70cb811f88b Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Weapons/Melee/co_sabre.rsi/icon.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Melee/co_sabre.rsi/inhand-left.png b/Resources/Textures/_RMC14/Objects/Weapons/Melee/co_sabre.rsi/inhand-left.png new file mode 100644 index 00000000000..538b52e59fe Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Weapons/Melee/co_sabre.rsi/inhand-left.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Melee/co_sabre.rsi/inhand-right.png b/Resources/Textures/_RMC14/Objects/Weapons/Melee/co_sabre.rsi/inhand-right.png new file mode 100644 index 00000000000..1b9e6154224 Binary files /dev/null and b/Resources/Textures/_RMC14/Objects/Weapons/Melee/co_sabre.rsi/inhand-right.png differ diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Melee/co_sabre.rsi/meta.json b/Resources/Textures/_RMC14/Objects/Weapons/Melee/co_sabre.rsi/meta.json new file mode 100644 index 00000000000..91985c4797d --- /dev/null +++ b/Resources/Textures/_RMC14/Objects/Weapons/Melee/co_sabre.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Aleksh", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}