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

[ПЕРЕНОС]Закинул одежду Иллизиума #378

Merged
merged 4 commits into from
Aug 31, 2024
Merged

[ПЕРЕНОС]Закинул одежду Иллизиума #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
445c4e2
Закинул одежду Иллизиума
Schrodinger71 Aug 30, 2024
abe1155
Правки
Schrodinger71 Aug 31, 2024
6371315
nn
Schrodinger71 Aug 31, 2024
812d8ac
Merge branch 'master' into add_illisium
Schrodinger71 Aug 31, 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/prototypes/Entities/Clothing/Head/hardsuit-helmets.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ ent-ADTSpaceSecOfficerHelm = шлем скафандра офицера SPACE SE
.desc = Для хранителей безопасности среди звезд.
ent-ADTSpaceSecCommanderHelm = шлем скафандра командира SPACE SEC
.desc = Для командира хранителей безопасности среди звезд.

ent-ADTClothingHeadHelmetIlisium = шлем
Schrodinger71 marked this conversation as resolved.
Show resolved Hide resolved
.suffix = Иллизиум
.desc = Шлем бойца Иллизиума
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@ ent-ADTClothingHeadHatBeretBrigmedic = берет бригмедика

ent-ADTClothingHeadHatBeretBlackCivilian = чёрный берет
.desc = Этот тёмный берет из мягкой ткани прилегает к голове как уютный оберег от холода. Его простой и классический дизайн делает его универсальным аксессуаром для любого стиля одежды.

ent-ADTClothingHeadCapIlisium = фуражка
.suffix = Иллизиум
.desc = Тёмная фуражка офицера Иллизиума.
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/helmets.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ent-ADTClothingHeadHelmetSoliderIlisium = шлем скафандра
.suffix = Иллизиум
.desc = Шлем бойца Иллизиума
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Mask/mask.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@
###
ent-ADTClothingMaskGasCE = противогаз старшего инженера
.desc = Это элитный противогаз Старшего Инженера, которому может позавидовать даже Центральное Командование. Защищает от сварки.

ent-ADTClothingMaskGasIlisium = дыхательная маска
Bolper marked this conversation as resolved.
Show resolved Hide resolved
.suffix = Иллизиум
.desc = Плотно прилегающая тактическая маска, которую можно подсоединить к системе подачи воздуха.
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@ ent-ADTClothingOuterBlackSweatshirtTop = черная толстовка-топ

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

ent-ADTClothingOuterCoatIlisium = плащ Иллизиума
Bolper marked this conversation as resolved.
Show resolved Hide resolved
.suffix = Иллизиум
.desc = Тёмный плащ Иллизиума
6 changes: 5 additions & 1 deletion Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/hardsuits.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@ ent-ADTSpaceSecPilotHardsuit = скафандр пилота SPACE SEC
ent-ADTSpaceSecOfficerHardsuit = скафандр офицера SPACE SEC
.desc = Для хранителей безопасности среди звезд.
ent-ADTSpaceSecCommanderHardsuit = скафандр командира SPACE SEC
.desc = Для командира хранителей безопасности среди звезд.
.desc = Для командира хранителей безопасности среди звезд.

Bolper marked this conversation as resolved.
Show resolved Hide resolved
ent-ADTClothingOuterHardsuitIlisium = скафандр Иллизиума
.suffix = Иллизиум
.desc = Боевой скафандр бойца Иллизиума. Обеспечен встроенными керамическими пластинами.
6 changes: 5 additions & 1 deletion Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,4 +186,8 @@ ent-ADTSpaceSecUniformOfficer = комбинезон офицера SPACE SEC
ent-ADTClothingUniformBrigmedicTurtleneck = водолазка бригмедика
.desc = Удобная и тёплая водолазка ангела-хранителя брига.
ent-ADTClothingUniformSkirtBrigmedicTurtleneck = юбка-водолазка бригмедика
.desc = Удобная и тёплая юбка-водолазка ангела-хранителя брига.
.desc = Удобная и тёплая юбка-водолазка ангела-хранителя брига.

