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

Добавлена страйкбольная броня, а также именная вещь Maki_GG #434

Merged
merged 36 commits into from
Sep 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
f0fb804
Хачапури ТЗ
Inconnu1337 Sep 3, 2024
788a2f3
Правки ТЗ Хачапуре
Inconnu1337 Sep 4, 2024
cce617a
Merge branch 'master' into FoodMealKhachapuri
Inconnu1337 Sep 4, 2024
ea87bbf
Починил дубликат в Хачапуре
Inconnu1337 Sep 4, 2024
8d1b862
Merge branch 'FoodMealKhachapuri' of https://github.com/Inconnu1337/s…
Inconnu1337 Sep 4, 2024
ade3f72
Снова мелкие правки
Inconnu1337 Sep 4, 2024
b84214e
Merge branch 'master' into FoodMealKhachapuri
Inconnu1337 Sep 4, 2024
1c8c072
Правки..
Inconnu1337 Sep 5, 2024
a2653c6
Merge branch 'FoodMealKhachapuri' of https://github.com/Inconnu1337/s…
Inconnu1337 Sep 5, 2024
26e317e
Merge branch 'master' into FoodMealKhachapuri
Inconnu1337 Sep 5, 2024
cbe03fb
Merge branch 'master' into FoodMealKhachapuri
Inconnu1337 Sep 5, 2024
0987a10
Merge branch 'master' into FoodMealKhachapuri
Inconnu1337 Sep 6, 2024
6fda912
Фикс черт и удаление дубликата
Inconnu1337 Sep 6, 2024
d55f946
Merge branch 'master' into FoodMealKhachapuri
Inconnu1337 Sep 6, 2024
7f70768
Update meals.yml
Schrodinger71 Sep 7, 2024
a9e69e4
Рецепт Хачапуре добавлен в книгу
Inconnu1337 Sep 7, 2024
9674c4f
Merge branch 'FoodMealKhachapuri' of https://github.com/Inconnu1337/s…
Inconnu1337 Sep 7, 2024
b733188
Добавлены страйкбольные приводы в техфаб, добавлена именная вещь Maki_GG
Inconnu1337 Sep 8, 2024
1370bc8
Merge branch 'AdventureTimeSS14:master' into ADTMakiCoat
Inconnu1337 Sep 8, 2024
b50dc96
Изменил копирайт в meta.json именной вещи Maki_GG
Inconnu1337 Sep 8, 2024
06c494a
Исправлен копирайт Пальта Хонкоматери
Inconnu1337 Sep 8, 2024
a65efee
Внесены правки
Inconnu1337 Sep 8, 2024
5b1446c
Merge branch 'ADTMakiCoat' of https://github.com/Inconnu1337/space_st…
Inconnu1337 Sep 8, 2024
ba47d6f
Исправлен перевод ОБР медика СБ
Inconnu1337 Sep 9, 2024
43fd05e
Merge branch 'master' into ADTMakiCoat
Inconnu1337 Sep 9, 2024
12806c6
Страйкбольная броня для админабуза
Inconnu1337 Sep 13, 2024
1795612
Страйкбол убрал из ветки исследований и техфаба СБ
Inconnu1337 Sep 13, 2024
bf986ac
Merge branch 'ADTMakiCoat' of https://github.com/Inconnu1337/space_st…
Inconnu1337 Sep 13, 2024
8b7e204
Merge branch 'master' into ADTMakiCoat
Inconnu1337 Sep 13, 2024
8b42664
Перенесен перевод в другую папку
Inconnu1337 Sep 14, 2024
89c3712
Merge branch 'ADTMakiCoat' of https://github.com/Inconnu1337/space_st…
Inconnu1337 Sep 14, 2024
05f2c38
Merge branch 'master' into ADTMakiCoat
Inconnu1337 Sep 14, 2024
ff9eea2
Вернул удаленный файл по ошибке
Inconnu1337 Sep 14, 2024
ad64fa5
Merge branch 'ADTMakiCoat' of https://github.com/Inconnu1337/space_st…
Inconnu1337 Sep 14, 2024
c0de08e
Удалены рецепты страйкбольного оружия
Inconnu1337 Sep 14, 2024
6eca665
Merge branch 'master' into ADTMakiCoat
Inconnu1337 Sep 15, 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
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ADT/personalization.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -322,3 +322,7 @@ ent-ADTClothingHandsPushnoYGloves = Беспалые кожаные перчат
ent-ADTClothingUniformPushnoYJumpsuit = Аккуратный костюм Курото
.desc = Приятно выглаженная рубашка с аквамариновой жилеткой и серыми брюками, что может быть лучше?
.suffix = Именное, PushnoY.

