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

spider cosmetic update #1847

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
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
43 changes: 43 additions & 0 deletions Resources/Locale/en-US/_Impstation/markings/arachnid.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
marking-ArachnidEyesDefault = Eyes
marking-ArachnidEyesDefault-eyes = Eyes

marking-ArachnidEyesRound = Round Eyes
marking-ArachnidEyesRound-eyes_round1 = Inner
marking-ArachnidEyesRound-eyes_round2 = Upper
marking-ArachnidEyesRound-eyes_round3 = Outer
marking-ArachnidEyesRound-eyes_round4 = Sides

marking-ArachnidEyesRoundGlowing = Round Glowing Eyes
marking-ArachnidEyesRoundGlowing-eyes_round1 = Inner
marking-ArachnidEyesRoundGlowing-eyes_round2 = Upper
marking-ArachnidEyesRoundGlowing-eyes_round3 = Outer
marking-ArachnidEyesRoundGlowing-eyes_round4 = Sides

marking-ArachnidHeadSegments = Segmented Head
marking-ArachnidHeadSegments-head_segments1 = Head
marking-ArachnidHeadSegments-head_segments2 = Stripe

marking-ArachnidCheliceraeSmall = Chelicerae (Small)
marking-ArachnidCheliceraeSmall-small = Chelicerae

marking-ArachnidTorsoSegments = Segmented Chest
marking-ArachnidTorsoSegments-chest_segments1 = Chest
marking-ArachnidTorsoSegments-chest_segments2 = Stomach

marking-ArachnidLArmSegments = Segmented Arm (Left)
marking-ArachnidLArmSegments-arm_l_segments1 = Upper Arm
marking-ArachnidLArmSegments-arm_l_segments2 = Forearm

marking-ArachnidRArmSegments = Segmented Arm (Right)
marking-ArachnidRArmSegments-arm_r_segments1 = Upper Arm
marking-ArachnidRArmSegments-arm_r_segments2 = Forearm

marking-ArachnidLLegSegments = Segmented Leg (Left)
marking-ArachnidLLegSegments-leg_l_segments1 = Thigh
marking-ArachnidLLegSegments-leg_l_segments2 = Shin

marking-ArachnidRLegSegments = Segmented Leg (Right)
marking-ArachnidRLegSegments-leg_r_segments1 = Thigh
marking-ArachnidRLegSegments-leg_r_segments2 = Shin

marking-ArachnidOverlayFluffy = Fluffy
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
markingCategory: Tail
speciesRestriction: [Arachnid]
sprites:
- sprite: Mobs/Customization/Arachnid/appendages.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/appendages.rsi #imp, redirects to our lighter version
state: long_primary
- sprite: Mobs/Customization/Arachnid/appendages.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/appendages.rsi #imp, redirects to our lighter version
state: long_secondary

- type: marking
Expand All @@ -35,9 +35,9 @@
markingCategory: Tail
speciesRestriction: [Arachnid]
sprites:
- sprite: Mobs/Customization/Arachnid/appendages.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/appendages.rsi #imp, redirects to our lighter version
state: sharp_primary
- sprite: Mobs/Customization/Arachnid/appendages.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/appendages.rsi #imp, redirects to our lighter version
state: sharp_secondary

- type: marking
Expand All @@ -46,9 +46,9 @@
markingCategory: Tail
speciesRestriction: [Arachnid]
sprites:
- sprite: Mobs/Customization/Arachnid/appendages.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/appendages.rsi #imp, redirects to our lighter version
state: stingers_primary
- sprite: Mobs/Customization/Arachnid/appendages.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/appendages.rsi #imp, redirects to our lighter version
state: stingers_secondary

- type: marking
Expand All @@ -57,9 +57,9 @@
markingCategory: Tail
speciesRestriction: [Arachnid]
sprites:
- sprite: Mobs/Customization/Arachnid/appendages.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/appendages.rsi #imp, redirects to our lighter version
state: zigzag_primary
- sprite: Mobs/Customization/Arachnid/appendages.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/appendages.rsi #imp, redirects to our lighter version
state: zigzag_secondary

- type: marking
Expand All @@ -68,9 +68,9 @@
markingCategory: Tail
speciesRestriction: [Arachnid]
sprites:
- sprite: Mobs/Customization/Arachnid/appendages.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/appendages.rsi #imp, redirects to our lighter version
state: curled_primary
- sprite: Mobs/Customization/Arachnid/appendages.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/appendages.rsi #imp, redirects to our lighter version
state: curled_secondary

- type: marking
Expand All @@ -79,9 +79,9 @@
markingCategory: Tail
speciesRestriction: [Arachnid]
sprites:
- sprite: Mobs/Customization/Arachnid/appendages.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/appendages.rsi #imp, redirects to our lighter version
state: chipped_primary
- sprite: Mobs/Customization/Arachnid/appendages.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/appendages.rsi #imp, redirects to our lighter version
state: chipped_secondary

- type: marking
Expand All @@ -90,9 +90,9 @@
markingCategory: Tail
speciesRestriction: [Arachnid]
sprites:
- sprite: Mobs/Customization/Arachnid/appendages.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/appendages.rsi #imp, redirects to our lighter version
state: harvest_primary
- sprite: Mobs/Customization/Arachnid/appendages.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/appendages.rsi #imp, redirects to our lighter version
state: harvest_secondary

- type: marking
Expand All @@ -101,9 +101,9 @@
markingCategory: Tail
speciesRestriction: [Arachnid]
sprites:
- sprite: Mobs/Customization/Arachnid/appendages.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/appendages.rsi #imp, redirects to our lighter version
state: short_primary
- sprite: Mobs/Customization/Arachnid/appendages.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/appendages.rsi #imp, redirects to our lighter version
state: short_secondary

- type: marking
Expand All @@ -112,9 +112,9 @@
markingCategory: Tail
speciesRestriction: [Arachnid]
sprites:
- sprite: Mobs/Customization/Arachnid/appendages.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/appendages.rsi #imp, redirects to our lighter version
state: freaky_primary
- sprite: Mobs/Customization/Arachnid/appendages.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/appendages.rsi #imp, redirects to our lighter version
state: freaky_secondary

# Chest
Expand All @@ -124,7 +124,7 @@
markingCategory: Chest
speciesRestriction: [Arachnid]
sprites:
- sprite: Mobs/Customization/Arachnid/chest.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/chest.rsi #imp, redirects to our version with east/west sprites
state: stripes
coloring:
default:
Expand All @@ -137,7 +137,7 @@
markingCategory: Chest
speciesRestriction: [Arachnid]
sprites:
- sprite: Mobs/Customization/Arachnid/chest.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/chest.rsi #imp, redirects to our version with east/west sprites
state: slashes
coloring:
default:
Expand All @@ -150,7 +150,7 @@
markingCategory: Chest
speciesRestriction: [Arachnid]
sprites:
- sprite: Mobs/Customization/Arachnid/chest.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/chest.rsi #imp, redirects to our version with east/west sprites
state: x
coloring:
default:
Expand All @@ -163,7 +163,7 @@
markingCategory: Chest
speciesRestriction: [Arachnid]
sprites:
- sprite: Mobs/Customization/Arachnid/chest.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/chest.rsi #imp, redirects to our version with east/west sprites
state: cross
coloring:
default:
Expand All @@ -176,7 +176,7 @@
markingCategory: Chest
speciesRestriction: [Arachnid]
sprites:
- sprite: Mobs/Customization/Arachnid/chest.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/chest.rsi #imp, redirects to our version with east/west sprites
state: heart
coloring:
default:
Expand All @@ -189,7 +189,7 @@
markingCategory: Chest
speciesRestriction: [Arachnid]
sprites:
- sprite: Mobs/Customization/Arachnid/chest.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/chest.rsi #imp, redirects to our version with east/west sprites
state: hourglass
coloring:
default:
Expand All @@ -202,7 +202,7 @@
markingCategory: Chest
speciesRestriction: [Arachnid]
sprites:
- sprite: Mobs/Customization/Arachnid/chest.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/chest.rsi #imp, redirects to our version with east/west sprites
state: nail-and-hammer
coloring:
default:
Expand All @@ -215,7 +215,7 @@
markingCategory: Chest
speciesRestriction: [Arachnid]
sprites:
- sprite: Mobs/Customization/Arachnid/chest.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/chest.rsi #imp, redirects to our version with east/west sprites
state: star
coloring:
default:
Expand All @@ -241,7 +241,7 @@
markingCategory: Chest
speciesRestriction: [Arachnid]
sprites:
- sprite: Mobs/Customization/Arachnid/chest.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/chest.rsi #imp, redirects to our version with east/west sprites
state: core
coloring:
default:
Expand All @@ -267,7 +267,7 @@
markingCategory: Chest
speciesRestriction: [Arachnid]
sprites:
- sprite: Mobs/Customization/Arachnid/chest.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/chest.rsi #imp, redirects to our version with east/west sprites
state: skull
coloring:
default:
Expand All @@ -280,7 +280,7 @@
markingCategory: Chest
speciesRestriction: [Arachnid]
sprites:
- sprite: Mobs/Customization/Arachnid/chest.rsi
- sprite: _Impstation/Mobs/Customization/Arachnid/chest.rsi #imp, redirects to our version with east/west sprites
state: target
coloring:
default:
Expand Down
6 changes: 5 additions & 1 deletion Resources/Prototypes/Species/arachnid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
HeadTop: MobHumanoidAnyMarking
HeadSide: MobHumanoidAnyMarking
Tail: MobHumanoidAnyMarking
Eyes: MobArachnidEyes
Eyes: MobHumanoidAnyMarking #imp, so they can pick their eyes
LArm: MobArachnidLArm
RArm: MobArachnidRArm
LHand: MobArachnidLHand
Expand All @@ -47,6 +47,10 @@
id: MobArachnidMarkingLimits
onlyWhitelisted: true
points:
Eyes: #imp, so they can pick their eyes
points: 1
required: true
defaultMarkings: [ ArachnidEyesDefault ]
Hair:
points: 0
required: false
Expand Down
Loading
Loading