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

Вещи ЦК и суперсинтезатор в лодауте музыканта. #712

Merged
merged 22 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
40ca72d
Вещи ЦК и суперсинтезатор в лодауте музыканта.
RipZoro1 Oct 30, 2024
7aae54d
Merge branch 'master' into schrodinger71-milashka
RipZoro1 Oct 30, 2024
46def20
Я еблан, я еблан, я еблан...
RipZoro1 Oct 31, 2024
d84975e
Update satchel.yml
RipZoro1 Oct 31, 2024
7536aad
Update coats.yml
RipZoro1 Oct 31, 2024
f08823b
locale fix 1
jungarikjan Nov 1, 2024
d37e7e2
locale fix 2
jungarikjan Nov 1, 2024
d75c250
Помогаю Зоро. Поставил время 25ч, как сказал Пётр + указал профессию …
jungarikjan Nov 3, 2024
3ec4a29
Суперсинтезатор, шаг первый
jungarikjan Nov 3, 2024
eac2118
Суперсинтезатор, шаг второй
jungarikjan Nov 3, 2024
70375ef
Суперсинтезатор, конец
jungarikjan Nov 3, 2024
859ce8e
Merge branch 'master' into schrodinger71-milashka
jungarikjan Nov 10, 2024
d672c34
Merge branch 'master' into schrodinger71-milashka
jungarikjan Nov 18, 2024
f499325
Чиню ямл и доделываю PR
Darkiich Nov 20, 2024
dbcb5b3
Merge branch 'master' into schrodinger71-milashka
Darkiich Nov 20, 2024
f39bb3d
щтотаделаим
Darkiich Dec 2, 2024
35dcd63
Фикс тестера
FaDeOkno Dec 5, 2024
2d3c3ab
Merge branch 'master' into schrodinger71-milashka
FaDeOkno Dec 5, 2024
e29854c
fix
Filokini Dec 6, 2024
9477a3b
nerf
Filokini Dec 6, 2024
b8af49c
fix
Filokini Dec 6, 2024
e965911
Merge branch 'master' into schrodinger71-milashka
Filokini Dec 6, 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
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
ent-ADTClothingBackpackSatchelBlueshield = сумка офицера синего щита
ent-ADTClothingBackpackSatchelBlueshield = сумка Офицера "Синий щит"
.desc = Крайне вместительная черно-синяя сумка с яркими белыми эмблемами щита, предназначенная для хранения охранного и медицинского арсенала Офицеров Синего Щита.

ent-ADTClothingBackpackSatchelParamedic = сумка парамедика
ent-ADTClothingCentComBackpack = сумка Центком
.desc = Зелёная сумка. Пахнет свежестью.

ent-ADTClothingBackpackSatchelParamedic = сумка Парамедика
.desc = Стерильная сумка для экстренных вызовов медицинской помощи.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ent-ADTClothingOuterCoatLabPathologist = халат патологоанатома
ent-ADTClothingOuterCoatLabPathologist = халат Патологоанатома
.desc = { ent-ClothingOuterCoatLab.desc }
ent-ADTClothingOuterApronPathologist = фартук патологоанатома
ent-ADTClothingOuterApronPathologist = фартук Патологоанатома
.desc = Фартук для работы с трупами.
ent-ADTClothingKadet = шинель для Кадетов СБ
ent-ADTClothingKadet = шинель для Кадетов сб
.desc = шинель, сшитая для новобранцев службы безопасности. Она очень похожа на шинели младших чинов РИА

ent-ADTClothingOuterGraySweatshirtTop = серая толстовка-топка
Expand All @@ -11,20 +11,23 @@ ent-ADTClothingOuterGraySweatshirtTop = серая толстовка-топка
ent-ADTClothingOuterBlackSweatshirtTop = черная толстовка-топка
.desc = Стильная белая толстовка-топка. Производства компании "Modeling Agency Dar-Vaxed".

ent-ADTClothingOuterCoatBrigmedicWB = ветровка бригмедика
ent-ADTClothingOuterCoatBrigmedicWB = ветровка Бригмедика
.desc = Надежная ветровка врача брига, защита от любого космического ветра.

ent-ADTClothingOuterCoatIlisium = плащ Иллизиума
.suffix = Иллизиум
.desc = Тёмный плащ Иллизиума

ent-ADTClothingOuterCoatInvestigator = бушлат следователя Службы Безопасности
ent-ADTClothingOuterCoatInvestigator = бушлат Следователя Службы безопасности
.desc = Один вид этого бушлата повышает вероятность чистосердечного признания подозреваемого на 50%.
.suffix = { "" }

