* [add] Мокрые скреллочки

* - add: Skrell slim body type.

* Skrell movement fix, add weight (#72)

* - fix: Fix species.

---------

Co-authored-by: rhailrake <49613070+rhailrake@users.noreply.github.com>
Co-authored-by: TestUnit <UndefinedSignal@users.noreply.github.com>
This commit is contained in:
Aviu00
2024-02-28 23:43:54 +09:00
committed by GitHub
parent b5a56e0eca
commit f2b5517b3d
53 changed files with 720 additions and 2 deletions

View File

@@ -0,0 +1,182 @@
- type: entity
id: PartSkrell
parent: BaseItem
name: "skrell body part"
abstract: true
components:
- type: Damageable
damageContainer: Biological
- type: BodyPart
- type: ContainerContainer
containers:
bodypart: !type:Container
ents: []
- type: Tag
tags:
- Trash
- type: entity
id: TorsoSkrell
name: "skrell torso"
parent: PartSkrell
components:
- type: Sprite
netsync: false
sprite: Mobs/Species/Skrell/parts.rsi
state: "torso_m"
- type: Icon
sprite: Mobs/Species/Skrell/parts.rsi
state: "torso_m"
- type: BodyPart
partType: Torso
- type: entity
id: HeadSkrell
name: "skrell head"
parent: PartSkrell
components:
- type: Sprite
netsync: false
sprite: Mobs/Species/Skrell/parts.rsi
state: "head_m"
- type: Icon
sprite: Mobs/Species/Skrell/parts.rsi
state: "head_m"
- type: BodyPart
partType: Head
vital: true
- type: Input
context: "ghost"
- type: Tag
tags:
- Head
- type: entity
id: LeftArmSkrell
name: "left skrell arm"
parent: PartSkrell
components:
- type: Sprite
netsync: false
sprite: Mobs/Species/Skrell/parts.rsi
state: "l_arm"
- type: Icon
sprite: Mobs/Species/Skrell/parts.rsi
state: "l_arm"
- type: BodyPart
partType: Arm
symmetry: Left
- type: entity
id: RightArmSkrell
name: "right skrell arm"
parent: PartSkrell
components:
- type: Sprite
netsync: false
sprite: Mobs/Species/Skrell/parts.rsi
state: "r_arm"
- type: Icon
sprite: Mobs/Species/Skrell/parts.rsi
state: "r_arm"
- type: BodyPart
partType: Arm
symmetry: Right
- type: entity
id: LeftHandSkrell
name: "left skrell hand"
parent: PartSkrell
components:
- type: Sprite
netsync: false
sprite: Mobs/Species/Skrell/parts.rsi
state: "l_hand"
- type: Icon
sprite: Mobs/Species/Skrell/parts.rsi
state: "l_hand"
- type: BodyPart
partType: Hand
symmetry: Left
- type: entity
id: RightHandSkrell
name: "right skrell hand"
parent: PartSkrell
components:
- type: Sprite
netsync: false
sprite: Mobs/Species/Skrell/parts.rsi
state: "r_hand"
- type: Icon
sprite: Mobs/Species/Skrell/parts.rsi
state: "r_hand"
- type: BodyPart
partType: Hand
symmetry: Right
- type: entity
id: LeftLegSkrell
name: "left skrell leg"
parent: PartSkrell
components:
- type: Sprite
netsync: false
sprite: Mobs/Species/Skrell/parts.rsi
state: "l_leg"
- type: Icon
sprite: Mobs/Species/Skrell/parts.rsi
state: "l_leg"
- type: BodyPart
partType: Leg
symmetry: Left
- type: MovementBodyPart
- type: entity
id: RightLegSkrell
name: "right skrell leg"
parent: PartSkrell
components:
- type: Sprite
netsync: false
sprite: Mobs/Species/Skrell/parts.rsi
state: "r_leg"
- type: Icon
sprite: Mobs/Species/Skrell/parts.rsi
state: "r_leg"
- type: BodyPart
partType: Leg
symmetry: Right
- type: MovementBodyPart
- type: entity
id: LeftFootSkrell
name: "left skrell foot"
parent: PartSkrell
components:
- type: Sprite
netsync: false
sprite: Mobs/Species/Skrell/parts.rsi
state: "l_foot"
- type: Icon
sprite: Mobs/Species/Skrell/parts.rsi
state: "l_foot"
- type: BodyPart
partType: Foot
symmetry: Left
- type: entity
id: RightFootSkrell
name: "right skrell foot"
parent: PartSkrell
components:
- type: Sprite
netsync: false
sprite: Mobs/Species/Skrell/parts.rsi
state: "r_foot"
- type: Icon
sprite: Mobs/Species/Skrell/parts.rsi
state: "r_foot"
- type: BodyPart
partType: Foot
symmetry: Right

View File

@@ -0,0 +1,49 @@
- type: body
id: Skrell
name: "skrell"
root: torso
slots:
head:
part: HeadSkrell
connections:
- torso
organs:
brain: OrganHumanBrain
eyes: OrganHumanEyes
torso:
part: TorsoSkrell
connections:
- left arm
- right arm
- left leg
- right leg
organs:
heart: OrganHumanHeart
lungs: OrganHumanLungs
stomach: OrganHumanStomach
liver: OrganHumanLiver
kidneys: OrganHumanKidneys
right arm:
part: RightArmSkrell
connections:
- right hand
left arm:
part: LeftArmSkrell
connections:
- left hand
right hand:
part: RightHandSkrell
left hand:
part: LeftHandSkrell
right leg:
part: RightLegSkrell
connections:
- right foot
left leg:
part: LeftLegSkrell
connections:
- left foot
right foot:
part: RightFootSkrell
left foot:
part: LeftFootSkrell

View File

@@ -0,0 +1,48 @@
- type: marking
id: SkrellHairMale
bodyPart: Hair
markingCategory: Hair
speciesRestriction: [Skrell]
sprites:
- sprite: Mobs/Customization/skrell_hair.rsi
state: Male
- type: marking
id: SkrellHairFemale
bodyPart: Hair
markingCategory: Hair
speciesRestriction: [Skrell]
sprites:
- sprite: Mobs/Customization/skrell_hair.rsi
state: Female
- type: marking
id: SkrellHairLong
bodyPart: Hair
markingCategory: Hair
speciesRestriction: [Skrell]
sprites:
- sprite: Mobs/Customization/skrell_hair.rsi
state: Long
- type: marking
id: SkrellHairShort
bodyPart: Hair
markingCategory: Hair
speciesRestriction: [Skrell]
sprites:
- sprite: Mobs/Customization/skrell_hair.rsi
state: Short
- type: marking
id: SkrellHairVeryLong
bodyPart: Hair
markingCategory: Hair
speciesRestriction: [Skrell]
sprites:
- sprite: Mobs/Customization/skrell_hair.rsi
state: Verylong
- type: marking
id: SkrellHairVeryShort
bodyPart: Hair
markingCategory: Hair
speciesRestriction: [Skrell]
sprites:
- sprite: Mobs/Customization/skrell_hair.rsi
state: Veryshort

View File

@@ -0,0 +1,5 @@
- type: entity
save: false
name: Urist McSkrell
parent: BaseMobSkrell
id: MobSkrell

View File

@@ -129,5 +129,6 @@
components: components:
- type: HumanoidAppearance - type: HumanoidAppearance
species: Arachnid species: Arachnid
bodyType: ArachnidNormal
#88w88 #88w88

View File

@@ -112,3 +112,4 @@
templateId: diona templateId: diona
- type: HumanoidAppearance - type: HumanoidAppearance
species: Diona species: Diona
bodyType: DionaNormal

View File

@@ -49,3 +49,4 @@
components: components:
- type: HumanoidAppearance - type: HumanoidAppearance
species: Gingerbread species: Gingerbread
bodyType: GingerbreadNormal

View File

@@ -127,3 +127,4 @@
components: components:
- type: HumanoidAppearance - type: HumanoidAppearance
species: Moth species: Moth
bodyType: MothNormal

View File

@@ -68,5 +68,6 @@
components: components:
- type: HumanoidAppearance - type: HumanoidAppearance
species: Reptilian species: Reptilian
bodyType: ReptilianNormal
#Weh #Weh

View File

@@ -110,3 +110,4 @@
components: components:
- type: HumanoidAppearance - type: HumanoidAppearance
species: Skeleton species: Skeleton
bodyType: SkeletonNormal

View File

@@ -0,0 +1,41 @@
- type: entity
save: false
name: Urist McSkrell
parent: BaseMobSpeciesOrganic
id: BaseMobSkrell
abstract: true
components:
- type: HumanoidAppearance
species: Skrell
bodyType: SkrellNormal
- type: Hunger
- type: Thirst
- type: Icon
sprite: Mobs/Species/Skrell/parts.rsi
state: full
- type: Body
prototype: Skrell
requiredLegs: 2
- type: Temperature
heatDamageThreshold: 400
coldDamageThreshold: 285
currentTemperature: 310.15
specificHeat: 46
coldDamage:
types:
Cold : 0.2 #per second, scales with temperature & other constants
heatDamage:
types:
Heat : 1.5 #per second, scales with temperature & other constants
- type: entity
save: false
name: Urist McHands
id: MobSkrellDummy
parent: BaseSpeciesDummy
description: A dummy skrell meant to be used in character setup.
noSpawn: true
components:
- type: HumanoidAppearance
species: Skrell
bodyType: SkrellNormal

View File

@@ -77,3 +77,4 @@
components: components:
- type: HumanoidAppearance - type: HumanoidAppearance
species: SlimePerson species: SlimePerson
bodyType: SlimeNormal

View File

@@ -56,6 +56,7 @@
components: components:
- type: HumanoidAppearance - type: HumanoidAppearance
species: Vox species: Vox
bodyType: VoxNormal
- type: Body - type: Body
prototype: Vox prototype: Vox

View File

@@ -0,0 +1,221 @@
- type: species
id: Skrell
name: species-name-skrell
roundStart: true
prototype: MobSkrell
bodyTypes:
- SkrellNormal
- SkrellSlim
sprites: MobSkrellSprites
defaultSkinTone: "#50ff6d"
markingLimits: MobSkrellMarkingLimits
dollPrototype: MobSkrellDummy
skinColoration: Hues
maleFirstNames: SkrellFirst
femaleFirstNames: SkrellFirst
maleLastNames: SkrellLast
femaleLastNames: SkrellLast
naming: TheFirstofLast
#- type: speciesBaseSprites
# id: MobSkrellSprites
# sprites:
# Head: MobSkrellHead
# Hair: MobHumanoidAnyMarking
# Chest: MobSkrellTorso
# Eyes: MobSkrellEyes
# LArm: MobSkrellLArm
# RArm: MobSkrellRArm
# LHand: MobSkrellLHand
# RHand: MobSkrellRHand
# LLeg: MobSkrellLLeg
# RLeg: MobSkrellRLeg
# LFoot: MobSkrellLFoot
# RFoot: MobSkrellRFoot
- type: markingPoints
id: MobSkrellMarkingLimits
onlyWhitelisted: true
points:
Hair:
points: 1
required: true
FacialHair:
points: 0
required: false
HeadTop: # the cat ear joke
points: 0
required: false
Chest:
points: 1
required: false
Legs:
points: 2
required: false
Arms:
points: 2
required: false
- type: humanoidBaseSprite
id: MobSkrellEyes
baseSprite:
sprite: Mobs/Customization/eyes.rsi
state: skrell_eyes_s
- type: humanoidBaseSprite
id: MobSkrellHead
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: head_m
- type: humanoidBaseSprite
id: MobSkrellHeadMale
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: head_m
- type: humanoidBaseSprite
id: MobSkrellHeadFemale
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: head_f
- type: humanoidBaseSprite
id: MobSkrellTorso
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: torso_m
- type: humanoidBaseSprite
id: MobSkrellTorsoMale
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: torso_m
- type: humanoidBaseSprite
id: MobSkrellTorsoFemale
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: torso_f
- type: humanoidBaseSprite
id: MobSkrellLLeg
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: l_leg
- type: humanoidBaseSprite
id: MobSkrellLArm
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: l_arm
- type: humanoidBaseSprite
id: MobSkrellLHand
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: l_hand
- type: humanoidBaseSprite
id: MobSkrellLFoot
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: l_foot
- type: humanoidBaseSprite
id: MobSkrellRLeg
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: r_leg
- type: humanoidBaseSprite
id: MobSkrellRArm
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: r_arm
- type: humanoidBaseSprite
id: MobSkrellRHand
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: r_hand
- type: humanoidBaseSprite
id: MobSkrellRFoot
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: r_foot
# Slim types
- type: humanoidBaseSprite
id: MobSkrellSlimHead
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: head_slim
- type: humanoidBaseSprite
id: MobSkrellSlimHeadFemale
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: head_slim_f
- type: humanoidBaseSprite
id: MobSkrellSlimTorso
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: torso_slim
- type: humanoidBaseSprite
id: MobSkrellSlimTorsoFemale
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: torso_slim_f
- type: humanoidBaseSprite
id: MobSkrellSlimLLeg
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: l_leg_slim
- type: humanoidBaseSprite
id: MobSkrellSlimLArm
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: l_arm_slim
- type: humanoidBaseSprite
id: MobSkrellSlimLHand
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: l_hand_slim
- type: humanoidBaseSprite
id: MobSkrellSlimLFoot
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: l_foot_slim
- type: humanoidBaseSprite
id: MobSkrellSlimRLeg
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: r_leg_slim
- type: humanoidBaseSprite
id: MobSkrellSlimRArm
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: r_arm_slim
- type: humanoidBaseSprite
id: MobSkrellSlimRHand
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: r_hand_slim
- type: humanoidBaseSprite
id: MobSkrellSlimRFoot
baseSprite:
sprite: Mobs/Species/Skrell/parts.rsi
state: r_foot_slim

View File

@@ -4,5 +4,6 @@
weights: weights:
Human: 5 Human: 5
Reptilian: 4 Reptilian: 4
Skrell: 4
SlimePerson: 4 SlimePerson: 4
Diona: 2 Diona: 2

View File

@@ -89,6 +89,23 @@
LFoot: MobVoxLFoot LFoot: MobVoxLFoot
RFoot: MobVoxRFoot RFoot: MobVoxRFoot
- type: bodyType
id: SkrellNormal
name: body-normal
sprites:
Head: MobSkrellHead
Hair: MobHumanoidAnyMarking
Chest: MobSkrellTorso
Eyes: MobSkrellEyes
LArm: MobSkrellLArm
RArm: MobSkrellRArm
LHand: MobSkrellLHand
RHand: MobSkrellRHand
LLeg: MobSkrellLLeg
RLeg: MobSkrellRLeg
LFoot: MobSkrellLFoot
RFoot: MobSkrellRFoot
- type: bodyType - type: bodyType
id: DionaNormal id: DionaNormal
name: body-normal name: body-normal

View File

@@ -1,4 +1,4 @@
- type: bodyType - type: bodyType
id: HumanSlim id: HumanSlim
name: body-slim name: body-slim
sexRestrictions: sexRestrictions:
@@ -20,6 +20,25 @@
LFoot: MobHumanSlimLFoot LFoot: MobHumanSlimLFoot
RFoot: MobHumanSlimRFoot RFoot: MobHumanSlimRFoot
- type: bodyType
id: SkrellSlim
name: body-slim
sexRestrictions:
- Male
sprites:
Head: MobSkrellSlimHead
Hair: MobHumanoidAnyMarking
Chest: MobSkrellSlimTorso
Eyes: MobSkrellEyes
LArm: MobSkrellSlimLArm
RArm: MobSkrellSlimRArm
LHand: MobSkrellSlimLHand
RHand: MobSkrellSlimRHand
LLeg: MobSkrellSlimLLeg
RLeg: MobSkrellSlimRLeg
LFoot: MobSkrellSlimLFoot
RFoot: MobSkrellSlimRFoot
# - type: bodyType # - type: bodyType
# id: ReptilianSlim # id: ReptilianSlim
# name: body-slim # name: body-slim

View File

@@ -1 +1 @@
{"version": 1, "license": "CC-BY-SA-3.0","copyright": "Vox_eyes Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb and human_eyes taken from https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf", "size": {"x": 32, "y": 32}, "states": [{"name": "diona", "directions": 4}, {"name": "eyes", "directions": 4}, {"name":"no_eyes"},{"name": "vox_eyes_s", "directions": 4}]} {"version": 1, "license": "CC-BY-SA-3.0","copyright": "Vox_eyes Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb and human_eyes taken from https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf", "size": {"x": 32, "y": 32}, "states": [{"name": "diona", "directions": 4}, {"name": "eyes", "directions": 4}, {"name":"no_eyes"},{"name": "vox_eyes_s", "directions": 4}, {"name": "skrell_eyes_s", "directions": 4}]}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -0,0 +1,13 @@
{
"version":1,
"size":{"x":32,"y":32},
"copyright":"https://github.com/Baystation12/Baystation12/commits/dev/icons/mob/species/skrell","license":"CC-BY-3.0",
"states":[
{"name":"Male","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},
{"name":"Female","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},
{"name":"Long","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},
{"name":"Short","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},
{"name":"Verylong","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},
{"name":"Veryshort","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]}
]}

Binary file not shown.

After

Width:  |  Height:  |  Size: 271 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -0,0 +1,114 @@
{
"version": 1,
"license": "CC-BY-3.0",
"copyright": "https://github.com/Baystation12/Baystation12/commits/dev/icons/mob/species/skrell",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "full"
},
{
"name": "full_slim"
},
{
"name": "head_f",
"directions": 4
},
{
"name": "head_m",
"directions": 4
},
{
"name": "l_arm",
"directions": 4
},
{
"name": "l_foot",
"directions": 4
},
{
"name": "l_hand",
"directions": 4
},
{
"name": "l_leg",
"directions": 4
},
{
"name": "r_arm",
"directions": 4
},
{
"name": "r_foot",
"directions": 4
},
{
"name": "r_hand",
"directions": 4
},
{
"name": "r_leg",
"directions": 4
},
{
"name": "torso_f",
"directions": 4
},
{
"name": "torso_m",
"directions": 4
},
{
"name": "head_slim_f",
"directions": 4
},
{
"name": "head_slim",
"directions": 4
},
{
"name": "l_arm_slim",
"directions": 4
},
{
"name": "l_foot_slim",
"directions": 4
},
{
"name": "l_hand_slim",
"directions": 4
},
{
"name": "l_leg_slim",
"directions": 4
},
{
"name": "r_arm_slim",
"directions": 4
},
{
"name": "r_foot_slim",
"directions": 4
},
{
"name": "r_hand_slim",
"directions": 4
},
{
"name": "r_leg_slim",
"directions": 4
},
{
"name": "torso_slim",
"directions": 4
},
{
"name": "torso_slim_f",
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB