Skip to content

Commit 1e1e36c

Browse files
πŸ’…πŸ» Lamia Markings + ♂️ Male Lamia (#1440)
# Description Adds male Lamia with facial hair. Also makes dozens of markings available to Lamiae, including reptilian markings and pointy ears. Also adds locale strings for the Lamia tail marking. ## Media **Mermaid** ![image](https://github.com/user-attachments/assets/83c03899-dc64-45fa-a694-f0d88f2ec136) **Face:** Lips, Blush **Head:** Left Eye **Head (Top):** Lizard Horns (Ayrshire) **Head (Side):** Thin Ears, Drop Earrings (Left/Right) **Chest:** Lizard Chest (Tiger) **Right Arm:** Right Arm Bracelet **Right Hand:** Right Bracelet, Right Nail Polish **Left Hand:** Left Bracelet, Left Nail Polish **Male** ![image](https://github.com/user-attachments/assets/addb6a4d-30b6-49d6-9cb6-6b6979d8a6c0) ![image](https://github.com/user-attachments/assets/4f09943b-a025-4cfa-a87a-0dc885993e5c) **Face:** Eyelash (Left/Right), Eye Corner (Left/Right) **Head (Top):** Lizard Horns (Angler) **Head (Side):** Lizard Frills (Short) **Chest:** Lizard Chest (Tiger) **Right Arm:** Lizard Right Arm (Tiger) **Right Hand:** Right Watch (Colorable) **Left Arm:** Lizard Right Arm (Tiger) **Overlay:** Gauze Handwrap **Red** ![image](https://github.com/user-attachments/assets/c288799c-c136-4aaa-97a0-78452c5cbfaa) **Face:** Lips **Head (Top):** Lizard Horns **Head (Side):** Upward Ears **Right Hand:** Right Robotic Hand from Bishop Cybernetics **Left Hand:** Left Robotic Hand from Bishop Cybernetics, Left Gold Watch **Lamia locale** ![image](https://github.com/user-attachments/assets/122d223a-a5d3-4efe-baed-268115e5ecb2) ![image](https://github.com/user-attachments/assets/c8effc4b-499d-417e-bd91-54f4526fde57) ## Changelog :cl: Skubman - add: Lamiae can now be male, no longer being a female-only species. They can now wear facial hair as well. - add: The Lamia species can now select markings above the leg, including cybernetics, makeup, tattoos, noses, earrings, heterochromia, bracelets, reptilian horns and frills, pointy ears, and more! - fix: Added text for the Lamia tail marking.
1 parent d17fe1a commit 1e1e36c

File tree

15 files changed

+196
-156
lines changed

15 files changed

+196
-156
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
marking-LamiaBottom = Lamia Tail
2+
marking-LamiaBottom-bottom3tone1 = Lamia Tail Bottom
3+
marking-LamiaBottom-bottom3tone2 = Lamia Tail Middle
4+
marking-LamiaBottom-bottom3tone3 = Lamia Tail Top

β€ŽResources/Prototypes/DeltaV/Entities/Mobs/Species/lamia.yml

+12-6
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,19 @@
106106
- map: [ "belt2" ]
107107
- map: [ "neck" ]
108108
- map: [ "back" ]
109+
- map: [ "enum.HumanoidVisualLayers.Face" ]
110+
- map: [ "enum.HumanoidVisualLayers.FacialHair" ]
109111
- map: [ "enum.HumanoidVisualLayers.Hair" ]
110-
state: bald
111-
sprite: Mobs/Customization/human_hair.rsi
112+
- map: [ "enum.HumanoidVisualLayers.HeadSide" ]
113+
- map: [ "enum.HumanoidVisualLayers.HeadTop" ]
112114
- map: [ "mask" ]
113115
- map: [ "head" ]
114116
- map: [ "pocket1" ]
115117
- map: [ "pocket2" ]
116-
- map: [ "enum.HumanoidVisualLayers.HeadTop" ]
118+
- map: [ "clownedon" ] # Dynamically generated
119+
sprite: "Effects/creampie.rsi"
120+
state: "creampie_human"
121+
visible: false
117122
- type: Damageable
118123
damageContainer: Biological
119124
damageModifierSet: Scale #TODO: make a new damage modifier set
@@ -273,14 +278,15 @@
273278
- map: [ "belt" ]
274279
- map: [ "neck" ]
275280
- map: [ "back" ]
281+
- map: [ "enum.HumanoidVisualLayers.Face" ]
282+
- map: [ "enum.HumanoidVisualLayers.FacialHair" ]
276283
- map: [ "enum.HumanoidVisualLayers.Hair" ]
277-
state: bald
278-
sprite: Mobs/Customization/human_hair.rsi
284+
- map: [ "enum.HumanoidVisualLayers.HeadSide" ]
285+
- map: [ "enum.HumanoidVisualLayers.HeadTop" ]
279286
- map: [ "mask" ]
280287
- map: [ "head" ]
281288
- map: [ "pocket1" ]
282289
- map: [ "pocket2" ]
283-
- map: [ "enum.HumanoidVisualLayers.HeadTop" ]
284290
- map: [ "enum.HumanoidVisualLayers.Tail" ]
285291
- type: Inventory
286292
templateId: lamia

β€ŽResources/Prototypes/DeltaV/Species/lamia.yml

+32-2
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,56 @@
1010
maleFirstNames: names_cyno_male
1111
femaleFirstNames: names_cyno_female
1212
lastNames: names_cyno_last
13-
sexes:
14-
- Female
1513

1614
- type: markingPoints
1715
id: MobLamiaMarkingLimits
1816
points:
1917
Hair:
2018
points: 1
2119
required: false
20+
FacialHair:
21+
points: 1
22+
required: false
23+
Snout:
24+
points: 1
25+
required: false
26+
HeadTop:
27+
points: 2
28+
required: false
29+
HeadSide:
30+
points: 3
31+
required: false
2232
Tail:
2333
points: 1
2434
required: true
2535
defaultMarkings: [ LamiaBottom ]
36+
Chest:
37+
points: 1
38+
required: false
39+
RightArm:
40+
points: 2
41+
required: false
42+
RightHand:
43+
points: 3
44+
required: false
45+
LeftArm:
46+
points: 2
47+
required: false
48+
LeftHand:
49+
points: 3
50+
required: false
2651

2752

2853
- type: speciesBaseSprites
2954
id: MobLamiaSprites
3055
sprites:
3156
Head: MobHumanHead
57+
Face: MobHumanoidAnyMarking
58+
HeadTop: MobHumanoidAnyMarking
59+
HeadSide: MobHumanoidAnyMarking
3260
Hair: MobHumanoidAnyMarking
61+
FacialHair: MobHumanoidAnyMarking
62+
Snout: MobHumanoidAnyMarking
3363
Chest: MobHumanTorso
3464
Eyes: MobHumanoidEyes
3565
LArm: MobHumanLArm

0 commit comments

Comments
Β (0)