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

Ивентовые вещи #576

Merged
merged 5 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Expand Up @@ -12,3 +12,7 @@ ent-ClothingHeadHelmetLightHardsuitUSSP = шлем скафандра "Гром-
.desc = Лёгкий боевой скафандр СССП, предназначенный для быстрого реагирования и мобильных операций. Лёгкая броня обеспечивает защиту от огнестрельного оружия и позволяет сохранять высокую манёвренность. Гром-П используется штурмовыми отрядами для быстрых и эффективных боевых действий.
ent-ClothingHeadHelmetHardsuitEngineeringCompact = шлем скафандра ведущего инженера
.desc = Инженерный шлем скафандра, предназначенный для работы в условиях низкого давления и высокой радиоактивности.
ent-ClothingHeadHelmetHardsuitUegParatrooper = шлем скафандра космического десантника
.desc = Шлем от экземпляра скафандра десантника ОПЗ.
ent-ClothingHeadHelmetHardsuitUegCap = шлем скафандра капитана космических десантников
.desc = Шлем от экземпляра капитанского скафандра ОПЗ.
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,6 @@ ent-ClothingCloakGamer = легендарный плащ геймера
.desc = Его носят самые опытные профессиональные геймеры.
ent-ClothingCloakAtmosian = плащ атмосианина
.desc = Плащ легендарного атмосианина.
ent-ClothingNeckCloakUeg = плащ десантника ОПЗ
.desc = Плащ знаменитых космических десантников Объединённого Правительства Земли. Его носят только поистине те, кто смог удостоится чести быть космическим десантником ОПЗ. Этот плащ олицетворяет свободу и демократию, к которым должна стремиться цивилизация. В ином случае - демократию и освобождение принесёт Правительство Земли.

Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ ent-ClothingOuterLightHardsuitUSSP = Гром-П
.desc = Лёгкий боевой скафандр СССП, предназначенный для быстрого реагирования и мобильных операций. Лёгкая броня обеспечивает защиту от огнестрельного оружия и позволяет сохранять высокую манёвренность. Гром-П используется штурмовыми отрядами для быстрых и эффективных боевых действий.
ent-ClothingOuterHardsuitEngineeringCompact = скафандр ведущего инженера
.desc = Специальный костюм, защищающий от опасных сред с низким давлением. Имеет защиту от радиации. Очень компактный.
ent-ClothingHardsuitUegParatrooper = скафандр космического десантника
.desc = Данный экземпляр носят исключительно те, кто приносит демократию и свободу цивилизации, освобождая её от гнёта диктатуры и тоталитаризма. Благодаря новым технологиям Объединённого Правительства Земли - скафандр обеспечен мобильностью и высокой защитой. А также встроенной системой связи, которая периодически пропагандирует агитационные реплики демократии.
ent-ClothingHardsuitUegCap = скафандр командира космических десантников
.desc = Смотря на него - вы можете представить себе ту боль, страдания и труд, который перенёс на себе десантник, дабы добиться той чести, чтобы носить данный скафандр. Олицетворяет страх и ужас перед вашими глазами. Если вы вживую увидели носителя этого скафандра - вам стоит поблагодарить его за предоставленную вам свободу и демократию, слава Объединённому Правительству Земли!
Original file line number Diff line number Diff line change
Expand Up @@ -164,3 +164,57 @@
- type: NightVisionDevice
displayColor: "#ebeb00"
displayShader: NVDDisplay

#Для ивентов

- type: entity
parent: ClothingHeadHardsuitWithLightBase
id: ClothingHeadHelmetHardsuitUegParatrooper
name: space marine spacesuit helmet
description: The helmet from a paratrooper spacesuit.
components:
- type: Sprite
sprite: _Sunrise/Clothing/Head/Hardsuits/ueg_paratrooperh.rsi
- type: Clothing
sprite: _Sunrise/Clothing/Head/Hardsuits/ueg_paratrooperh.rsi
- type: PointLight
color: cyan
- type: PressureProtection
highPressureMultiplier: 0.525
lowPressureMultiplier: 1000
- type: Armor
modifiers:
coefficients:
Blunt: 0.9
Slash: 0.9
Piercing: 0.9
Heat: 0.9
- type: FlashImmunity
- type: EyeProtection
- type: ShowJobIcons

