Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Loadout new #862

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

Loadout new #862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3767ce1
день 1, изменение лодаута
Nrd-K Dec 7, 2024
cc12859
конец первого дня, ви закончен, завтра примусь за остальной инженерный
Nrd-K Dec 7, 2024
74cfa69
день 2, утро , инженерный отдел закончен?
Nrd-K Dec 8, 2024
9852d1d
странно что сохранился только перевод
Nrd-K Dec 8, 2024
35b36a4
день 3, небольшие добавление, формирование групп, завтра скорее всего…
Nrd-K Dec 9, 2024
5e643f9
День 4, с карго не закончили, весь день пришлось прорабатывать ogg, ч…
Nrd-K Dec 10, 2024
dbb1e61
День 5, карго закончено!
Nrd-K Dec 11, 2024
d6324ef
пришлось немного забыть на время о пре, внесенены небольшие корректир…
Nrd-K Dec 15, 2024
7e06aa4
Merge branch 'space-sunrise:master' into Loadout-new
Nrd-K Dec 15, 2024
8476245
небольшие правочки, в связи с добавлением короны
Nrd-K Dec 15, 2024
19a5466
свободного времени всё меньше и меньше поэтому пока так
Nrd-K Dec 17, 2024
fa700c8
Merge branch 'space-sunrise:master' into Loadout-new
Nrd-K Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Resources/Audio/_Sunrise/GW/goldenweh1.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/_Sunrise/GW/goldenweh2.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/_Sunrise/GW/goldenweh3.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/_Sunrise/GW/goldenweh4.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/_Sunrise/GW/goldenweh5.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/_Sunrise/Tovarish.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/_Sunrise/bye.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/_Sunrise/not_for_long_weh.ogg
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/head/bandanas.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ent-ClothingHeadBandOrange = orange bandana
.desc = { ent-ClothingHeadBandBase.desc }
ent-ClothingHeadBandYellow = yellow bandana
.desc = { ent-ClothingHeadBandBase.desc }
ent-ClothingHeadBandCyan = cyan bandana
.desc = { ent-ClothingHeadBandBase.desc }
ent-ClothingHeadBandWhite = white bandana
.desc = { ent-ClothingHeadBandBase.desc }
ent-ClothingHeadBandPurple = purple bandana
.desc = { ent-ClothingHeadBandBase.desc }
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/head/soft.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ent-ClothingHeadHatBrown = brown cap
.desc = It's a baseball hat in a tasteless brown colour.
ent-ClothingHeadHatBrownsoftFlipped = brown cap
.desc = { ent-ClothingHeadHeadHatBaseFlipped.desc }
10 changes: 10 additions & 0 deletions Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/masks/bandanas.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ent-ClothingMaskBandOrange = orange bandana
.desc = A orange bandana to make you look cool.
ent-ClothingMaskBandYellow = yellow bandana
.desc = A yellow bandana to make you look cool.
ent-ClothingMaskBandCyan = cyan bandana
.desc = A cyan bandana to make you look cool.
ent-ClothingMaskBandWhite = white bandana
.desc = A white bandana to make you look cool.
ent-ClothingMaskBandPurple = purple bandana
.desc = A purple bandana to make you look cool.
5 changes: 5 additions & 0 deletions Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/neck/scarfs.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ent-ClothingNeckScarfStripedYellow = striped yellow scarf
.desc = A stylish striped yellow scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.

