Skip to content

Commit

Permalink
Вторая шлёпская итерация (SerbiaStrong-220#1742)
Browse files Browse the repository at this point in the history
* floppa-cigar

* smoking-fish

* floppa-zippo

* plushshlepa

* devil-horns

* vip-crock

* floppa-champage

* redcoat-repsrite

* pink-mafia-resprite

* dante-resprite

* pivozavr-(not loadout)

* muzhik-(not loadout)

* nanami-(not loadout)

* transfer

Ooops

* transfer-2

* pivozavr&nanani_kento-loadout

* muzhik-loadout

*ба*нные лодауты б**ть

* survival-box

* floppa-pipe

* blackcoat-resprite

* beer-tracker

* cloat-1984

* cyberpunj-jacket

* neck-220

* white-coat

* vox-update

* gold-clown

* tayler-under

* moryak

* fix-ss220-neck

* developer-tier

* neck

* fix-id dublicate-after-upstream

* head&amdinistrator-neck

* neck

* cyberpunk

Уебите меня лопатой, пожалуйста...

* Update loadout_groups.yml

nasral

* fix

* rabotaem

* halo

чтоооооооо-то не работает, гагага

* cyber-vox

* Update Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml

Co-authored-by: Ady4ik <141335742+Ady4ik@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Ady4ik <141335742+Ady4ik@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Ady4ik <141335742+Ady4ik@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Ady4ik <141335742+Ady4ik@users.noreply.github.com>

* moryak-shoes-fix

Намаппили на мою голову

* final-update

* fix

* Floppa

* fix

* fixx

---------

Co-authored-by: Ady4ik <141335742+Ady4ik@users.noreply.github.com>
  • Loading branch information
EstKemran and Ady4ik authored Sep 25, 2024
1 parent f89cfb3 commit 5c46a69
Show file tree
Hide file tree
Showing 487 changed files with 4,921 additions and 384 deletions.
39 changes: 39 additions & 0 deletions Resources/Audio/SS220/Sponsor/attributions.yml
Original file line number Diff line number Diff line change
@@ -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"
Binary file added Resources/Audio/SS220/Sponsor/doctorlivesey1.ogg
Binary file not shown.
Binary file added Resources/Audio/SS220/Sponsor/doctorlivesey2.ogg
Binary file not shown.
Binary file added Resources/Audio/SS220/Sponsor/doctorlivesey3.ogg
Binary file not shown.
Binary file added Resources/Audio/SS220/Sponsor/floppa1.ogg
Binary file not shown.
Binary file added Resources/Audio/SS220/Sponsor/floppa2.ogg
Binary file not shown.
Binary file added Resources/Audio/SS220/Sponsor/floppa3.ogg
Binary file not shown.
Binary file added Resources/Audio/SS220/Sponsor/smokingfish1.ogg
Binary file not shown.
Binary file added Resources/Audio/SS220/Sponsor/smokingfish2.ogg
Binary file not shown.
11 changes: 0 additions & 11 deletions Resources/Locale/ru-RU/ss220/clothing/moryak.ftl

This file was deleted.

12 changes: 0 additions & 12 deletions Resources/Locale/ru-RU/ss220/clothing/usatyu.ftl

This file was deleted.

2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/foldable.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
halo-verb = отправиться в рай
halo-hell-verb = отправиться в ад
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
loadout-group-chef-medical-neck = Главный врач, шея
3 changes: 2 additions & 1 deletion Resources/Locale/ru-RU/ss220/loadout-groups/clown.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
loadout-group-clown-mask = Клоун, маска
loadout-group-clown-neck = Клоун, шея
loadout-group-clown-gloves = Клоун, перчатки
loadout-group-clown-neck = Клоун, шея
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ss220/loadout-groups/iaa.ftl
Original file line number Diff line number Diff line change
@@ -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 = АВД, голова
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ss220/loadout-groups/lawyer.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
loadout-group-lawyer-outerclothing = Адвокат, верхняя одежда
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ss220/loadout-groups/medical.ftl
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
loadout-group-medical-neck = Врач, шея
loadout-group-medical-glasses = Врач, очки
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ss220/loadout-groups/mime.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
loadout-group-mime-shoes = Мим, обувь
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ss220/loadout-groups/neck.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
loadout-group-neck = Шея
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ss220/loadout-groups/scientist.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
loadout-group-scientist-glasses = Учёный, очки
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
loadout-group-security-mask = Офицер СБ, маска
loadout-group-security-glasses = Офицер СБ, очки
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
loadout-group-engineer-glasses = Инженер, очки
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
ent-ClothingHeadHatDevilHorns = дьявольские рожки
ent-ClothingHeadHatDevilHorns = дьявольские рожки с хвостом
.desc = Теперь вы выглядите как чёрт.
.suffix = НЕ МАППИТЬ!
ent-ClothingHeadHatDevilHornsAlt = дьявольские рожки
.desc = Теперь вы выглядите как чёрт.
.suffix = НЕ МАППИТЬ! Без хвоста
4 changes: 3 additions & 1 deletion Resources/Locale/ru-RU/ss220/reagents/meta/drinks.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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 = Элитный вид шампанского.
10 changes: 0 additions & 10 deletions Resources/Maps/SS220/Salvage/Small2_SS220.yml
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,6 @@ entities:
occludes: True
ents:
- 56
- 55
paper_label: !type:ContainerSlot
showEnts: False
occludes: True
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#SS220-IAA-Loadout-Begin
storage:
back:
- BoxSurvival
# - BoxSurvival SS220-Two Floppa Iteration
- Telescopichka
- Flash
- ExpensiveLighterNanotrasen
Expand Down
9 changes: 9 additions & 0 deletions Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading

0 comments on commit 5c46a69

Please sign in to comment.