- type: entity
parent: ClothingHeadHardsuitWithLightBase
id: ClothingHeadHelmetHardsuitUegCap
name: space suit helmet of a space marines captain.
description: The helmet from a paratrooper captain spacesuit.
components:
- type: Sprite
sprite: _Sunrise/Clothing/Head/Hardsuits/ueg_captainh.rsi
- type: Clothing
sprite: _Sunrise/Clothing/Head/Hardsuits/ueg_captainh.rsi
- type: PointLight
color: cyan
- type: PressureProtection
highPressureMultiplier: 0.525
lowPressureMultiplier: 1000
- type: Armor
modifiers:
coefficients:
Blunt: 0.85
Slash: 0.85
Piercing: 0.85
Heat: 0.85
- type: FlashImmunity
- type: EyeProtection
- type: ShowJobIcons
11 changes: 11 additions & 0 deletions Resources/Prototypes/_Sunrise/Entities/Clothing/Neck/cloaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -215,3 +215,14 @@
components:
- type: Sprite
sprite: _Sunrise/Clothing/Neck/Cloaks/atmosian.rsi

#Для ивентов

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakUeg
name: paratrooper cape
description: The cloak of the famous space troopers of the United Government of Earth. It is worn only by those truly honored to be OPZ Space Troopers. This cape represents the freedom and democracy that civilization must strive for. Otherwise, democracy and liberation will be brought by the Earth Government.
components:
- type: Sprite
sprite: _Sunrise/Clothing/Neck/Cloaks/ueg_cloak.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -218,3 +218,75 @@
sprite: _Sunrise/Clothing/OuterClothing/Hardsuits/engineering-compact.rsi
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitEngineeringCompact

#Для ивентов

- type: entity
parent: ClothingOuterHardsuitBase
id: ClothingHardsuitUegParatrooper
name: space marine spacesuit
description: This piece is worn exclusively by those who bring democracy and freedom to civilization, freeing it from the oppression of dictatorship and totalitarianism. Thanks to the new technologies of the United Government of Earth, the spacesuit is provided with mobility and high protection. As well as a built-in communication system, which periodically propagandizes propaganda replicas of democracy.
components:
- type: Sprite
sprite: _Sunrise/Clothing/OuterClothing/Hardsuits/ueg_paratrooper.rsi
- type: Clothing
sprite: _Sunrise/Clothing/OuterClothing/Hardsuits/ueg_paratrooper.rsi
- type: PressureProtection
highPressureMultiplier: 0.02
lowPressureMultiplier: 1000
- type: TemperatureProtection
heatingCoefficient: 0.001
- type: FireProtection
reduction: 0.3
- type: ExplosionResistance
damageCoefficient: 0.5
- type: Armor
modifiers:
coefficients:
Blunt: 0.25
Slash: 0.25
Piercing: 0.25
Heat: 0.25
Radiation: 0.25
Caustic: 0.25
- type: ClothingSpeedModifier
walkModifier: 0.9
sprintModifier: 0.9
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitUegParatrooper

- type: entity
parent: ClothingOuterHardsuitBase
id: ClothingHardsuitUegCap
name: spacesuit of the commander of space marines
description: As you look at it, you can imagine the pain, suffering and labor that a paratrooper endured to achieve the honor of wearing this suit. It represents the fear and horror before your eyes. If you have seen the wearer of this suit in person, you should thank him for the freedom and democracy he has given you, glory to the United Government of Earth!
components:
- type: Sprite
sprite: _Sunrise/Clothing/OuterClothing/Hardsuits/ueg_captain.rsi
- type: Clothing
sprite: _Sunrise/Clothing/OuterClothing/Hardsuits/ueg_captain.rsi
- type: PressureProtection
highPressureMultiplier: 0.02
lowPressureMultiplier: 1000
- type: TemperatureProtection
heatingCoefficient: 0.001
- type: FireProtection
reduction: 0.3
- type: ExplosionResistance
damageCoefficient: 0.5
- type: Armor
modifiers:
coefficients:
Blunt: 0.2
Slash: 0.2
Piercing: 0.2
Heat: 0.2
Radiation: 0.2
Caustic: 0.2
- type: ClothingSpeedModifier
walkModifier: 0.9
sprintModifier: 0.9
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitUegCap
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,25 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by EUPHORIYA (dis: lxstedsxul)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-flash"
},
{
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "on-equipped-HELMET",
"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,25 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by EUPHORIYA (dis: lxstedsxul)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-flash"
},
{
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "on-equipped-HELMET",
"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.
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,27 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "made by EUPHORIYA (dis: lxstedsxul)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"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": "Created by EUPHORIYA (dis: lxstedsxul)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"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": "Created by EUPHORIYA (dis: lxstedsxul)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading