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

Добавление капюшона для плаща пустоты и перенос скафандра инквизитора #439

Merged
merged 5 commits into from
Sep 9, 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 @@ -11,4 +11,7 @@ ent-ADTSpaceSecCommanderHelm = шлем скафандра командира SP

ent-ADTClothingHeadHelmetIlisium = шлем
.suffix = Иллизиум
.desc = Шлем бойца Иллизиума
.desc = Шлем бойца Иллизиума

ent-ADTClothingHeadHelmetHardsuitInquisitory = шлем инквизитора
.desc = Тебе дана власть над судьбами
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTClothingNeckVoidCloakHatHood = капюшон пустоты
.desc = Надев его вы ощущаете иллюзию безопасности
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ent-ADTBlueshieldSuit = скафандр офицера синего щита
.desc = Лёгкий боевой скафандр Нанотрейзен, с совсем не украденными у Синдиката технологиями, специально для Офицера Синего Щита и защиты его защищающего глав тела. Уверяю вас, всё это АБСОЛЮТНО легально.
.desc = Лёгкий боевой скафандр Нанотрейзен, с совсем не украденными у Синдиката технологиями, специально для Офицера Синего Щита и защиты его защищающего глав тела. Уверяю вас, всё это АБСОЛЮТНО легально.

ent-ADTSpaceSecPilotHardsuit = скафандр пилота SPACE SEC
.desc = Для хранителей безопасности среди звезд.
Expand All @@ -10,4 +10,7 @@ ent-ADTSpaceSecCommanderHardsuit = скафандр командира SPACE SEC

ent-ADTClothingOuterHardsuitIlisium = скафандр Иллизиума
.suffix = Иллизиум
.desc = Боевой скафандр бойца Иллизиума. Обеспечен встроенными керамическими пластинами.
.desc = Боевой скафандр бойца Иллизиума. Обеспечен встроенными керамическими пластинами.

ent-ADTClothingOuterHardsuitInquisitory = скафандр инквизитора
.desc = Покайся в своих грехах.
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,31 @@
Caustic: 0.85
- type: ExplosionResistance
damageCoefficient: 0.9


- type: entity
parent: ClothingHeadHardsuitWithLightBase
id: ADTClothingHeadHelmetHardsuitInquisitory
categories: [ HideSpawnMenu ]
noSpawn: false
name: inquisitor hardsuit helmet
description: You have been given power over destinies.
components:
- type: Sprite
sprite: ADT/Clothing/Head/Hardsuits/inquisitoryhead.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Hardsuits/inquisitoryhead.rsi
- type: PointLight
color: white
radius: 7
energy: 3
- type: PressureProtection
highPressureMultiplier: 0.08
lowPressureMultiplier: 1000
- type: Armor
modifiers:
coefficients:
Blunt: 0.8
Slash: 0.8
Piercing: 0.8
Heat: 0.8
21 changes: 21 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Head/hoods.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
- type: entity
parent: ClothingHeadBase
id: ADTClothingNeckVoidCloakHatHood
categories: [ HideSpawnMenu ]
name: hood of the void
description: wearing it, you feel the illusion of security
components:
- type: Sprite
sprite: ADT/Clothing/Head/hoods/hoods_void_cloak.rsi
- type: Clothing
sprite: ADT/Clothing/Head/hoods/hoods_void_cloak.rsi
- type: IdentityBlocker
- type: Tag
tags:
- WhitelistChameleon
- type: HideLayerClothing
slots:
- Hair
- Snout
- HeadTop
- HeadSide
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,38 @@
Slash: 0.65
Heat: 0.35
Radiation: 0.85
staminaModifier: 1
- type: ExplosionResistance
damageCoefficient: 0.3
- type: ToggleableClothing
clothingPrototype: ADTClothingHeadHelmetIlisium

- type: entity
parent: ClothingOuterHardsuitBase
id: ADTClothingOuterHardsuitInquisitory
name: inquisitory hardsuit
description: Repent of your sins.
components:
- type: Sprite
sprite: ADT/Clothing/OuterClothing/Hardsuits/inquisitory.rsi
- type: Clothing
sprite: ADT/Clothing/OuterClothing/Hardsuits/inquisitory.rsi
- type: PressureProtection
highPressureMultiplier: 0.02
lowPressureMultiplier: 1000
- type: ClothingSpeedModifier
walkModifier: 1.0
sprintModifier: 1.0
- type: Armor
modifiers:
coefficients:
Blunt: 0.5
Slash: 0.5
Piercing: 0.5
Heat: 0.5
Radiation: 0.5
staminaModifier: 0.1
- type: ExplosionResistance
damageCoefficient: 0.8
- type: ToggleableClothing
clothingPrototype: ADTClothingHeadHelmetHardsuitInquisitory
12 changes: 11 additions & 1 deletion Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,16 @@
sprite: Clothing/Neck/Cloaks/void.rsi
- type: TypingIndicatorClothing
proto: alien
#ADT Tweak Start
- type: ContainerContainer
containers:
toggleable-clothing: !type:ContainerSlot {}
- type: ToggleableClothing
clothingPrototype: ADTClothingNeckVoidCloakHatHood
requiredSlot:
- neck
slot: head
#ADT Tweak End

- type: entity
parent: ClothingNeckBase
Expand All @@ -218,7 +228,7 @@
- type: Sprite
sprite: Clothing/Neck/Cloaks/aro.rsi

#ADT start
#ADT start

# - type: entity
# parent: ClothingNeckBase
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"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": "off-inhand-left",
"directions": 4
},
{
"name": "off-inhand-right",
"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,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord: filokini",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:JayJacobs#1187",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
}
]
}
Loading