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.

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, part 1 #862

Merged
merged 37 commits into from
Jan 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 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
b8f6acd
содержит ошибки, связанные с группами, сегодня постараюсь наконец зак…
Nrd-K Jan 12, 2025
b06c1de
еще одно небольшое редактирование цели
Nrd-K Jan 12, 2025
3b17563
Merge branch 'master' into Loadout-new
Nrd-K Jan 12, 2025
fff6ea4
Update station-goal-component.ftl
Nrd-K Jan 12, 2025
165b08d
времени больше нет, доделаю завтра
Nrd-K Jan 12, 2025
94de5b0
мед отдел закончен
Nrd-K Jan 15, 2025
b8ab11e
Merge branch 'space-sunrise:master' into Loadout-new
Nrd-K Jan 15, 2025
0b13ec2
небольшие правки
Nrd-K Jan 17, 2025
43bf159
Merge branch 'space-sunrise:master' into Loadout-new
Nrd-K Jan 17, 2025
8152e70
фикс
Nrd-K Jan 17, 2025
300b553
сортировка лодаута под стиль офов, вновь появление цели на планетоид …
Nrd-K Jan 18, 2025
0173983
Merge branch 'master' into Loadout-new
Nrd-K Jan 19, 2025
5757d18
Merge branch 'master' into Loadout-new
Nrd-K Jan 22, 2025
6939042
.
Nrd-K Jan 22, 2025
c914a83
Merge branch 'Loadout-new' of https://github.com/Nrd-K/shablon into L…
Nrd-K Jan 22, 2025
1444724
правка
Nrd-K Jan 22, 2025
8c2b59d
восстанавливаю конфликтный файл
Nrd-K Jan 23, 2025
a47ea9c
должно исправить линтер
Nrd-K Jan 23, 2025
286982f
Пока жду одобрения, занесу сюда исправление целей
Nrd-K Jan 25, 2025
b41a32b
М
Nrd-K Jan 25, 2025
09d1953
Пора заканчивать
Nrd-K Jan 25, 2025
f03943c
Merge branch 'space-sunrise:master' into Loadout-new
Nrd-K Jan 25, 2025
512ef4a
Продолжаю правки целей пока жду принятия пра
Nrd-K Jan 25, 2025
f1321a6
последняя правка, больше я к ним не претронусь в этом пре
Nrd-K Jan 26, 2025
e10be4f
Чтобы на Sunrise уж точно выполнили
Nrd-K Jan 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file added Resources/Audio/_Sunrise/GW/goldenweh1.ogg
Binary file not shown.
Binary file added Resources/Audio/_Sunrise/GW/goldenweh2.ogg
Binary file not shown.
Binary file added Resources/Audio/_Sunrise/GW/goldenweh3.ogg
Binary file not shown.
Binary file added Resources/Audio/_Sunrise/GW/goldenweh4.ogg
Binary file not shown.
Binary file added Resources/Audio/_Sunrise/GW/goldenweh5.ogg
Binary file not shown.
Binary file added Resources/Audio/_Sunrise/bye.ogg
Binary file not shown.
Binary file added Resources/Audio/_Sunrise/not_for_long_weh.ogg
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ ent-ClothingHandsGlovesCentcomNaval = nanotrasen naval gloves
.desc = A high quality pair of thick gloves covered in gold stitching, given to Nanotrasen's Naval Commanders.
ent-ClothingHandsGlovesLeatherHoS = leather gloves
.desc = Stylish black leather gloves.
ent-ClothingHandsGlovesNitrileBlack = black nitrile gloves
.desc = High-quality black nitrile gloves. Expensive medical PPE.
ent-ClothingHandsGlovesNitrileOrange = orange nitrile gloves
.desc = High-quality orange nitrile gloves. Expensive medical PPE.
ent-ClothingHandsGlovesNitrileRed = red nitrile gloves
.desc = High-quality red nitrile gloves. Expensive medical PPE.
ent-ClothingHandsGlovesNitrileGreen = green nitrile gloves
.desc = High-quality green nitrile gloves. Expensive medical PPE.
ent-ClothingHandsGlovesNitrileBlue = blue nitrile gloves
.desc = High-quality blue nitrile gloves. Expensive medical PPE.
ent-ClothingHandsGlovesChristmas = christmas gloves
.desc = Stylish Christmas leather gloves.
ent-ClothingHandsGlovesChristmasLong = christmas gloves long
Expand Down
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 }
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ClothingHeadHatBeretCE = beret chief engineer
.desc = He takes the person who builds you a goal every shift.
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,5 @@ ent-ClothingHeadHatSingulo = Singulo Crown
.desc = The greatest achievement of engineers and scientists - a compact singularity installation that allows the owner to demonstrate their status and uniqueness on the station.
ent-ClothingHeadHatDeerHorns = Deer Horns
.desc = a Horns, usually worn deer.
ent-ClothingHeadHatHoodWinterColorCyan = cyan winter coat hood
.desc = { ent-ClothingHeadHatHoodWinterBase.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
ent-ClothingHeadHatBrown = brown cap
.desc = It's a baseball hat in a tasteless brown colour.
ent-ClothingHeadHatBrownsoftFlipped = brown cap
.desc = { ent-ClothingHeadHeadHatBaseFlipped.desc }
ent-ClothingHeadHatCyan = cyan cap
.desc = It's a baseball hat in a tasteless cyan colour.
ent-ClothingHeadHatCyansoftFlipped = cyan cap
.desc = { ent-ClothingHeadHeadHatBaseFlipped.desc }

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.
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,25 @@ ent-ClothingBreathMaskCMO = medical respirator
.desc = Quality respirator.
ent-ClothingMaskGasCE = chef engineer's gas mask
.desc = Very durable and stylish white gas mask with a green stripe on the frontal area. Will allow you to correct the consequences of atmospheric technicians with bought diplomas.
ent-ClothingMaskBreathMedicalRed = red medical mask
.desc = A close-fitting red sterile mask that can be connected to an air supply.
ent-ClothingMaskBreathMedicalGreen = green medical mask
.desc = A close-fitting green sterile mask that can be connected to an air supply.
ent-ClothingMaskBreathMedicalOrange = orange medical mask
.desc = A close-fitting orange sterile mask that can be connected to an air supply.
ent-ClothingMaskBreathMedicalBlack = black medical mask
.desc = A close-fitting black sterile mask that can be connected to an air supply.
ent-ClothingMaskBreathMedicalBlue = blue medical mask
.desc = A close-fitting blue sterile mask that can be connected to an air supply.
ent-ClothingMaskSterileBlack = black sterile mask
.desc = A sterile black mask designed to help prevent the spread of diseases.
ent-ClothingMaskSterileBlue = blue sterile mask
.desc = A sterile blue mask designed to help prevent the spread of diseases.
ent-ClothingMaskSterileGreen = green sterile mask
.desc = A sterile green mask designed to help prevent the spread of diseases.
ent-ClothingMaskSterileOrange = orange sterile mask
.desc = A sterile orange mask designed to help prevent the spread of diseases.
ent-ClothingMaskSterileRed = red sterile mask
.desc = A sterile red mask designed to help prevent the spread of diseases.
ent-ClothingMaskFaceCast = face cast
.desc = It can steal your personality!
.desc = It can steal your personality!
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
ent-ClothingNeckSunriseBadge = sanrisosexuals badge
.desc = Sunrise branded badge.
ent-ClothingNeckStethoscopeGold = gold stethoscope
.desc = If you haven't learned all the chemistry, then you're not worthy of this stethoscope. Put it down!
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.
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

ent-ClothingOuterWinterColorCyan = cyan winter coat
.desc = { ent-ClothingOuterWinterCoatToggleable.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ClothingShoesColorCyan = cyan shoes
.desc = Especially for you and your husband, man.
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ 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?
ent-PlushieAlice = Plushie Alice
.desc = { ent-BasePlushie.desc }
ent-PlushieKaioshi = Plush Kaioshi
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-GlockBox = glock box
.desc = It contains a Glock22 and a magazine for it. Did you want something else?
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,37 @@ loadout-group-centcomm-operator-jumpsuit = Униформа ОЦК
loadout-group-centcomm-operator-head-hat = Головой убор ОЦК
loadout-group-senior-officer-jumpsuit = Униформа инструктора СБ
loadout-group-senior-researcher-jumpsuit = Униформа ведущего учёного
loadout-group-chief-medical-officer-gloves = Главный врач, перчатки
loadout-group-chief-medical-officer-mask = Главный врач, маска
loadout-group-senior-physician-jumpsuit = Униформа ведущего врача
loadout-group-senior-physician-head = Ведущий врач, голова
loadout-group-senior-physician-outerclothing = Ведущий врач, верхняя одежда
loadout-group-senior-physician-neck = Ведущий врач, шея
loadout-group-senior-physician-mask = Ведущий врач, маска
loadout-group-senior-physician-shoes = Ведущий врач, обувь
loadout-group-senior-physician-gloves = Ведущий врач, перчатки
loadout-group-chemist-head = Химик, голова
loadout-group-chemist-neck = Химик, шея
loadout-group-chemist-mask = Химик, маска
loadout-group-chemist-gloves = Химик, перчатки
loadout-group-chemist-shoes = Химик, обувь
loadout-group-psychologist-head = Психолог, голова
loadout-group-psychologist-outerclothing = Психолог, верхняя одежда
loadout-group-psychologist-neck = Психолог, шея
loadout-group-psychologist-mask = Психолог, маска
loadout-group-psychologist-gloves = Психолог, перчатки
loadout-group-psychologist-shoes = Психолог, обувь
loadout-group-paramedic-neck = Парамедик, шея
loadout-group-paramedic-mask = Парамедик, маска
loadout-group-paramedic-gloves = Парамедик, перчатки
loadout-group-medical-doctor-neck = Врач, шея
loadout-group-pathologist-head = Патологоанатом, голова
loadout-group-pathologist-outerclothing = Патологоанатом, верхняя одежда
loadout-group-pathologist-neck = Патологоанатом, шея
loadout-group-pathologist-mask = Патологоанатом, маска
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 +62,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 = Безделушки СНБ
loadout-group-security-gun = СБ, оружие
Loading
Loading