ent-ClothingNeckScarfStripedCyan = striped cyan scarf
.desc = A stylish striped cyan scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/outerclothing/misc.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ClothingOuterFlannelWhite = white flannel jacket
.desc = An old fashioned white flannel jacket for space autumn.
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/fun/toys.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,5 @@ ent-PlushieAgata = Plush Agent Agata Katsuhiro
.desc = This plushie was made on a planetary prison by convicted Syndicate agents. Wear it proudly, corporate
ent-PlushieMilosTanka = Plush Milos-Tanaka
.desc = Unathi in a Central Command uniform, what could he possibly be hiding in him besides two knives and a revolver?
ent-LegendaryGoldenWeh = Legendary golden Weh
.desc = Do you remember how you made your way through the dangers, how you left a fake instead, accidentally activated a trap and started running away from a huge ball! But wait, it was a dream, then where did you get it?
1 change: 1 addition & 0 deletions Resources/Locale/en-US/_strings/_sunrise/loadout/loadouts.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ MedicalDoctor-loadout = Снаряжение врача
MedicalIntern-loadout = Снаряжение интерна
Paramedic-loadout = Снаряжение парамедика
SeniorPhysician-loadout = Снаряжение ведущего врача
MedicalPathologist-loadout = Снаряжение патологоанатома
# Researching
ResearchAssistant-loadout = Снаряжение научного ассистента
Roboticist-loadout = Снаряжение робототехника
Expand Down
52 changes: 51 additions & 1 deletion Resources/Locale/en-US/_strings/_sunrise/preferences/loadout-groups.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,29 @@ loadout-group-centcomm-operator-head-hat = Головой убор ОЦК
loadout-group-senior-officer-jumpsuit = Униформа инструктора СБ
loadout-group-senior-researcher-jumpsuit = Униформа ведущего учёного
loadout-group-senior-physician-jumpsuit = Униформа ведущего врача
loadout-group-senior-physician-head = Ведущий врач, голова
loadout-group-senior-physician-outerclothing = Ведущий врач, верхняя одежда
loadout-group-senior-physician-neck = Ведущий врач, шея
loadout-group-senior-physician-shoes = Ведущий врач, обувь
loadout-group-senior-physician-gloves = Ведущий врач, перчатки
loadout-group-chemist-head = Химик, голова
loadout-group-chemist-neck = Химик, шея
loadout-group-chemist-gloves = Химик, перчатки
loadout-group-chemist-shoes = Химик, обувь
loadout-group-psychologist-head = Психолог, голова
loadout-group-psychologist-outerclothing = Психолог, верхняя одежда
loadout-group-psychologist-neck = Психолог, шея
loadout-group-psychologist-gloves = Психолог, перчатки
loadout-group-psychologist-shoes = Психолог, обувь
loadout-group-paramedic-neck = Парамедик, шея
loadout-group-paramedic-gloves = Парамедик, перчатки
loadout-group-medical-doctor-neck = Врач, шея
loadout-group-pathologist-head = Патологоанатом, голова
loadout-group-pathologist-outerclothing = Патологоанатом, верхняя одежда
loadout-group-pathologist-neck = Патологоанатом, шея
loadout-group-pathologist-gloves = Патологоанатом, перчатки
loadout-group-pathologist-shoes = Патологоанатом, ботинки
loadout-group-medical-trinkets = Безделушки МЕД
loadout-group-senior-engineer-jumpsuit = Униформа ведущего инженера
loadout-group-chief-engineer-backpack = Старший инженер, рюкзак
loadout-group-roboticist-head = Робототехник, головной убор
Expand All @@ -32,4 +55,31 @@ loadout-group-adj-jumpsuit = Адъютант, комбинезон
loadout-group-adj-backpack = Адъютант, рюкзак
loadout-group-adj-head = Адъютант, головной убор
loadout-group-adj-outerClothing = Адъютант, верхняя одежда
loadout-group-atmos-console = Атмос консоль
loadout-group-engineering-trinkets = Безделушки ИНЖ
loadout-group-senior-engineering-neck = Ведущий инженер, шея
loadout-group-senior-engineering-mask = Ведущий инженер, маска
loadout-group-senior-engineering-head = Ведущий инженер, голова
loadout-group-senior-engineering-shoes = Ведущий инженер, обувь
loadout-group-senior-engineering-outer-clothing = Ведущий инженер, верхняя одежда
loadout-group-senior-engineering-backpack = Ведущий инженер, рюкзак
loadout-group-senior-engineering-gloves = Ведущий инженер, перчатки
loadout-group-atmospheric-technician-mask = Атмосферный техник, маска
loadout-group-atmospheric-technician-neck = Атмосферный техник, шея
loadout-group-atmospheric-technician-head = Атмосферный техник, голова
loadout-group-atmospheric-technician-gloves = Атмосферный техник, перчатки
loadout-group-station-engineer-neck = Инженер, шея
loadout-group-station-engineer-mask = Инженер, маска
loadout-group-station-engineer-gloves = Инженер, перчатки
loadout-group-chief-engineer-gloves = Старший инженер, перчатки
loadout-group-chief-engineer-mask = Старший инженер, маска
loadout-group-quartermaster-gloves = Квартирмейстер, перчатки
loadout-group-quartermaster-mask = Квартирмейстер, маска
loadout-group-cargo-technician-gloves = Грузчик, перчатки
loadout-group-cargo-technician-mask = Грузчик, маска
loadout-group-cargo-technician-neck = Грузчик, шея
loadout-group-salvage-specialist-gloves = Утилизатор, перчатки
loadout-group-salvage-specialist-mask = Утилизатор, маска
loadout-group-salvage-specialist-neck = Утилизатор, шея
loadout-group-salvage-specialist-head = Утилизатор, голова
loadout-group-cargo-trinkets = Безделушки СНБ

11 changes: 11 additions & 0 deletions Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/head/bandanas.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
ent-ClothingHeadBandYellow = жёлтая бандана
.desc = Жёлтая бандана, чтобы выглядеть круто.
ent-ClothingHeadBandOrange = оранжевая бандана
.desc = Оранжевая бандана, чтобы выглядеть круто.
ent-ClothingHeadBandCyan = голубая бандана
.desc = Голубая бандана, чтобы выглядеть круто.
ent-ClothingHeadBandPurple = фиолетовая бандана
.desc = Фиолетовая бандана, чтобы выглядеть круто.
ent-ClothingHeadBandWhite = белая бандана
.desc = Белая бандана, чтобы выглядеть круто.

4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/head/soft.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ent-ClothingHeadHatBrownsoft = коричневая кепка
.desc = Бейсболка безвкусного коричневого цвета.
ent-ClothingHeadHatBrownsoftFlipped = коричневая кепка
.desc = { ent-ClothingHeadHeadHatBaseFlipped.desc }
10 changes: 10 additions & 0 deletions Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/masks/bandanas.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ent-ClothingMaskBandOrange = оранжевая бандана
.desc = Оранжевая бандана, чтобы выглядеть круто.
ent-ClothingMaskBandYellow = жёлтая бандана
.desc = Жёлтая бандана, чтобы выглядеть круто.
ent-ClothingMaskBandCyan = голубая бандана
.desc = Голубая бандана, чтобы выглядеть круто.
ent-ClothingMaskBandPurple = фиолетовая бандана
.desc = фиолетовая бандана, чтобы выглядеть круто.
ent-ClothingMaskBandWhite = белая бандана
.desc = белая бандана, чтобы выглядеть круто.
5 changes: 5 additions & 0 deletions Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/neck/scarfs.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ent-ClothingNeckScarfStripedYellow = полосатый жёлтый шарф
.desc = Стильный полосатый жёлтый шарф. Идеальный зимний аксессуар для тех, у кого обострённое чувство моды, и тех, кто просто не выносит холодного ветра на своей шее.

ent-ClothingNeckScarfStripedCyan = полосатый голубой шарф
.desc = Стильный полосатый голубой шарф. Идеальный зимний аксессуар для тех, у кого обострённое чувство моды, и тех, кто просто не выносит холодного ветра на своей шее.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/misc.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ClothingOuterFlannelWhite = белая фланелевая куртка
.desc = Старомодная белая фланелевая куртка для космической осени.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/toys.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,5 @@ ent-PlushieKaioshi = Плюшевый Кайоши Де Ле Грейтайд
.desc = Бармен.. с бензопилой в руке?..
ent-PlushieRaisya = Плюшевая Раизя Фивуллина
.desc = Мур! Мяу! Ня! её любимые словечки UwU
ent-LegendaryGoldenWeh = Легендарный золотой Вех
.desc = Вы помните как пробирались сквозь опасности, как оставили вместо него подделку, случайно активировали ловушку и начали убегать от огромного шара! Но погодите, это же был сон, тогда откуда он у вас?
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/_strings/_sunrise/loadout/loadouts.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ MedicalDoctor-loadout = Снаряжение врача
MedicalIntern-loadout = Снаряжение интерна
Paramedic-loadout = Снаряжение парамедика
SeniorPhysician-loadout = Снаряжение ведущего врача
MedicalPathologist-loadout = Снаряжение патологоанатома
# Researching
ResearchAssistant-loadout = Снаряжение научного ассистента
Roboticist-loadout = Снаряжение робототехника
Expand Down
50 changes: 49 additions & 1 deletion Resources/Locale/ru-RU/_strings/_sunrise/preferences/loadout-groups.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,29 @@ loadout-group-senior-officer-jumpsuit = Униформа инструктора
loadout-group-senior-researcher-jumpsuit = Униформа ведущего учёного
loadout-group-senior-physician-jumpsuit = Униформа ведущего врача
loadout-group-senior-physician-belt = Ведущий врач, пояс
loadout-group-senior-physician-head = Ведущий врач, голова
loadout-group-senior-physician-outerclothing = Ведущий врач, верхняя одежда
loadout-group-senior-physician-neck = Ведущий врач, шея
loadout-group-senior-physician-shoes = Ведущий врач, обувь
loadout-group-senior-physician-gloves = Ведущий врач, перчатки
loadout-group-chemist-head = Химик, голова
loadout-group-chemist-neck = Химик, шея
loadout-group-chemist-gloves = Химик, перчатки
loadout-group-chemist-shoes = Химик, обувь
loadout-group-psychologist-head = Психолог, голова
loadout-group-psychologist-outerclothing = Психолог, верхняя одежда
loadout-group-psychologist-neck = Психолог, шея
loadout-group-psychologist-gloves = Психолог, перчатки
loadout-group-psychologist-shoes = Психолог, обувь
loadout-group-paramedic-neck = Парамедик, шея
loadout-group-paramedic-gloves = Парамедик, перчатки
loadout-group-medical-doctor-neck = Врач, шея
loadout-group-pathologist-head = Патологоанатом, голова
loadout-group-pathologist-outerclothing = Патологоанатом, верхняя одежда
loadout-group-pathologist-neck = Патологоанатом, шея
loadout-group-pathologist-gloves = Патологоанатом, перчатки
loadout-group-pathologist-shoes = Патологоанатом, ботинки
loadout-group-medical-trinkets = Безделушки МЕД
loadout-group-senior-engineer-jumpsuit = Униформа ведущего инженера
loadout-group-chief-engineer-backpack = Старший инженер, рюкзак
loadout-group-roboticist-head = Робототехник, головной убор
Expand All @@ -33,4 +56,29 @@ loadout-group-adj-jumpsuit = Адъютант, комбинезон
loadout-group-adj-backpack = Адъютант, рюкзак
loadout-group-adj-head = Адъютант, головной убор
loadout-group-adj-outerClothing = Адъютант, верхняя одежда
loadout-group-atmos-console = Атмос консоль
loadout-group-engineering-trinkets = Безделушки ИНЖ
loadout-group-senior-engineering-neck = Ведущий инженер, шея
loadout-group-senior-engineering-mask = Ведущий инженер, маска
loadout-group-senior-engineering-head = Ведущий инженер, голова
loadout-group-senior-engineering-shoes = Ведущий инженер, обувь
loadout-group-senior-engineering-outer-clothing = Ведущий инженер, верхняя одежда
loadout-group-senior-engineering-backpack = Ведущий инженер, рюкзак
loadout-group-senior-engineering-gloves = Ведущий инженер, перчатки
loadout-group-atmospheric-technician-mask = Атмосферный техник, маска
loadout-group-atmospheric-technician-neck = Атмосферный техний, шея
loadout-group-atmospheric-technician-head = Атмосферный техник, голова
loadout-group-station-engineer-neck = Инженер, шея
loadout-group-station-engineer-mask = Инженер, маска
loadout-group-station-engineer-gloves = Инженер, перчатки
loadout-group-chief-engineer-gloves = Старший инженер, перчатки
loadout-group-chief-engineer-mask = Старший инженер, маска
loadout-group-quartermaster-gloves = Квартирмейстер, перчатки
loadout-group-quartermaster-mask = Квартирмейстер, маска
loadout-group-cargo-technician-gloves = Грузчик, перчатки
loadout-group-cargo-technician-mask = Грузчик, маска
loadout-group-cargo-technician-neck = Грузчик, шея
loadout-group-salvage-specialist-gloves = Утилизатор, перчатки
loadout-group-salvage-specialist-mask = Утилизатор, маска
loadout-group-salvage-specialist-neck = Утилизатор, шея
loadout-group-salvage-specialist-head = Утилизатор, голова
loadout-group-cargo-trinkets = Безделушки СНБ
16 changes: 16 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,23 @@
ClothingBackpackSatchelLeather: 2
ClothingRandomSpawner: 8
ClothingHeadHatBeret: 4
#sunrise-start
ClothingHeadBandWhite: 2
#sunrise-end
ClothingHeadBandBlack: 2
ClothingHeadBandBlue: 2
#sunrise-start
ClothingHeadBandCyan: 2
ClothingHeadBandYellow: 2
#sunrise-end
ClothingHeadBandGreen: 2
#sunrise-start
ClothingHeadBandOrange: 2
#sunrise-end
ClothingHeadBandRed: 2
#sunrise-start
ClothingHeadBandPurple: 2
#sunrise-end
ClothingHeadBandSkull: 2
ClothingHeadHatGreyFlatcap: 3
ClothingHeadHatBrownFlatcap: 3
Expand Down Expand Up @@ -66,6 +79,9 @@
ClothingShoesColorRed: 2
ClothingShoesColorPurple: 2
ClothingHeadHatGreysoft: 8
#Sunrise-start
ClothingHeadHatBrownsoft: 2
#Sunrise-end
ClothingHeadHatMimesoft: 3
ClothingHeadHatBluesoft: 2
ClothingHeadHatYellowsoft: 2
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
ClothingNeckScarfStripedBlack: 3
ClothingNeckScarfStripedBrown: 3
ClothingNeckScarfStripedLightBlue: 3
#sunrise-start
ClothingNeckScarfStripedCyan: 3
ClothingNeckScarfStripedYellow: 3
#sunrise-end
ClothingNeckScarfStripedOrange: 3
ClothingNeckScarfStripedPurple: 3
ClothingOuterCoatTrench: 6
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,12 @@
orGroup: dressermainloot
- id: ClothingNeckScarfStripedBlue
prob: 0.03
#sunrise-start
- id: ClothingNeckScarfStripedCyan
prob: 0.03
- id: ClothingNeckScarfStripedYellow
prob: 0.03
#sunrise-end
orGroup: dressermainloot
- id: ClothingNeckScarfStripedGreen
prob: 0.03
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,6 +1255,10 @@
- ClothingNeckScarfStripedRed
- ClothingNeckScarfStripedBrown
- ClothingNeckScarfStripedLightBlue
#sunrise-start
- ClothingNeckScarfStripedCyan
- ClothingNeckScarfStripedYellow
#sunrise-end
- ClothingNeckScarfStripedOrange
- ClothingNeckScarfStripedBlack
- ClothingNeckScarfStripedPurple
Expand Down
Loading
Loading