Skip to content

Commit

Permalink
Merge pull request #1253 from mqole/displacers
Browse files Browse the repository at this point in the history
displacement fixes 4 grays/goblins
  • Loading branch information
formlessnameless authored Jan 8, 2025
2 parents 9ec9645 + dd9c686 commit b23712b
Show file tree
Hide file tree
Showing 166 changed files with 202 additions and 144 deletions.
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Impstation/Body/Organs/spelf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
description: "An organic positronic brain. Quite remarkable, really."
components:
- type: Sprite
sprite: Mobs/Species/SpElf/organs.rsi
sprite: _Impstation/Mobs/Species/SpElf/organs.rsi
state: brain-spelf
20 changes: 10 additions & 10 deletions Resources/Prototypes/_Impstation/Body/Parts/gray.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
parent: [PartGray, BaseTorso]
components:
- type: Sprite
sprite: Mobs/Species/Gray/parts.rsi
sprite: _Impstation/Mobs/Species/Gray/parts.rsi
state: "torso_m"
- type: Extractable
juiceSolution:
Expand All @@ -36,7 +36,7 @@
parent: [PartGray, BaseHead]
components:
- type: Sprite
sprite: Mobs/Species/Gray/parts.rsi
sprite: _Impstation/Mobs/Species/Gray/parts.rsi
state: "head_m"
- type: Extractable
juiceSolution:
Expand All @@ -52,7 +52,7 @@
parent: [PartGray, BaseLeftArm]
components:
- type: Sprite
sprite: Mobs/Species/Gray/parts.rsi
sprite: _Impstation/Mobs/Species/Gray/parts.rsi
state: "l_arm"

- type: entity
Expand All @@ -61,7 +61,7 @@
parent: [PartGray, BaseRightArm]
components:
- type: Sprite
sprite: Mobs/Species/Gray/parts.rsi
sprite: _Impstation/Mobs/Species/Gray/parts.rsi
state: "r_arm"

- type: entity
Expand All @@ -70,7 +70,7 @@
parent: [PartGray, BaseLeftHand]
components:
- type: Sprite
sprite: Mobs/Species/Gray/parts.rsi
sprite: _Impstation/Mobs/Species/Gray/parts.rsi
state: "l_hand"

- type: entity
Expand All @@ -79,7 +79,7 @@
parent: [PartGray, BaseRightHand]
components:
- type: Sprite
sprite: Mobs/Species/Gray/parts.rsi
sprite: _Impstation/Mobs/Species/Gray/parts.rsi
state: "r_hand"

- type: entity
Expand All @@ -88,7 +88,7 @@
parent: [PartGray, BaseLeftLeg]
components:
- type: Sprite
sprite: Mobs/Species/Gray/parts.rsi
sprite: _Impstation/Mobs/Species/Gray/parts.rsi
state: "l_leg"

- type: entity
Expand All @@ -97,7 +97,7 @@
parent: [PartGray, BaseRightLeg]
components:
- type: Sprite
sprite: Mobs/Species/Gray/parts.rsi
sprite: _Impstation/Mobs/Species/Gray/parts.rsi
state: "r_leg"

- type: entity
Expand All @@ -106,7 +106,7 @@
parent: [PartGray, BaseLeftFoot]
components:
- type: Sprite
sprite: Mobs/Species/Gray/parts.rsi
sprite: _Impstation/Mobs/Species/Gray/parts.rsi
state: "l_foot"

- type: entity
Expand All @@ -115,5 +115,5 @@
parent: [PartGray, BaseRightFoot]
components:
- type: Sprite
sprite: Mobs/Species/Gray/parts.rsi
sprite: _Impstation/Mobs/Species/Gray/parts.rsi
state: "r_foot"
40 changes: 20 additions & 20 deletions Resources/Prototypes/_Impstation/Body/Parts/snail.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
parent: PartSnail
components:
- type: Sprite
sprite: Mobs/Species/Snail/parts.rsi
sprite: _Impstation/Mobs/Species/Snail/parts.rsi
state: "torso"
- type: Icon
sprite: Mobs/Species/Snail/parts.rsi
sprite: _Impstation/Mobs/Species/Snail/parts.rsi
state: "torso"
- type: BodyPart
partType: Torso
Expand All @@ -51,10 +51,10 @@
parent: PartSnail
components:
- type: Sprite
sprite: Mobs/Species/Snail/parts.rsi
sprite: _Impstation/Mobs/Species/Snail/parts.rsi
state: "head"
- type: Icon
sprite: Mobs/Species/Snail/parts.rsi
sprite: _Impstation/Mobs/Species/Snail/parts.rsi
state: "head"
- type: BodyPart
partType: Head
Expand All @@ -78,10 +78,10 @@
parent: PartSnail
components:
- type: Sprite
sprite: Mobs/Species/Snail/parts.rsi
sprite: _Impstation/Mobs/Species/Snail/parts.rsi
state: "l_arm"
- type: Icon
sprite: Mobs/Species/Snail/parts.rsi
sprite: _Impstation/Mobs/Species/Snail/parts.rsi
state: "l_arm"
- type: BodyPart
partType: Arm
Expand All @@ -93,10 +93,10 @@
parent: PartSnail
components:
- type: Sprite
sprite: Mobs/Species/Snail/parts.rsi
sprite: _Impstation/Mobs/Species/Snail/parts.rsi
state: "r_arm"
- type: Icon
sprite: Mobs/Species/Snail/parts.rsi
sprite: _Impstation/Mobs/Species/Snail/parts.rsi
state: "r_arm"
- type: BodyPart
partType: Arm
Expand All @@ -108,10 +108,10 @@
parent: PartSnail
components:
- type: Sprite
sprite: Mobs/Species/Snail/parts.rsi
sprite: _Impstation/Mobs/Species/Snail/parts.rsi
state: "l_hand"
- type: Icon
sprite: Mobs/Species/Snail/parts.rsi
sprite: _Impstation/Mobs/Species/Snail/parts.rsi
state: "l_hand"
- type: BodyPart
partType: Hand
Expand All @@ -123,10 +123,10 @@
parent: PartSnail
components:
- type: Sprite
sprite: Mobs/Species/Snail/parts.rsi
sprite: _Impstation/Mobs/Species/Snail/parts.rsi
state: "r_hand"
- type: Icon
sprite: Mobs/Species/Snail/parts.rsi
sprite: _Impstation/Mobs/Species/Snail/parts.rsi
state: "r_hand"
- type: BodyPart
partType: Hand
Expand All @@ -138,10 +138,10 @@
parent: PartSnail
components:
- type: Sprite
sprite: Mobs/Species/Snail/parts.rsi
sprite: _Impstation/Mobs/Species/Snail/parts.rsi
state: "l_leg"
- type: Icon
sprite: Mobs/Species/Snail/parts.rsi
sprite: _Impstation/Mobs/Species/Snail/parts.rsi
state: "l_leg"
- type: BodyPart
partType: Leg
Expand All @@ -154,10 +154,10 @@
parent: PartSnail
components:
- type: Sprite
sprite: Mobs/Species/Snail/parts.rsi
sprite: _Impstation/Mobs/Species/Snail/parts.rsi
state: "r_leg"
- type: Icon
sprite: Mobs/Species/Snail/parts.rsi
sprite: _Impstation/Mobs/Species/Snail/parts.rsi
state: "r_leg"
- type: BodyPart
partType: Leg
Expand All @@ -170,10 +170,10 @@
parent: PartSnail
components:
- type: Sprite
sprite: Mobs/Species/Snail/parts.rsi
sprite: _Impstation/Mobs/Species/Snail/parts.rsi
state: "l_foot"
- type: Icon
sprite: Mobs/Species/Snail/parts.rsi
sprite: _Impstation/Mobs/Species/Snail/parts.rsi
state: "l_foot"
- type: BodyPart
partType: Foot
Expand All @@ -185,10 +185,10 @@
parent: PartSnail
components:
- type: Sprite
sprite: Mobs/Species/Snail/parts.rsi
sprite: _Impstation/Mobs/Species/Snail/parts.rsi
state: "r_foot"
- type: Icon
sprite: Mobs/Species/Snail/parts.rsi
sprite: _Impstation/Mobs/Species/Snail/parts.rsi
state: "r_foot"
- type: BodyPart
partType: Foot
Expand Down
20 changes: 10 additions & 10 deletions Resources/Prototypes/_Impstation/Body/Parts/spelf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
parent: [PartSpElf, BaseTorso]
components:
- type: Sprite
sprite: Mobs/Species/SpElf/parts.rsi
sprite: _Impstation/Mobs/Species/SpElf/parts.rsi
state: "torso"
- type: Extractable
juiceSolution:
Expand All @@ -34,7 +34,7 @@
parent: [PartSpElf, BaseHead]
components:
- type: Sprite
sprite: Mobs/Species/SpElf/parts.rsi
sprite: _Impstation/Mobs/Species/SpElf/parts.rsi
state: "head"
- type: Extractable
juiceSolution:
Expand All @@ -50,7 +50,7 @@
parent: [PartSpElf, BaseLeftArm]
components:
- type: Sprite
sprite: Mobs/Species/SpElf/parts.rsi
sprite: _Impstation/Mobs/Species/SpElf/parts.rsi
state: "l_arm"

