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

Upstream Diona #867

Closed
wants to merge 2 commits into from
Closed
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
5 changes: 3 additions & 2 deletions Resources/Prototypes/Damage/modifier_sets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,9 @@
id: Diona
coefficients:
Blunt: 0.7
Slash: 0.7
Heat: 1.4
Slash: 0.8
Heat: 1.5
Shock: 1.2

- type: damageModifierSet
id: Moth # Slightly worse at everything but cold
Expand Down
11 changes: 2 additions & 9 deletions Resources/Prototypes/Entities/Mobs/Species/diona.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
- type: Hunger
starvationDamage:
types:
Bloodloss: 0.1
Bloodloss: 0.5
baseDecayRate: 0.0083
- type: Thirst
baseDecayRate: 0.0083
- type: Carriable # Carrying system from nyanotrasen.
- type: Carriable # Carrying system from nyanotrasen.
- type: Icon
sprite: Mobs/Species/Diona/parts.rsi
state: full
Expand All @@ -29,7 +29,6 @@
Brute:
sprite: Mobs/Effects/brute_damage.rsi
color: "#75b1f0"
- type: Perishable
- type: Butcherable
butcheringType: Spike
spawned:
Expand Down Expand Up @@ -99,12 +98,6 @@
- type: BodyEmotes
soundsId: DionaBodyEmotes
- type: IgnoreKudzu
- type: Tag
tags:
- ShoesRequiredStepTriggerImmune
- CanPilot
- FootstepSound
- DoorBumpOpener

- type: entity
parent: BaseSpeciesDummy
Expand Down
Loading