Bolper marked this conversation as resolved.
Show resolved Hide resolved
ent-ADTClothingUniformIlisium = костюм Иллизиума
.suffix = Иллизиум
.desc = Тёмный костюм Иллизиума.
29 changes: 27 additions & 2 deletions Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,38 @@
Heat: 0.9
Radiation: 0.9

- type: entity
parent: ClothingHeadHardsuitWithLightBase
id: ADTClothingHeadHelmetIlisium
noSpawn: true
name: helmet
description: Ilisium
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Эт суффикс

suffix: Ilisium
components:
- type: Sprite
sprite: ADT/Clothing/Head/Hardsuits/helmet_ili.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Hardsuits/helmet_ili.rsi
- type: PointLight
color: red
- type: PressureProtection
highPressureMultiplier: 0.08
lowPressureMultiplier: 1000
- type: Armor
modifiers:
coefficients:
Blunt: 0.90
Slash: 0.65
Heat: 0.80
Radiation: 0.95

# Blueshield
- type: entity
parent: ClothingHeadHardsuitWithLightBase
id: ADTClothingHeadHelmetHardsuitBlueshield
noSpawn: true
name: blueshield hardsuit helmet
description:
description:
components:
- type: Sprite
sprite: ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi
Expand Down Expand Up @@ -147,4 +172,4 @@
Radiation: 0.85
Caustic: 0.85
- type: ExplosionResistance
damageCoefficient: 0.9
damageCoefficient: 0.9
15 changes: 14 additions & 1 deletion Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,17 @@
- type: Sprite
sprite: ADT/Clothing/Head/Hats/beret_brigmedic.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Hats/beret_brigmedic.rsi
sprite: ADT/Clothing/Head/Hats/beret_brigmedic.rsi

- type: entity
parent: ClothingHeadBase
id: ADTClothingHeadCapIlisium
name: Huraska
Schrodinger71 marked this conversation as resolved.
Show resolved Hide resolved
description: Ilisium
suffix: Ilisium
components:
- type: Sprite
sprite: ADT/Clothing/Head/Hats/hurashka.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Hats/hurashka.rsi

11 changes: 11 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Head/helmets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- type: entity
parent: ClothingHeadBase
id: ADTClothingHeadHelmetSoliderIlisium
name: Helmet
description: Ilisium
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Тож суффикс

suffix: Ilisium
components:
- type: Sprite
sprite: ADT/Clothing/Head/Helmets/helmetSolder.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Helmets/helmetSolder.rsi
1 change: 0 additions & 1 deletion Resources/Prototypes/ADT/Entities/Clothing/Masks/fill.txt
View file
Open in desktop

This file was deleted.

26 changes: 13 additions & 13 deletions Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,19 +249,19 @@
# shader: unshaded
# - type: BreathMask

# - type: entity
# parent: ClothingMaskGas
# id: ADTClothingMaskGasIlisium
# name: gas mask
# description: A close-fitting tactical mask that can be connected to an air supply.
# components:
# - type: Sprite
# sprite: ADT/Clothing/Head/Hats/gasmask_ili.rsi
# - type: Clothing
# sprite: ADT/Clothing/Head/Hats/gasmask_ili.rsi
# - type: FlashImmunity
# - type: EyeProtection
# protectionTime: 5
- type: entity
parent: ClothingMaskGas
id: ADTClothingMaskGasIlisium
name: gas mask
description: A close-fitting tactical mask that can be connected to an air supply.
components:
- type: Sprite
sprite: ADT/Clothing/Mask/gasmask_ili.rsi
- type: Clothing
sprite: ADT/Clothing/Mask/gasmask_ili.rsi
- type: FlashImmunity
- type: EyeProtection
protectionTime: 5

- type: entity
parent: ClothingMaskGasAtmos
Expand Down
16 changes: 16 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,19 @@
modifiers:
coefficients:
Caustic: 0.75

- type: entity
parent: ClothingOuterStorageBase
id: ADTClothingOuterCoatIlisium
name: Raincoat Ilisium
description: Ilisium
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Суффикс

suffix: Ilisium
components:
- type: Sprite
sprite: ADT/Clothing/OuterClothing/Coats/plash_ili.rsi
- type: Clothing
sprite: ADT/Clothing/OuterClothing/Coats/plash_ili.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.75
55 changes: 0 additions & 55 deletions Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuit.yml
View file
Open in desktop

