Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Fix extra damage at melee #119

Merged
merged 1 commit into from
May 4, 2024
Merged

Fix extra damage at melee #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 2 deletions Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
description: A small piece of crystal.
components:
- type: Sharp
- type: Execution
doAfterDuration: 4.0
- type: Sprite
layers:
- sprite: Objects/Materials/Shards/crystal.rsi
Expand Down
2 changes: 0 additions & 2 deletions Resources/Prototypes/Entities/Objects/Materials/shards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
description: It's a shard of some unknown material.
components:
- type: Sharp
- type: Execution
doAfterDuration: 4.0
- type: Sprite
layers:
- sprite: Objects/Materials/Shards/shard.rsi
Expand Down
2 changes: 0 additions & 2 deletions Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
description: In Space Glasgow this is called a conversation starter.
components:
- type: Sharp
- type: Execution
doAfterDuration: 4.0
- type: MeleeWeapon
attackRate: 1.5
damage:
Expand Down
2 changes: 0 additions & 2 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
description: A grotesque blade made out of bone and flesh that cleaves through people as a hot knife through butter.
components:
- type: Sharp
- type: Execution
doAfterDuration: 4.0
- type: Sprite
sprite: Objects/Weapons/Melee/armblade.rsi
state: icon
Expand Down
2 changes: 0 additions & 2 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
tags:
- FireAxe
- type: Sharp
- type: Execution
doAfterDuration: 4.0
- type: Sprite
sprite: Objects/Weapons/Melee/fireaxe.rsi
state: icon
Expand Down
2 changes: 0 additions & 2 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
tags:
- Knife
- type: Sharp
- type: Execution
doAfterDuration: 4.0
- type: Utensil
types:
- Knife
Expand Down
2 changes: 0 additions & 2 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
abstract: true
components:
- type: Sharp
- type: Execution
doAfterDuration: 4.0
- type: DisarmMalus

- type: entity
Expand Down
Loading