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

Фикс формы комиссара + отключение рас #22

Merged
merged 2 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
2 changes: 1 addition & 1 deletion Resources/Prototypes/DeltaV/Species/chitinid.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Chitinid
name: species-name-chitinid
roundStart: true
roundStart: false
prototype: MobChitinid
sprites: MobChitinidSprites
defaultSkinTone: "#ffda93"
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/DeltaV/Species/vulpkanin.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Vulpkanin
name: species-name-vulpkanin
roundStart: true
roundStart: false
prototype: MobVulpkanin
sprites: MobVulpkaninSprites
defaultSkinTone: "#985629"
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Nyanotrasen/Species/Oni.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Oni
name: species-name-oni
roundStart: true
roundStart: false
prototype: MobOni
dollPrototype: MobOniDummy
markingLimits: MobOniMarkingLimits
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Nyanotrasen/Species/felinid.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Felinid
name: species-name-felinid
roundStart: true
roundStart: false
prototype: MobFelinid
sprites: MobHumanSprites
defaultSkinTone: "#c0967f"
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/arachne.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Arachne
name: species-name-arachne
roundStart: true # I'll kill these issues somehow.
roundStart: false # I'll kill these issues somehow.
prototype: MobArachne
sprites: MobArachneSprites
defaultSkinTone: "#c0967f"
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/arachnid.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Arachnid
name: species-name-arachnid
roundStart: true
roundStart: false
prototype: MobArachnid
sprites: MobArachnidSprites
defaultSkinTone: "#385878"
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/diona.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Diona
name: species-name-diona
roundStart: true
roundStart: false
prototype: MobDiona
sprites: MobDionaSprites
defaultSkinTone: "#cdb369"
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/harpy.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Harpy
name: species-name-harpy
roundStart: true
roundStart: false
prototype: MobHarpy
sprites: MobHarpySprites
defaultSkinTone: "#c0967f"
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/ipc.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: IPC
name: species-name-ipc
roundStart: true
roundStart: false
prototype: MobIPC
sprites: MobIPCSprites
defaultSkinTone: "#aaa9ad"
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/moth.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Moth
name: species-name-moth
roundStart: true
roundStart: false
prototype: MobMoth
sprites: MobMothSprites
defaultSkinTone: "#ffda93"
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/plasmaman.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Plasmaman
name: species-name-plasmaman
roundStart: true
roundStart: false
prototype: MobPlasmaman
sprites: MobPlasmamanSprites
defaultSkinTone: "#a349a4"
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/reptilian.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Reptilian
name: species-name-reptilian
roundStart: true
roundStart: false
prototype: MobReptilian
sprites: MobReptilianSprites
defaultSkinTone: "#34a223"
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/shadowkin.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Shadowkin
name: species-name-shadowkin
roundStart: true
roundStart: false
prototype: MobShadowkin
sprites: MobShadowkinSprites
defaultSkinTone: "#FFFFFF"
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/slime.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: SlimePerson
name: species-name-slime
roundStart: true
roundStart: false
prototype: MobSlimePerson
sprites: MobSlimeSprites
defaultSkinTone: "#b8b8b8"
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_EE/Species/tajaran.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Tajaran
name: species-name-tajaran
roundStart: true
roundStart: false
prototype: MobTajaran
sprites: MobTajaranSprites
markingLimits: MobTajaranMarkingLimits
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
suffix: WH40K
components:
- type: Sprite
sprite: _WH40K\Clothing\Hands\Gloves\commissar.rsi
sprite: _WH40K/Clothing/Hands/Gloves/commissar.rsi
- type: Clothing
sprite: _WH40K\Clothing\Hands\Gloves\commissar.rsi
sprite: _WH40K/Clothing/Hands/Gloves/commissar.rsi
- type: Insulated
4 changes: 2 additions & 2 deletions Resources/Prototypes/_WH40K/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
suffix: WH40K
components:
- type: Sprite
sprite: _WH40K\Clothing\Head\Hats\commissar.rsi
sprite: _WH40K/Clothing/Head/Hats/commissar.rsi
- type: Clothing
sprite: _WH40K\Clothing\Head\Hats\commissar.rsi
sprite: _WH40K/Clothing/Head/Hats/commissar.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
- type: entity
parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]
id: ClothingOuterArmorCommissar
name: куртка комиссара
description: Комиссарская куртка - вот он, символ НАСТОЯЩЕЙ власти на поле боя.
name: шинель комиссара
description: Комиссарская шинель - вот он, символ НАСТОЯЩЕЙ власти на поле боя.
suffix: WH40K
components:
- type: Sprite
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_WH40K/Entities/Clothing/Shoes/boots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
suffix: WH40K
components:
- type: Sprite
sprite: _WH40K\Clothing\Shoes\Boots\commissar.rsi
sprite: _WH40K/Clothing/Shoes/Boots/commissar.rsi
- type: Clothing
sprite: _WH40K\Clothing\Shoes\Boots\commissar.rsi
sprite: _WH40K/Clothing/Shoes/Boots/commissar.rsi
- type: ClothingSlowOnDamageModifier
modifier: 0.4
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
suffix: WH40K
components:
- type: Sprite
sprite: _WH40K\Clothing\Uniforms\Jumpsuit\commissar.rsi
sprite: _WH40K/Clothing/Uniforms/Jumpsuit/commissar.rsi
- type: Clothing
sprite: _WH40K\Clothing\Uniforms\Jumpsuit\commissar.rsi
sprite: _WH40K/Clothing/Uniforms/Jumpsuit/commissar.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
- type: Tag
tags:
- FireAxe
- type: Sharp
- type: Execution
doAfterDuration: 4.0
- type: Sprite
Expand All @@ -20,8 +19,7 @@
attackRate: 1.3333
damage:
types:
Blunt: 5
Slash: 30
Blunt: 30
Structural: 50
heavyDamageBaseModifier: 1.0
heavyStaminaCost: 10
Expand All @@ -35,8 +33,7 @@
- type: IncreaseDamageOnWield
damage:
types:
Blunt: 2
Slash: 5
Blunt: 5
Structural: 40
- type: Item
size: Ginormous
Expand All @@ -51,8 +48,4 @@
stealGroup: FireAxe
- type: IgniteOnMeleeHit
fireStacks: -4
# Shitmed Change
- type: Scalpel
speed: 0.3
- type: BoneSaw
speed: 0.5
# Shitmed Change
Loading