ent-ADTClothingOuterCoatMaki = Пальто Хонкоматери
.desc = Пальто дарованное самой Хонкоматерью одному из её лучших клоунов несущих веру Хонка. Оно такое же вычурное, как и сами клоуны, а жёлтые элементы выполнены из чистого бананиума. От пальто исходит лёгкий запах кремового пирога.
.suffix = Именное, Maki_gg.
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
ent-ADTClothingBlueshieldArmor = бронежилет офицера синего щита
.desc = Бронежилет третьего класса защиты, предназначенный для офицеров "Синего Щита". Дает приемлемую защиту от ударов и среднюю - от огнестрельного оружия.

ent-ClothingOuterArmorAirsoftRed = Страйкбольная броня
.desc = Полугибкий поликарбонатный бронекостюм с ослабленной защитой. Броня для страйкбола
.suffix = Страйкбол

ent-ClothingOuterArmorAirsoftBlue = { ent-ClothingOuterArmorAirsoftRed }
.desc = { ent-ClothingOuterArmorAirsoftRed.desc }
.suffix = { ent-ClothingOuterArmorAirsoftRed.suffix }
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ ent-ADTRandomHumanoidSpawnerERTSecurityEVARiot = ОБР офицер сб
.suffix = Броня EVA riot, против бунтов
.desc = { ent-RandomHumanoidSpawnerERTLeaderEVA.desc }

ent-ADTRandomHumanoidSpawnerERTMedical = ОБР офицер сб
ent-ADTRandomHumanoidSpawnerERTMedical = ОБР медик сб
.suffix = Базовый
.desc = { "" }
ent-ADTRandomHumanoidSpawnerERTMedicalEVA = ОБР офицер сб
ent-ADTRandomHumanoidSpawnerERTMedicalEVA = ОБР медик сб
.suffix = Броня EVA, против ЯО
.desc = { ent-RandomHumanoidSpawnerERTLeader.desc }
ent-ADTRandomHumanoidSpawnerERTMedicalEVARiot = ОБР офицер сб
ent-ADTRandomHumanoidSpawnerERTMedicalEVARiot = ОБР медик сб
.suffix = Броня EVA riot, против бунтов
.desc = { ent-RandomHumanoidSpawnerERTLeaderEVA.desc }

Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/ADT/research/technologies.ftl
Original file line number Diff line number Diff line change
@@ -1 +1 @@
research-technology-compact-technologies = Технологии сжатия материи
research-technology-compact-technologies = Технологии сжатия материи
26 changes: 26 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,29 @@
Heat: 0.8
- type: ExplosionResistance
damageCoefficient: 0.80

- type: entity
parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseRestrictedContraband]
id: ClothingOuterArmorAirsoftBlue
name: airsoft suit
description: Semi-flexible polycarbonate armor suit with weakened protection. Airsoft armor
suffix: airsoft
components:
- type: Sprite
sprite: ADT/Clothing/OuterClothing/Armor/airsoft_blue_armor.rsi
- type: Clothing
sprite: ADT/Clothing/OuterClothing/Armor/airsoft_blue_armor.rsi
- type: GroupExamine

- type: entity
parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseRestrictedContraband]
id: ClothingOuterArmorAirsoftRed
name: airsoft suit
description: Semi-flexible polycarbonate armor suit with weakened protection. Airsoft armor
suffix: airsoft
components:
- type: Sprite
sprite: ADT/Clothing/OuterClothing/Armor/airsoft_red_armor.rsi
- type: Clothing
sprite: ADT/Clothing/OuterClothing/Armor/airsoft_red_armor.rsi
- type: GroupExamine
Original file line number Diff line number Diff line change
Expand Up @@ -452,3 +452,16 @@
sprite: ADT/Personalization/pushnoY_jumpsuit.rsi
- type: Clothing
sprite: ADT/Personalization/pushnoY_jumpsuit.rsi

#Maki_gg
- type: entity
parent: ClothingOuterStorageBase
id: ADTClothingOuterCoatMaki
name: Maki coat
description: Maki coat.
Inconnu1337 marked this conversation as resolved.
Show resolved Hide resolved
suffix: Personal
components:
- type: Sprite
sprite: ADT/Personalization/maki_coat.rsi
- type: Clothing
sprite: ADT/Personalization/maki_coat.rsi
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.
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,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "equipped-OUTERCLOTHING, equipped-OUTERCLOTHING, inhand-left, inhand-right and icon is drawn by boctonskuitea (Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"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.
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,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "equipped-OUTERCLOTHING, equipped-OUTERCLOTHING, inhand-left, inhand-right and icon is drawn by boctonskuitea (Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"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.
18 changes: 18 additions & 0 deletions Resources/Textures/ADT/Personalization/maki_coat.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "equipped-OUTERCLOTHING, icon is drawn by mascotvalera (Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
}
]
}
Loading