- type: entity
Expand All @@ -59,7 +59,7 @@
parent: [PartSpElf, BaseRightArm]
components:
- type: Sprite
sprite: Mobs/Species/SpElf/parts.rsi
sprite: _Impstation/Mobs/Species/SpElf/parts.rsi
state: "r_arm"

- type: entity
Expand All @@ -68,7 +68,7 @@
parent: [PartSpElf, BaseLeftHand]
components:
- type: Sprite
sprite: Mobs/Species/SpElf/parts.rsi
sprite: _Impstation/Mobs/Species/SpElf/parts.rsi
state: "l_hand"

- type: entity
Expand All @@ -77,7 +77,7 @@
parent: [PartSpElf, BaseRightHand]
components:
- type: Sprite
sprite: Mobs/Species/SpElf/parts.rsi
sprite: _Impstation/Mobs/Species/SpElf/parts.rsi
state: "r_hand"

- type: entity
Expand All @@ -86,7 +86,7 @@
parent: [PartSpElf, BaseLeftLeg]
components:
- type: Sprite
sprite: Mobs/Species/SpElf/parts.rsi
sprite: _Impstation/Mobs/Species/SpElf/parts.rsi
state: "l_leg"

- type: entity
Expand All @@ -95,7 +95,7 @@
parent: [PartSpElf, BaseRightLeg]
components:
- type: Sprite
sprite: Mobs/Species/SpElf/parts.rsi
sprite: _Impstation/Mobs/Species/SpElf/parts.rsi
state: "r_leg"

- type: entity
Expand All @@ -104,7 +104,7 @@
parent: [PartSpElf, BaseLeftFoot]
components:
- type: Sprite
sprite: Mobs/Species/SpElf/parts.rsi
sprite: _Impstation/Mobs/Species/SpElf/parts.rsi
state: "l_foot"

- type: entity
Expand All @@ -113,5 +113,5 @@
parent: [PartSpElf, BaseRightFoot]
components:
- type: Sprite
sprite: Mobs/Species/SpElf/parts.rsi
sprite: _Impstation/Mobs/Species/SpElf/parts.rsi
state: "r_foot"
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
!type:SimpleColoring
color: "#FFFFFF"
sprites:
- sprite: Mobs/Customization/Gray/eyes.rsi
- sprite: _Impstation/Mobs/Customization/Gray/eyes.rsi
state: eyes_cute

- type: marking
Expand All @@ -25,7 +25,7 @@
!type:SimpleColoring
color: "#000000"
sprites:
- sprite: Mobs/Customization/Gray/eyes.rsi
- sprite: _Impstation/Mobs/Customization/Gray/eyes.rsi
state: eyes_cool

- type: marking
Expand All @@ -40,7 +40,7 @@
!type:SimpleColoring
color: "#3D3D3D"
sprites:
- sprite: Mobs/Customization/Gray/eyes.rsi
- sprite: _Impstation/Mobs/Customization/Gray/eyes.rsi
state: eyes_wide

- type: marking
Expand All @@ -51,7 +51,7 @@
forcedColoring: true
followSkinColor: true
sprites:
- sprite: Mobs/Customization/Gray/ears.rsi
- sprite: _Impstation/Mobs/Customization/Gray/ears.rsi
state: ears_cute

- type: marking
Expand All @@ -62,5 +62,5 @@
forcedColoring: false
followSkinColor: true
sprites:
- sprite: Mobs/Customization/Gray/antenna.rsi
- sprite: _Impstation/Mobs/Customization/Gray/antenna.rsi
state: antenna_classic
Loading

0 comments on commit b23712b

Please sign in to comment.