ent-ClothingOuterAtmosianBomberJacket = куртка-бомбер атмосианина
.desc = Плотная, поношенная куртка-бомбер атмосианина.

ent-ADTClothingOuterCoatCentCom = пальто Центком
.desc = Зеленое пальто с золотыми вставками. На спине выгравирована золотая буква N. Такое пальто носят только важные персоны...

ent-ADTClothingOuterCoatCyberSun = лабораторный халат Киберсан
.desc = Лабораторный халат Киберсан, предоставляющий минимальную защиту от вредного воздействия.

Expand All @@ -40,9 +43,9 @@ ent-ADTStudentBomber = университетская куртка-бомбер
.suffix = Хеллоуин
.desc = Удобная студенческая куртка-бомбер с нашитой на ней большой английской буквой В. Довольно популярна среди студентов различных учебных заведений ТСФ.

ent-ADTClothingOuterCoatLabcoatCMOHike = походный халат главного врача
ent-ADTClothingOuterCoatLabcoatCMOHike = походный халат Главного врача
.desc = Частично открытый халат. Не сковывает движения.

ent-ADTClothingOuterCoatLabcoatCMOHikeOpened = походный халат главного врача
ent-ADTClothingOuterCoatLabcoatCMOHikeOpened = походный халат Главного врача
.desc = Частично открытый халат. Не сковывает движения.
.suffix = {"Раскрытый"}
10 changes: 10 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@
- type: Sprite
sprite: ADT/Clothing/Back/pathologist_satchel.rsi

# Сумка ЦентКом
- type: entity
parent: ClothingBackpackSatchel
id: ADTClothingCentComSatchel
name: centcom satchel
description: Green satchel. He smells fresh
components:
- type: Sprite
sprite: ADT/Clothing/Back/centcom_satchel.rsi

- type: entity
parent: ClothingBackpackSatchelMedical
id: ADTClothingBackpackSatchelParamedic
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,35 @@
- type: Clothing
sprite: ADT/Clothing/OuterClothing/Coats/atmosian.rsi

#Пальто ЦентКом
- type: entity
parent: ClothingOuterStorageBase
id: ADTClothingOuterCoatCentCom
name: centcom coat
description: A green coat with gold inserts. The golden letter N is emblazoned on the back. Only the big shots wear this coat...
components:
- type: Storage
grid:
- 0,0,2,1
maxItemSize: Normal
- type: Sprite
sprite: ADT/Clothing/OuterClothing/Coats/centcom_coat.rsi
- type: Clothing
sprite: ADT/Clothing/OuterClothing/Coats/centcom_coat.rsi
- type: StorageFill
contents:
- id: RubberStampCentcom
- id: PenCentcom
- type: Armor
modifiers:
coefficients:
Blunt: 0.7
Slash: 0.7
Piercing: 0.6
Heat: 0.7
- type: ExplosionResistance
damageCoefficient: 0.75

- type: entity
parent: ClothingOuterStorageBase
id: ADTClothingOuterCoatCyberSun
Expand Down Expand Up @@ -225,4 +254,3 @@
state: icon-open
- type: Clothing
sprite: ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi

Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@
ClothingOuterCoatExpensive: 1
ClothingNeckScarfStripedCentcom: 3
ClothingNeckCloakCentcom: 3
ADTClothingOuterCoatCentCom: 3 #ADT-Tweak
ADTClothingCentComSatchel: 3 #ADT-Tweak
22 changes: 22 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
# ADT-Tweak-start
# SuperSynthesizerInstrument
- type: loadoutEffectGroup
id: SuperSynthesizerInstrumentWorthy
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobMusician
time: 86400 #25 hrs # ADT-RoleTime for a prize (Петр сказал 25)

# Misc
- type: loadout
id: MusicianSuperSynthesizer
effects:
- !type:GroupLoadoutEffect
proto: SuperSynthesizerInstrumentWorthy
storage:
back:
- SuperSynthesizerInstrument
# ADT-Tweak-end

# Jumpsuit
- type: loadout
id: MusicianJumpsuit
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,7 @@
minLimit: 0
maxLimit: 2
loadouts:
- MusicianSuperSynthesizer # ADT-Tweak
- Glockenspiel
- MusicBox
- Xylophone
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions Resources/Textures/ADT/Clothing/Back/centcom_satchel.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "ADT Team",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "ADT Team",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading