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.

Sign up for GitHub

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

💅🏻 Lamia Markings + ♂️ Male Lamia #1440

Merged
merged 4 commits into from
Jan 5, 2025
Merged

💅🏻 Lamia Markings + ♂️ Male Lamia #1440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
468a5c3
Add male lamia
angelofallars Jan 5, 2025
75ed4ce
add locale strings for Lamia tail
angelofallars Jan 5, 2025
04b6377
Merge branch 'master' of https://github.com/Simple-Station/Einstein-E…
angelofallars Jan 5, 2025
d6ae22c
add Lamia markings
angelofallars Jan 5, 2025
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
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/markings/lamia.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
marking-LamiaBottom = Lamia Tail
marking-LamiaBottom-bottom3tone1 = Lamia Tail Bottom
marking-LamiaBottom-bottom3tone2 = Lamia Tail Middle
marking-LamiaBottom-bottom3tone3 = Lamia Tail Top
18 changes: 12 additions & 6 deletions Resources/Prototypes/DeltaV/Entities/Mobs/Species/lamia.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,19 @@
- map: [ "belt2" ]
- map: [ "neck" ]
- map: [ "back" ]
- map: [ "enum.HumanoidVisualLayers.Face" ]
- map: [ "enum.HumanoidVisualLayers.FacialHair" ]
- map: [ "enum.HumanoidVisualLayers.Hair" ]
state: bald
sprite: Mobs/Customization/human_hair.rsi
- map: [ "enum.HumanoidVisualLayers.HeadSide" ]
- map: [ "enum.HumanoidVisualLayers.HeadTop" ]
- map: [ "mask" ]
- map: [ "head" ]
- map: [ "pocket1" ]
- map: [ "pocket2" ]
- map: [ "enum.HumanoidVisualLayers.HeadTop" ]
- map: [ "clownedon" ] # Dynamically generated
sprite: "Effects/creampie.rsi"
state: "creampie_human"
visible: false
- type: Damageable
damageContainer: Biological
damageModifierSet: Scale #TODO: make a new damage modifier set
Expand Down Expand Up @@ -273,14 +278,15 @@
- map: [ "belt" ]
- map: [ "neck" ]
- map: [ "back" ]
- map: [ "enum.HumanoidVisualLayers.Face" ]
- map: [ "enum.HumanoidVisualLayers.FacialHair" ]
- map: [ "enum.HumanoidVisualLayers.Hair" ]
state: bald
sprite: Mobs/Customization/human_hair.rsi
- map: [ "enum.HumanoidVisualLayers.HeadSide" ]
- map: [ "enum.HumanoidVisualLayers.HeadTop" ]
- map: [ "mask" ]
- map: [ "head" ]
- map: [ "pocket1" ]
- map: [ "pocket2" ]
- map: [ "enum.HumanoidVisualLayers.HeadTop" ]
- map: [ "enum.HumanoidVisualLayers.Tail" ]
- type: Inventory
templateId: lamia
34 changes: 32 additions & 2 deletions Resources/Prototypes/DeltaV/Species/lamia.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,56 @@
maleFirstNames: names_cyno_male
femaleFirstNames: names_cyno_female
lastNames: names_cyno_last
sexes:
- Female

- type: markingPoints
id: MobLamiaMarkingLimits
points:
Hair:
points: 1
required: false
FacialHair:
points: 1
required: false
Snout:
points: 1
required: false
HeadTop:
points: 2
required: false
HeadSide:
points: 3
required: false
Tail:
points: 1
required: true
defaultMarkings: [ LamiaBottom ]
Chest:
points: 1
required: false
RightArm:
points: 2
required: false
RightHand:
points: 3
required: false
LeftArm:
points: 2
required: false
LeftHand:
points: 3
required: false


- type: speciesBaseSprites
id: MobLamiaSprites
sprites:
Head: MobHumanHead
Face: MobHumanoidAnyMarking
HeadTop: MobHumanoidAnyMarking
HeadSide: MobHumanoidAnyMarking
Hair: MobHumanoidAnyMarking
FacialHair: MobHumanoidAnyMarking
Snout: MobHumanoidAnyMarking
Chest: MobHumanTorso
Eyes: MobHumanoidEyes
LArm: MobHumanLArm
Expand Down
Loading
Loading