SerbiaStrong-220 · DexlerXD · Sep 25, 2024 · Sep 4, 2024 · Sep 4, 2024 · Sep 4, 2024
diff --git a/Resources/Audio/SS220/Sponsor/attributions.yml b/Resources/Audio/SS220/Sponsor/attributions.yml
@@ -0,0 +1,39 @@
+- files: ["floppa1.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by Estkemran (Github) for SS220"
+  source: "https://www.youtube.com/shorts/ITkWYUhqRBU"
+
+- files: ["floppa2.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by Estkemran (Github) for SS220"
+  source: "https://www.youtube.com/shorts/ITkWYUhqRBU"
+
+- files: ["floppa3.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by Estkemran (Github) for SS220"
+  source: "https://www.youtube.com/shorts/ITkWYUhqRBU"
+
+- files: ["smokingfish1.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by jrssandoval, changed and added by Estkemran (Github) for SS220"
+  source: "https://freesound.org/people/jrssandoval/sounds/67166/"
+
+- files: ["smokingfish2.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by jrssandoval, changed and added by Estkemran (Github) for SS220"
+  source: "https://freesound.org/people/jrssandoval/sounds/67166/"
+
+- files: ["doctorlivesey1.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by Estkemran (Github) for SS220"
+  source: "https://www.youtube.com/watch?v=s9DE5UekWmI"
+
+- files: ["doctorlivesey2.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by Estkemran (Github) for SS220"
+  source: "https://www.youtube.com/watch?v=s9DE5UekWmI"
+
+- files: ["doctorlivesey3.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by Estkemran (Github) for SS220"
+  source: "https://www.youtube.com/watch?v=s9DE5UekWmI"
diff --git a/Resources/Audio/SS220/Sponsor/doctorlivesey1.ogg b/Resources/Audio/SS220/Sponsor/doctorlivesey1.ogg
diff --git a/Resources/Audio/SS220/Sponsor/doctorlivesey2.ogg b/Resources/Audio/SS220/Sponsor/doctorlivesey2.ogg
diff --git a/Resources/Audio/SS220/Sponsor/doctorlivesey3.ogg b/Resources/Audio/SS220/Sponsor/doctorlivesey3.ogg
diff --git a/Resources/Audio/SS220/Sponsor/floppa1.ogg b/Resources/Audio/SS220/Sponsor/floppa1.ogg
diff --git a/Resources/Audio/SS220/Sponsor/floppa2.ogg b/Resources/Audio/SS220/Sponsor/floppa2.ogg
diff --git a/Resources/Audio/SS220/Sponsor/floppa3.ogg b/Resources/Audio/SS220/Sponsor/floppa3.ogg
diff --git a/Resources/Audio/SS220/Sponsor/smokingfish1.ogg b/Resources/Audio/SS220/Sponsor/smokingfish1.ogg
diff --git a/Resources/Audio/SS220/Sponsor/smokingfish2.ogg b/Resources/Audio/SS220/Sponsor/smokingfish2.ogg
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/Maps/SS220/Salvage/Small2_SS220.yml b/Resources/Maps/SS220/Salvage/Small2_SS220.yml
@@ -571,7 +571,6 @@ entities:
           occludes: True
           ents:
           - 56
-          - 55
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -601,15 +600,6 @@ entities:
         - 0
         - 0
         - 0
-- proto: ClothingMaskYsatyu
-  entities:
-  - uid: 55
-    components:
-    - type: Transform
-      parent: 54
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ComfyChair
   entities:
   - uid: 58

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