SerbiaStrong-220 · EstKemran · Sep 4, 2024 · Sep 4, 2024 · Sep 4, 2024 · Sep 4, 2024
diff --git a/Resources/Locale/ru-RU/ss220/clothing/moryak.ftl b/Resources/Locale/ru-RU/ss220/clothing/moryak.ftl
diff --git a/Resources/Locale/ru-RU/ss220/clothing/usatyu.ftl b/Resources/Locale/ru-RU/ss220/clothing/usatyu.ftl
diff --git a/Resources/Locale/ru-RU/ss220/foldable.ftl b/Resources/Locale/ru-RU/ss220/foldable.ftl
@@ -0,0 +1,2 @@
+halo-verb = отправиться в рай
+halo-hell-verb = отправиться в ад
diff --git a/Resources/Locale/ru-RU/ss220/loadout-groups/chef-medical-officer.ftl b/Resources/Locale/ru-RU/ss220/loadout-groups/chef-medical-officer.ftl
@@ -0,0 +1 @@
+loadout-group-chef-medical-neck = Главный врач, шея
diff --git a/Resources/Locale/ru-RU/ss220/loadout-groups/clown.ftl b/Resources/Locale/ru-RU/ss220/loadout-groups/clown.ftl
@@ -1,2 +1,3 @@
 loadout-group-clown-mask = Клоун, маска
-loadout-group-clown-neck = Клоун, шея
+loadout-group-clown-gloves = Клоун, перчатки
+loadout-group-clown-neck = Клоун, шея
diff --git a/Resources/Locale/ru-RU/ss220/loadout-groups/iaa.ftl b/Resources/Locale/ru-RU/ss220/loadout-groups/iaa.ftl
@@ -1,2 +1,6 @@
 loadout-group-iaa-jumpsuit = АВД, комбинезон
 loadout-group-iaa-backpack = АВД, рюкзак
+loadout-group-iaa-outerclothing = АВД, верхняя одежда
+loadout-group-iaa-glasses = АВД, очки
+loadout-group-iaa-neck = АВД, шея
+loadout-group-iaa-head = АВД, голова
diff --git a/Resources/Locale/ru-RU/ss220/loadout-groups/lawyer.ftl b/Resources/Locale/ru-RU/ss220/loadout-groups/lawyer.ftl
@@ -0,0 +1 @@
+loadout-group-lawyer-outerclothing = Адвокат, верхняя одежда
diff --git a/Resources/Locale/ru-RU/ss220/loadout-groups/medical.ftl b/Resources/Locale/ru-RU/ss220/loadout-groups/medical.ftl
@@ -1 +1,2 @@
 loadout-group-medical-neck = Врач, шея
+loadout-group-medical-glasses = Врач, очки
diff --git a/Resources/Locale/ru-RU/ss220/loadout-groups/mime.ftl b/Resources/Locale/ru-RU/ss220/loadout-groups/mime.ftl
@@ -0,0 +1 @@
+loadout-group-mime-shoes = Мим, обувь
diff --git a/Resources/Locale/ru-RU/ss220/loadout-groups/neck.ftl b/Resources/Locale/ru-RU/ss220/loadout-groups/neck.ftl
@@ -0,0 +1 @@
+loadout-group-neck = Шея
diff --git a/Resources/Locale/ru-RU/ss220/loadout-groups/scientist.ftl b/Resources/Locale/ru-RU/ss220/loadout-groups/scientist.ftl
@@ -0,0 +1 @@
+loadout-group-scientist-glasses = Учёный, очки
diff --git a/Resources/Locale/ru-RU/ss220/loadout-groups/security-officer.ftl b/Resources/Locale/ru-RU/ss220/loadout-groups/security-officer.ftl
@@ -1 +1,2 @@
 loadout-group-security-mask = Офицер СБ, маска
+loadout-group-security-glasses = Офицер СБ, очки
diff --git a/Resources/Locale/ru-RU/ss220/loadout-groups/station_engineer.ftl b/Resources/Locale/ru-RU/ss220/loadout-groups/station_engineer.ftl
@@ -0,0 +1 @@
+loadout-group-engineer-glasses = Инженер, очки
diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/clothing/head/devil-horns.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/clothing/head/devil-horns.ftl
@@ -1,6 +1,4 @@
-ent-ClothingHeadHatDevilHorns = дьявольские рожки
+ent-ClothingHeadHatDevilHorns = дьявольские рожки с хвостом
     .desc = Теперь вы выглядите как чёрт.
-    .suffix = НЕ МАППИТЬ!
 ent-ClothingHeadHatDevilHornsAlt = дьявольские рожки
     .desc = Теперь вы выглядите как чёрт.
-    .suffix = НЕ МАППИТЬ! Без хвоста
diff --git a/Resources/Locale/ru-RU/ss220/reagents/meta/drinks.ftl b/Resources/Locale/ru-RU/ss220/reagents/meta/drinks.ftl
@@ -13,4 +13,6 @@ reagent-desc-hot-arachne = Горячие арахны всего в 300 мет
 reagent-name-french-75 = френч-75
 reagent-desc-french-75 = Не только блюспейс артиллерия всё ещё может задать жару.
 reagent-name-eggnog = гоголь-моголь
-reagent-desc-eggnog = Взять сыру яичку и кокнуть в кружку, покрошить хлеба, посолить и взболтать.
+reagent-desc-eggnog = Взять сыру яичку и кокнуть в кружку, покрошить хлеба, посолить и взболтать.
+reagent-name-champagnesponsor = элитное шампанское
+reagent-desc-champagnesponsor = Элитный вид шампанского.
diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml
@@ -41,7 +41,7 @@
 #SS220-IAA-Loadout-Begin
   storage:
     back:
-    - BoxSurvival
+#    - BoxSurvival SS220-Two Floppa Iteration
     - Telescopichka
     - Flash
     - ExpensiveLighterNanotrasen

diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
@@ -42,3 +42,12 @@
     proto: JensenTimer
   equipment:
     eyes: ClothingEyesGlassesJensen
+
+# SS220 Second flopa iteration / Cyber
+- type: loadout
+  id: GlassesCyber
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: BigShlopaSponsorTier
+  equipment:
+    eyes: ClothingSponsorCyberCevVisor
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -51,6 +51,7 @@
   - Glasses
   - GlassesJamjar
   - GlassesJensen
+  - GlassesCyber #SS220-Two Floppa Iteration
 
 - type: loadoutGroup
   id: GroupTankHarness
@@ -64,10 +65,12 @@
   id: Survival
   name: loadout-group-survival-basic
   minLimit: 3
-  hidden: true
+  #  hidden: true #SS220-Two Floppa Iteration | Убрана, дабы игрок мог выбирать шлёпскую версию аварийного запаса
   loadouts:
   - EmergencyNitrogen
   - EmergencyOxygen
+  - EmergencyNitrogenSponsor #SS220-Two Floppa Iteration
+  - EmergencyOxygenSponsor #SS220-Two Floppa Iteration
   - LoadoutSpeciesVoxNitrogen
 
 - type: loadoutGroup
@@ -122,6 +125,14 @@
   - CaptainCloakFormal
   - CaptainMantle
   - CaptainFormalWhiteCloak #ss220-loadout-captain
+  #SS220-Two Floppa Iteration-Begin
+  - CoderNeck
+  - MapperNeck
+  - SpriterNeck
+  - TrackerExpertNeck
+  - AdministratorNeck
+  - HeadDeveloperNeck
+  #SS220-Two Floppa Iteration-End
 
 - type: loadoutGroup
   id: CaptainBackpack
@@ -169,6 +180,14 @@
   loadouts:
   - HoPCloak
   - HoPMantle
+  #SS220-Two Floppa Iteration-Begin
+  - CoderNeck
+  - MapperNeck
+  - SpriterNeck
+  - TrackerExpertNeck
+  - AdministratorNeck
+  - HeadDeveloperNeck
+  #SS220-Two Floppa Iteration-End
 
 - type: loadoutGroup
   id: HoPBackpack
@@ -267,6 +286,7 @@
   - BartenderJumpskirtRed
   - BartenderJumpskirtGreen
   - BartenderJumpskirtNanotrasen #SS220-BartenderResprited-End
+  - BartenderPivozavr #SS220-Two Floppa Iterarion
 
 - type: loadoutGroup
   id: BartenderOuterClothing
@@ -346,13 +366,15 @@
   - LawyerJumpskirtRed
   - LawyerJumpsuitGood
   - LawyerJumpskirtGood