This file was deleted.

89 changes: 88 additions & 1 deletion Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,91 @@
- type: ToggleableClothing
clothingPrototype: ADTSpaceSecCommanderHelm
- type: ExplosionResistance
damageCoefficient: 0.5
damageCoefficient: 0.5

- type: entity
parent: ClothingOuterHardsuitBasic
id: ADTClothingOuterERTRiotHardsuit
name: riot ERT helmet
description: The cheapest ERT hardsuit choice, designed especially for economy and anti-riot actions
components:
- type: Sprite
sprite: ADT/Clothing/OuterClothing/Hardsuits/riotert.rsi
- type: Clothing
sprite: ADT/Clothing/OuterClothing/Hardsuits/riotert.rsi
- type: ToggleableClothing
clothingPrototype: ADTClothingHeadHelmetHardsuitRiotERT
- type: Armor
modifiers:
coefficients:
Blunt: 0.4
Slash: 0.4
Piercing: 0.7
Heat: 0.6
Radiation: 0.9
- type: ClothingSpeedModifier
walkModifier: 0.9
sprintModifier: 0.9

- type: entity
parent: ClothingOuterHardsuitBase
id: ADTBlueshieldSuit
name: blueshield's hardsuit
description: A rugged and mobile spacesuit for the lives of high-ranking members of Nanotrasen.
components:
- type: Sprite
sprite: ADT/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi
- type: Clothing
sprite: ADT/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi
- type: ClothingSpeedModifier
walkModifier: 0.9
sprintModifier: 0.9
- type: HeldSpeedModifier
- type: PressureProtection
highPressureMultiplier: 0.05
lowPressureMultiplier: 10000
- type: Armor
modifiers:
coefficients:
Blunt: 0.6
Slash: 0.6
Piercing: 0.5
Heat: 0.7
Radiation: 0.3
Caustic: 0.5
# Stun: 0.9
- type: ExplosionResistance
damageCoefficient: 0.6
- type: ToggleableClothing
clothingPrototype: ADTClothingHeadHelmetHardsuitBlueshield

- type: entity
parent: ClothingOuterHardsuitBase
id: ADTClothingOuterHardsuitIlisium
name: hardsuit ilisium
description: hardsuit ilisium
suffix: Ilisium
components:
- type: Sprite
sprite: ADT/Clothing/OuterClothing/Hardsuits/hardsuit_ili.rsi
- type: Clothing
sprite: ADT/Clothing/OuterClothing/Hardsuits/hardsuit_ili.rsi
- type: PressureProtection
highPressureMultiplier: 0.02
lowPressureMultiplier: 1000
- type: ClothingSpeedModifier
walkModifier: 0.9
sprintModifier: 0.9
- type: TemperatureProtection
coefficient: 0.001
- type: Armor
modifiers:
coefficients:
Blunt: 0.65
Slash: 0.65
Heat: 0.35
Radiation: 0.85
- type: ExplosionResistance
damageCoefficient: 0.3
- type: ToggleableClothing
clothingPrototype: ADTClothingHeadHelmetIlisium
12 changes: 12 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,18 @@
Piercing: 0.8
Heat: 0.9

- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformIlisium
name: Suit Ilisiom
description: Suit Ilisiom
suffix: Ilisium
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpsuit/uniform_ili.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/uniform_ili.rsi

#Стильномат

- type: entity
Expand Down
Binary file added Resources/Textures/ADT/Clothing/Head/Hardsuits/helmet_ili.rsi/icon-flash.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Clothing/Head/Hardsuits/helmet_ili.rsi/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions Resources/Textures/ADT/Clothing/Head/Hardsuits/helmet_ili.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:Floppa#0007",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-flash"
},
{
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "on-equipped-HELMET",
"directions": 4
}
]
}
Binary file added ...ces/Textures/ADT/Clothing/Head/Hardsuits/helmet_ili.rsi/off-equipped-HELMET.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...rces/Textures/ADT/Clothing/Head/Hardsuits/helmet_ili.rsi/on-equipped-HELMET.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Clothing/Head/Hats/hurashka.rsi/equipped-HELMET.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Clothing/Head/Hats/hurashka.rsi/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading