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

Исправления + Комиссарский комплект #21

Merged
merged 3 commits into from
Feb 4, 2025
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
4 changes: 2 additions & 2 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakCJ
name: chief justice's cloak
description: A hefty cloak adorned with a modest insignia and grand fur trim.
name: флотский офицерский плащ
description: Эта вещь является атрибутом лучших из лучших на этом судне. Уважайте носящего её.
components:
- type: Sprite
sprite: DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi
Expand Down
15 changes: 14 additions & 1 deletion Resources/Prototypes/_WH40K/Entities/Clothing/Hands/gloves.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,24 @@
parent: ClothingHandsGlovesColorBlack
id: ClothingHandsGlovesCombatVoidsman
name: боевые перчатки
description: Боевые перчатки флота
description: Боевые перчатки флота.
suffix: WH40K, войдсмены
components:
- type: Sprite
sprite: _WH40K/Clothing/Hands/Gloves/v_sergeant.rsi
- type: Clothing
sprite: _WH40K/Clothing/Hands/Gloves/v_sergeant.rsi
- type: Insulated

- type: entity
parent: ClothingHandsGlovesColorBlack
id: ClothingHandsGlovesCombatCommissar
name: перчатки комиссара
description: Крайне удобны для одновременного удержания болт-пистолета и пиломеча в одних руках.
suffix: WH40K
components:
- type: Sprite
sprite: _WH40K\Clothing\Hands\Gloves\commissar.rsi
- type: Clothing
sprite: _WH40K\Clothing\Hands\Gloves\commissar.rsi
- type: Insulated
11 changes: 11 additions & 0 deletions Resources/Prototypes/_WH40K/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- type: entity
parent: ClothingHeadBase
id: ClothingHeadCommissar
name: фуражка комиссара
description: Идеальный головной убор для выкриков в духе 'ВПЕРЁД, СОБАКИ!'
suffix: WH40K
components:
- type: Sprite
sprite: _WH40K\Clothing\Head\Hats\commissar.rsi
- type: Clothing
sprite: _WH40K\Clothing\Head\Hats\commissar.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,30 @@
- type: ExplosionResistance
damageCoefficient: 0.65
- type: GroupExamine

- type: entity
parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]
id: ClothingOuterArmorCommissar
name: куртка комиссара
description: Комиссарская куртка - вот он, символ НАСТОЯЩЕЙ власти на поле боя.
suffix: WH40K
components:
- type: Sprite
sprite: _WH40K/Clothing/OuterClothing/Armor/commissar.rsi
- type: Clothing
sprite: _WH40K/Clothing/OuterClothing/Armor/commissar.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.5
Slash: 0.5
Piercing: 0.55
Heat: 0.55
Caustic: 0.9
- type: ClothingSpeedModifier
walkModifier: 1.0
sprintModifier: 1.0
- type: HeldSpeedModifier
- type: ExplosionResistance
damageCoefficient: 0.7
- type: GroupExamine
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
Caustic: 0.60
Heat: 0.60
- type: ClothingSpeedModifier
walkModifier: 0.75
sprintModifier: 0.75
walkModifier: 0.85
sprintModifier: 0.85
- type: HeldSpeedModifier
- type: Item
size: Ginormous
Expand Down Expand Up @@ -122,7 +122,7 @@
- type: Clothing
sprite: _WH40K/Clothing/OuterClothing/Hardsuits/v_grenadier.rsi
- type: ExplosionResistance
damageCoefficient: 0.70
damageCoefficient: 0.30
- type: Armor
modifiers:
coefficients:
Expand Down
14 changes: 14 additions & 0 deletions Resources/Prototypes/_WH40K/Entities/Clothing/Shoes/boots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,17 @@
sprite: _WH40K/Clothing/Shoes/Boots/combatboots.rsi
- type: ClothingSlowOnDamageModifier
modifier: 0.5

- type: entity
parent: ClothingShoesMilitaryBase
id: ClothingShoesCommissarBoots
name: сапоги комиссара
description: Тяжёлые сапоги, принадлежащие самому комиссару. Мы лёд под ногами комиссара...
suffix: WH40K
components:
- type: Sprite
sprite: _WH40K\Clothing\Shoes\Boots\commissar.rsi
- type: Clothing
sprite: _WH40K\Clothing\Shoes\Boots\commissar.rsi
- type: ClothingSlowOnDamageModifier
modifier: 0.4
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,15 @@
sprite: _WH40K/Clothing/Uniforms/Jumpsuit/voidsman.rsi
- type: Clothing
sprite: _WH40K/Clothing/Uniforms/Jumpsuit/voidsman.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitCommissar
name: униформа комиссара
description: Униформа боевого командира Астра Милитарум - комиссара. От неё пахнет ужасом врагов и подчинённых.
suffix: WH40K
components:
- type: Sprite
sprite: _WH40K\Clothing\Uniforms\Jumpsuit\commissar.rsi
- type: Clothing
sprite: _WH40K\Clothing\Uniforms\Jumpsuit\commissar.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
state: icon
- type: Item
sprite: /Textures/_WH40K/Objects/Specific/Medical/syringegun.rsi
size: Medium
size: Normal
- type: SolutionContainerManager
solutions:
injector:
Expand All @@ -35,7 +35,7 @@
state: icon
- type: Item
sprite: /Textures/_WH40K/Objects/Specific/Medical/advsyringegun.rsi
size: Medium
size: Normal
- type: SolutionContainerManager
solutions:
hypospray:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Don't parent to BaseWeaponShotgun because it differs significantly
parent: [BaseItem, BaseGunWieldable]
id: WeaponShotgunCombatShotgun
description: filler
description: Выглядя как простейший дробовик (и являясь им), это оружие представляет из себя, пожалуй, самый смертоносный вид вооружения на близких дистанциях. Использует боеприпасы .50 калибра.
suffix: WH40K
components:
- type: Sprite
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
- type: DamageOtherOnHit
meleeDamageMultiplier: 1.5
staminaCost: 18
- type: EmbeddableProjectile
- type: EmbedPassiveDamage
- type: Wieldable
- type: IncreaseDamageOnWield
damage:
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "by Fizzo",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HAND",
"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": "by Fizzo",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"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": "by Fizzo",
"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": "by Fizzo",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-FEET",
"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": "by Fizzo",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"license": "CC-BY-SA-3.0",
"copyright": "by Delikoo",
"size": {
"x": 32,
"y": 32
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"license": "CC-BY-SA-3.0",
"copyright": "by Delikoo",
"size": {
"x": 32,
"y": 32
Expand Down
Loading