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

Исправление бага с сном у яутж и ксеносов #647

Merged
merged 1 commit into from
Nov 19, 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
27 changes: 18 additions & 9 deletions Resources/Prototypes/_Sunrise/Body/Organs/humanoid_xeno.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

- type: entity
id: OrganHumanoidXenoBrain
parent: BaseHumanoidXenoOrgan
parent: [BaseHumanoidXenoOrgan, BaseOrganBrain]
name: brain
description: The nexus of the alien mind. Thoughts you don't want to know.
components:
Expand Down Expand Up @@ -71,7 +71,7 @@

- type: entity
id: OrganHumanoidXenoTongue
parent: BaseHumanoidXenoOrgan
parent: [BaseHumanoidXenoOrgan, BaseOrganTongue]
name: tongue
description: Long and flexible.
components:
Expand All @@ -80,7 +80,7 @@

- type: entity
id: OrganHumanoidXenoAppendix
parent: BaseHumanoidXenoOrgan
parent: [BaseHumanoidXenoOrgan, BaseOrganAppendix]
name: appendix
description: An evolutionary greeting from the past.
components:
Expand All @@ -92,7 +92,7 @@

- type: entity
id: OrganHumanoidXenoEars
parent: BaseHumanoidXenoOrgan
parent: [BaseHumanoidXenoOrgan, BaseOrganEars]
name: ears
description: Ultra-sensitive locators. Hear your fears.
components:
Expand All @@ -101,7 +101,7 @@

- type: entity
id: OrganHumanoidXenoLungs
parent: BaseHumanoidXenoOrgan
parent: [BaseHumanoidXenoOrgan, BaseOrganLungs]
name: lungs
description: They filter oxygen from the atmosphere and channel it into the bloodstream, where it is used as an electron carrier.
components:
Expand Down Expand Up @@ -135,7 +135,7 @@

- type: entity
id: OrganHumanoidXenoHeart
parent: BaseHumanoidXenoOrgan
parent: [BaseHumanoidXenoOrgan, BaseOrganHeart]
name: xenomorph heart
description: A powerful organ that pumps acidic blood through tough tissues and provides incredible stamina and strength to every xenomorph.
components:
Expand All @@ -151,7 +151,7 @@

- type: entity
id: OrganHumanoidXenoStomach
parent: BaseHumanoidXenoOrgan
parent: [BaseHumanoidXenoOrgan, BaseOrganStomach]
name: stomach
description: A voracious pit.
components:
Expand All @@ -176,7 +176,7 @@

- type: entity
id: OrganHumanoidXenoLiver
parent: BaseHumanoidXenoOrgan
parent: [BaseHumanoidXenoOrgan, BaseOrganLiver]
name: liver
description: A powerful detoxifier that neutralizes dangerous substances with ease.
components:
Expand All @@ -191,7 +191,7 @@

- type: entity
id: OrganHumanoidXenoKidneys
parent: BaseHumanoidXenoOrgan
parent: [BaseHumanoidXenoOrgan, BaseOrganKidneys]
name: kidneys
description: Paired filters, ruthlessly taking out anything superfluous.
components:
Expand All @@ -203,3 +203,12 @@
maxReagents: 5
metabolizerTypes: [Human]
removeEmpty: true

- type: entity
id: OrganHumanoidXenoEyes
parent: [BaseHumanoidXenoOrgan, BaseOrganEyes]
name: eyes
description: Eyes. They see
components:
- type: Sprite
state: eyes
20 changes: 10 additions & 10 deletions Resources/Prototypes/_Sunrise/Body/Organs/predator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

- type: entity
id: OrganPredatorBrain
parent: BasePredatorOrgan
parent: [BasePredatorOrgan, BaseOrganBrain]
name: brain
description: The nexus of the alien mind. Thoughts you don't want to know.
components:
Expand Down Expand Up @@ -71,7 +71,7 @@

- type: entity
id: OrganPredatorTongue
parent: BasePredatorOrgan
parent: [BasePredatorOrgan, BaseOrganTongue]
name: tongue
description: Long and flexible.
components:
Expand All @@ -80,7 +80,7 @@

- type: entity
id: OrganPredatorAppendix
parent: BasePredatorOrgan
parent: [BasePredatorOrgan, BaseOrganAppendix]
name: appendix
description: An evolutionary greeting from the past.
components:
Expand All @@ -92,7 +92,7 @@

- type: entity
id: OrganPredatorEars
parent: BasePredatorOrgan
parent: [BasePredatorOrgan, BaseOrganEars]
name: ears
description: Ultra-sensitive locators. Hear your fears.
components:
Expand All @@ -101,7 +101,7 @@

- type: entity
id: OrganPredatorLungs
parent: BasePredatorOrgan
parent: [BasePredatorOrgan, BaseOrganLungs]
name: lungs
description: They filter oxygen from the atmosphere and channel it into the bloodstream, where it is used as an electron carrier.
components:
Expand Down Expand Up @@ -135,7 +135,7 @@

- type: entity
id: OrganPredatorHeart
parent: BasePredatorOrgan
parent: [BasePredatorOrgan, BaseOrganHeart]
name: predator heart
description: A powerful organ that pumps acidic blood through tough tissues and provides incredible stamina and strength to every predator.
components:
Expand All @@ -151,7 +151,7 @@

- type: entity
id: OrganPredatorStomach
parent: BasePredatorOrgan
parent: [BasePredatorOrgan, BaseOrganStomach]
name: stomach
description: A voracious pit.
components:
Expand All @@ -176,7 +176,7 @@

- type: entity
id: OrganPredatorLiver
parent: BasePredatorOrgan
parent: [BasePredatorOrgan, BaseOrganLiver]
name: liver
description: A powerful detoxifier that neutralizes dangerous substances with ease.
components:
Expand All @@ -191,7 +191,7 @@

- type: entity
id: OrganPredatorKidneys
parent: BasePredatorOrgan
parent: [BasePredatorOrgan, BaseOrganKidneys]
name: kidneys
description: Paired filters, ruthlessly taking out anything superfluous.
components:
Expand All @@ -206,7 +206,7 @@

- type: entity
id: OrganPredatorEyes
parent: BasePredatorOrgan
parent: [BasePredatorOrgan, BaseOrganEyes]
name: eyes
description: I see YOU!
components:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
- torso
organs:
brain: OrganHumanoidXenoBrain
eyes: OrganHumanoidXenoEyes
torso:
part: TorsoHumanoidXeno
organs:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@
- type: CollectiveMind
minds:
- Xeno
- type: FootprintEmitter

- type: entity
parent: BaseSpeciesDummy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
color: "#008000"
- type: Body
prototype: Predator
- type: FootprintEmitter

- type: entity
parent: BaseSpeciesDummy
Expand Down
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
Expand Up @@ -16,6 +16,9 @@
{
"name": "brain"
},
{
"name": "eyes"
},
{
"name": "brain-inhand-left",
"directions": 4
Expand Down
Loading