diff --git a/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl index 79214fbfd1b..1be353ff784 100644 --- a/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl @@ -5,6 +5,11 @@ # Command ent-MagistratNeck = Галстуки ent-MagistratJumpsuit = Костюмы + +loadout-group-blueshield-jumpsuit = ОСЩ, комбинезон +loadout-group-blueshield-head = ОСЩ, голова +loadout-group-blueshield-neck = ОСЩ, шея +loadout-group-blueshield-back = ОСЩ, рюкзак # Civilian # Cargo diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/backpack.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/backpack.ftl index df4a09f8ae2..632c46339f0 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/backpack.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/backpack.ftl @@ -15,7 +15,7 @@ ent-ADTClothingBackpackDuffelBlueshield = вещмешок офицера син ent-ADTClothingBackpackDuffelBlueshieldFilled = { ent-ADTClothingBackpackDuffelBlueshield } .desc = { ent-ADTClothingBackpackDuffelBlueshield } .suffix = { "Полный" } -ent-ADTClothingBackpackSatchelBlueshield = вещмешок офицера синего щита +ent-ADTClothingBackpackSatchelBlueshield = сумка офицера синего щита .desc = Крайне вместительная черно-синяя сумка с яркими белыми эмблемами щита, предназначенная для хранения охранного и медицинского арсенала Офицеров Синего Щита. ent-ADTClothingBackpackSatchelBlueshieldFilled = { ent-ADTClothingBackpackSatchelBlueshield } .desc = { ent-ADTClothingBackpackSatchelBlueshield } diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Command/blueshield.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Command/blueshield.yml new file mode 100644 index 00000000000..341c64bfd1b --- /dev/null +++ b/Resources/Prototypes/ADT/Loadouts/Jobs/Command/blueshield.yml @@ -0,0 +1,93 @@ +# Head +- type: loadout + id: ADTBlueshieldHeadBeret + equipment: ADTBlueshieldHeadBeret + +- type: startingGear + id: ADTBlueshieldHeadBeret + equipment: + head: ADTClothingHeadHatBeretBlueshield + +- type: loadout + id: ADTBlueshieldHeadBeretBlack + equipment: ADTBlueshieldHeadBeretBlack + +- type: startingGear + id: ADTBlueshieldHeadBeretBlack + equipment: + head: ADTClothingHeadHatBeretBlueshieldBlack + +# Jumpsuit +- type: loadout + id: ADTBlueshieldJumpsuit + equipment: ADTBlueshieldJumpsuit + +- type: startingGear + id: ADTBlueshieldJumpsuit + equipment: + jumpsuit: ADTClothingUniformJumpsuitBlueshield + +- type: loadout + id: ADTBlueshieldJumpskirt + equipment: ADTBlueshieldJumpskirt + +- type: startingGear + id: ADTBlueshieldJumpskirt + equipment: + jumpsuit: ADTClothingUniformJumpskirtBlueshield + +- type: loadout + id: ADTBlueshieldJumpsuitTurtleneck + equipment: ADTBlueshieldJumpsuitTurtleneck + +- type: startingGear + id: ADTBlueshieldJumpsuitTurtleneck + equipment: + jumpsuit: ADTClothingUniformJumpsuitBlueshieldTurtleneck + +- type: loadout + id: ADTBlueshieldJumpskirtTurtleneck + equipment: ADTBlueshieldJumpskirtTurtleneck + +- type: startingGear + id: ADTBlueshieldJumpskirtTurtleneck + equipment: + jumpsuit: ADTClothingUniformJumpskirtBlueshieldTurtleneck + +# Neck +- type: loadout + id: ADTBlueshieldCloak + equipment: ADTBlueshieldCloak + +- type: startingGear + id: ADTBlueshieldCloak + equipment: + neck: ADTClothingNeckCloakBlueshield + +# Back +- type: loadout + id: ADTBlueshieldBackpack + equipment: ADTBlueshieldBackpack + +- type: startingGear + id: ADTBlueshieldBackpack + equipment: + back: ADTClothingBlueshieldBackpack + +- type: loadout + id: ADTBlueshieldSatchel + equipment: ADTBlueshieldSatchel + +- type: startingGear + id: ADTBlueshieldSatchel + equipment: + back: ADTClothingBackpackSatchelBlueshield + +- type: loadout + id: ADTBlueshieldDuffel + equipment: ADTBlueshieldDuffel + +- type: startingGear + id: ADTBlueshieldDuffel + equipment: + back: ADTClothingBackpackDuffelBlueshield diff --git a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml index facd4eb165d..25e87e1506c 100644 --- a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml @@ -94,3 +94,42 @@ - LatexGloves - PurpleGloves - RobohandsGloves + +#Blueshield +- type: loadoutGroup + id: ADTBlueshieldJumpsuit + name: loadout-group-blueshield-jumpsuit + minLimit: 1 + maxLimit: 1 + loadouts: + - ADTBlueshieldJumpsuit + - ADTBlueshieldJumpskirt + - ADTBlueshieldJumpsuitTurtleneck + - ADTBlueshieldJumpskirtTurtleneck + +- type: loadoutGroup + id: ADTBlueshieldHead + name: loadout-group-blueshield-head + minLimit: 0 + maxLimit: 1 + loadouts: + - ADTBlueshieldHeadBeret + - ADTBlueshieldHeadBeretBlack + +- type: loadoutGroup + id: ADTBlueshieldNeck + name: loadout-group-blueshield-neck + minLimit: 0 + maxLimit: 1 + loadouts: + - ADTBlueshieldCloak + +- type: loadoutGroup + id: ADTBlueshieldBack + name: loadout-group-blueshield-back + minLimit: 1 + maxLimit: 1 + loadouts: + - ADTBlueshieldBackpack + - ADTBlueshieldSatchel + - ADTBlueshieldDuffel diff --git a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml index dd613aacad5..1a71f96f28f 100644 --- a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml @@ -44,3 +44,16 @@ - Survival - Trinkets - GroupSpeciesBreathTool + +- type: roleLoadout + id: JobADTBlueShieldOfficer + groups: + - Inventory # Corvax-Loadouts + - GroupTankHarness + - ADTBlueshieldHead + - ADTBlueshieldJumpsuit + - ADTBlueshieldNeck + - ADTBlueshieldBack + - SurvivalSecurity + - Trinkets + - GroupSpeciesBreathToolSecurity diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Command/blueshieldofficer.yml b/Resources/Prototypes/ADT/Roles/Jobs/Command/blueshieldofficer.yml index 843e7996a4c..098800c0b76 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/Command/blueshieldofficer.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/Command/blueshieldofficer.yml @@ -40,11 +40,11 @@ - type: startingGear id: ADTBlueShieldOfficerGear equipment: - head: ADTClothingHeadHatBeretBlueshieldBlack + # head: ADTClothingHeadHatBeretBlueshieldBlack eyes: ADTClothingEyesGlassesBlueshield ears: ADTClothingHeadsetBlueshield - jumpsuit: ADTClothingUniformJumpsuitBlueshield - back: ADTClothingBlueshieldBackpack + # jumpsuit: ADTClothingUniformJumpsuitBlueshield + # back: ADTClothingBlueshieldBackpack shoes: ClothingShoesBootsCombatFilled outerClothing: ADTClothingBlueshieldArmor belt: ADTClothingBeltMedicalSecurityFilled