+  - JumpsuitJujutsuShlepa #SS220-Two Floppa Iteration
 
 - type: loadoutGroup
   id: LawyerNeck
   name: loadout-group-lawyer-neck
   minLimit: 0
   loadouts:
   - LawyerNeck
+  - CloakJujutsuShlepa #SS220-Two Floppa Iteration
 
 - type: loadoutGroup
   id: ChaplainHead
@@ -495,6 +517,7 @@
   loadouts:
   - JesterHat
   - JesterAltHat
+  - HeadMuzhik #SS220-Two Floppa Iteration
 
 - type: loadoutGroup
   id: ClownJumpsuit
@@ -507,6 +530,8 @@
   - ClownJumpskirt #SS220-Clown-reSprite-End
   - JesterAltSuit
   - ClownPennywiseJumpsuit #SS220-Clown-Pennywise
+  - JumpsuitMuzhik #SS220-Two Floppa Iteration
+  - JumpsuitGold #SS220-Two Floppa Iteration
 
 - type: loadoutGroup
   id: ClownBackpack
@@ -531,13 +556,18 @@
   - ClownShoes
   - JesterShoes
   - ClownPennywiseShoes #SS220-Clown-Pennywise
+  - ShoesMuzhik #SS220-Two Floppa Iteration
+  - ShoesGold #SS220-Two Floppa Iteration
 
 #ss220-loadout-clown-mask-begin
 - type: loadoutGroup
   id: ClownMask
   name: loadout-group-clown-mask
   loadouts:
+  - MaskClown #SS220-Two Floppa Iteration
   - ClownPennywiseMask
+  - MaskMuzhik #SS220-Two Floppa Iteration
+  - MaskGold #SS220-Two Floppa Iteration
 #ss220-loadout-clown-mask-end
 
 #ss220-loadout-clown-neck-begin
@@ -566,6 +596,7 @@
   - MimeHead
   - MimeFrenchBeret
   - MimeCap
+  - MoryakHead #SS220-Two Floppa Iterarion
 
 - type: loadoutGroup
   id: MimeMask
@@ -574,13 +605,15 @@
   - MimeMask
   - MimeMaskSad
   - MimeMaskScared
+  - MoryakMask #SS220-Two Floppa Iterarion
 
 - type: loadoutGroup
   id: MimeJumpsuit
   name: loadout-group-mime-jumpsuit
   loadouts:
   - MimeJumpsuit
   - MimeJumpskirt
+  - MoryakJumpsuit #SS220-Two Floppa Iterarion
 
 - type: loadoutGroup
   id: MimeBackpack
@@ -696,6 +729,14 @@
   loadouts:
   - QuartermasterCloak
   - QuartermasterMantle
+  #SS220-Two Floppa Iteration-Begin
+  - CoderNeck
+  - MapperNeck
+  - SpriterNeck
+  - TrackerExpertNeck
+  - AdministratorNeck
+  - HeadDeveloperNeck
+  #SS220-Two Floppa Iteration-End
 
 - type: loadoutGroup
   id: QuartermasterOuterClothing
@@ -810,6 +851,14 @@
   - DarkChiefEngineerCloak
   - DarkChiefEngineerMantle
 #ss220-loadout-chief-engineer-end
+  #SS220-Two Floppa Iteration-Begin
+  - CoderNeck
+  - MapperNeck
+  - SpriterNeck
+  - TrackerExpertNeck
+  - AdministratorNeck
+  - HeadDeveloperNeck
+  #SS220-Two Floppa Iteration-End
 
 #ss220-loadout-ce-backpack-begin
 - type: loadoutGroup
@@ -884,6 +933,7 @@
   loadouts:
   - StationEngineerOuterVest
   - StationEngineerWintercoat
+  - CyberJacketEngineer #SS220-Two Floppa Iteration
 
 - type: loadoutGroup
   id: StationEngineerShoes
@@ -935,10 +985,12 @@
   id: SurvivalExtended
   name: loadout-group-survival-extended
   minLimit: 2
-  hidden: true
+  #  hidden: true #SS220-Two Floppa Iteration | Убрана, дабы игрок мог выбирать шлёпскую версию аварийного запаса
   loadouts:
   - EmergencyNitrogenExtended
   - EmergencyOxygenExtended
+  - EmergencyNitrogenExtendedSponsor #SS220-Two Floppa Iteration
+  - EmergencyOxygenExtendedSponsor #SS220-Two Floppa Iteration
   - LoadoutSpeciesVoxNitrogen
 
 # Science
@@ -956,6 +1008,14 @@
   loadouts:
   - ResearchDirectorMantle
   - ResearchDirectorCloak
+  #SS220-Two Floppa Iteration-Begin
+  - CoderNeck
+  - MapperNeck
+  - SpriterNeck
+  - TrackerExpertNeck
+  - AdministratorNeck
+  - HeadDeveloperNeck
+  #SS220-Two Floppa Iteration-End
 
 - type: loadoutGroup
   id: ResearchDirectorJumpsuit
@@ -1029,6 +1089,7 @@
   - RoboticistLabCoat
   - RoboticistWintercoat
   # - SeniorResearcherLabCoat  #SS220 Seniors roles
+  - CyberJacketRnD #SS220-Two Floppa Iteration
 
 - type: loadoutGroup
   id: ScientistShoes
@@ -1100,6 +1161,14 @@
   - HeadofSecurityMantle
   - SecurityHolster #SS220-HoS-Holster
   - MantleHOSShoulder #ss220 sec loadout update
+  #SS220-Two Floppa Iteration-Begin
+  - CoderNeck
+  - MapperNeck
+  - SpriterNeck
+  - TrackerExpertNeck
+  - AdministratorNeck
+  - HeadDeveloperNeck
+  #SS220-Two Floppa Iteration-End
 
 - type: loadoutGroup
   id: HeadofSecurityOuterClothing
@@ -1108,6 +1177,7 @@
   - HeadofSecurityCoat
   - HeadofSecurityWinterCoat
   - WinterHoSUnarmored #ss220 sec loadout update
+  - Outer1984 #SS220-Two Floppa Iteration
 
 - type: loadoutGroup
   id: WardenHead
@@ -1198,6 +1268,7 @@
   - SecurityOfficerWintercoat
   - CoatSecurityOvercoat #ss220 sec loadout update
   - VestArmorSec #ss220 sec loadout update
+  - CyberVestSecurity #SS220-Two Floppa Iteration
 
 - type: loadoutGroup
   id: SecurityShoes
@@ -1266,10 +1337,12 @@
   id: SurvivalSecurity
   name: loadout-group-survival-security
   minLimit: 2
-  hidden: true
+  #  hidden: true #SS220-Two Floppa Iteration | Убрана, дабы игрок мог выбирать шлёпскую версию аварийного запаса
   loadouts:
   - EmergencyNitrogenSecurity
   - EmergencyOxygenSecurity
+  - EmergencyNitrogenSecuritySponsor #SS220-Two Floppa Iteration
+  - EmergencyOxygenSecuritySponsor #SS220-Two Floppa Iteration
   - LoadoutSpeciesVoxNitrogen
 
 - type: loadoutGroup
@@ -1312,6 +1385,14 @@
   loadouts:
   - ChiefMedicalOfficerCloak
   - ChiefMedicalOfficerMantle
+  #SS220-Two Floppa Iteration-Begin
+  - CoderNeck
+  - MapperNeck
+  - SpriterNeck
+  - TrackerExpertNeck
+  - AdministratorNeck
+  - HeadDeveloperNeck
+  #SS220-Two Floppa Iteration-End
 
 - type: loadoutGroup
   id: ChiefMedicalOfficerShoes
@@ -1357,6 +1438,7 @@
   - RegularLabCoat
   - MedicalDoctorWintercoat
   # - SeniorPhysicianLabCoat  #SS220 Seniors roles
+  - CyberJacketMed #SS220-Two Floppa Iteration
 
 - type: loadoutGroup
   id: MedicalBackpack
@@ -1468,10 +1550,12 @@
   id: SurvivalMedical
   name: loadout-group-survival-medical
   minLimit: 2
-  hidden: true
+  #  hidden: true #SS220-Two Floppa Iteration | Убрана, дабы игрок мог выбирать шлёпскую версию аварийного запаса
   loadouts:
   - EmergencyNitrogenMedical
   - EmergencyOxygenMedical
+  - EmergencyNitrogenMedicalSponsor #SS220-Two Floppa Iteration
+  - EmergencyOxygenMedicalSponsor #SS220-Two Floppa Iteration
   - LoadoutSpeciesVoxNitrogen
 
 # Wildcards