From 272882fdfdc223c49a975b1f44eb2407c2e90841 Mon Sep 17 00:00:00 2001 From: Ed Date: Thu, 11 Apr 2024 10:45:59 +0300 Subject: [PATCH] move to _CP14 --- .../_CP14/Entities/Mobs/Player/human.yml | 1 + .../_CP14/Entities/Mobs/Player/tiefling.yml | 6 ++-- .../_CP14/Entities/Mobs/Species/human.yml | 10 ++++++- .../_CP14/Entities/Mobs/Species/tiefling.yml | 2 +- .../Prototypes/_CP14/Species/tiefling.yml | 28 +++++++++--------- .../Mobs/Species/Tiefling/parts.rsi/full.png | Bin .../Species/Tiefling/parts.rsi/head_f.png | Bin .../Species/Tiefling/parts.rsi/head_m.png | Bin .../Mobs/Species/Tiefling/parts.rsi/l_arm.png | Bin .../Species/Tiefling/parts.rsi/l_foot.png | Bin .../Species/Tiefling/parts.rsi/l_hand.png | Bin .../Mobs/Species/Tiefling/parts.rsi/l_leg.png | Bin .../Mobs/Species/Tiefling/parts.rsi/meta.json | 0 .../Mobs/Species/Tiefling/parts.rsi/r_arm.png | Bin .../Species/Tiefling/parts.rsi/r_foot.png | Bin .../Species/Tiefling/parts.rsi/r_hand.png | Bin .../Mobs/Species/Tiefling/parts.rsi/r_leg.png | Bin .../Species/Tiefling/parts.rsi/torso_f.png | Bin .../Species/Tiefling/parts.rsi/torso_m.png | Bin 19 files changed, 28 insertions(+), 19 deletions(-) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/full.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/head_f.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/head_m.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/l_arm.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/l_foot.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/l_hand.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/l_leg.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/meta.json (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/r_arm.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/r_foot.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/r_hand.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/r_leg.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/torso_f.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/torso_m.png (100%) diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/human.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/human.yml index 1479464295..0674b5477e 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/human.yml @@ -1,4 +1,5 @@ - type: entity save: false parent: CPBaseMobHuman + name: Mr. Human id: CPMobHuman diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml index 5b36f836a1..a4d1f0883b 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml @@ -1,5 +1,5 @@ - type: entity - parent: CPBaseMobTiefling - id: CPMobTiefling - name: Mr. Tiefling save: false + parent: CPBaseMobTiefling + name: Mr. Tiefling + id: CPMobTiefling diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml index 5d7e68e217..dfcfc1026c 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml @@ -8,7 +8,7 @@ - type: HumanoidAppearance species: CPHuman - type: Hunger - - type: Icon # It will not have an icon in the adminspawn menu without this. Body parts seem fine for whatever reason. + - type: Icon sprite: _CP14/Mobs/Species/Human/parts.rsi state: full - type: Thirst @@ -22,3 +22,11 @@ requiredLegs: 2 - type: Inventory templateId: CPHuman + +- type: entity + parent: BaseSpeciesDummy + id: CPMobHumanDummy + noSpawn: true + components: + - type: HumanoidAppearance + species: CPHuman \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml index d0515d0aaa..215a92907a 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml @@ -11,7 +11,7 @@ requiredLegs: 2 - type: Hunger - type: Icon - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: full - type: Thirst - type: Wagging diff --git a/Resources/Prototypes/_CP14/Species/tiefling.yml b/Resources/Prototypes/_CP14/Species/tiefling.yml index 0bc4b13e38..eb6f47d473 100644 --- a/Resources/Prototypes/_CP14/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Species/tiefling.yml @@ -80,83 +80,83 @@ - type: humanoidBaseSprite id: CPMobTieflingHead baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: head_m - type: humanoidBaseSprite id: CPMobTieflingHeadMale baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: head_m - type: humanoidBaseSprite id: CPMobTieflingHeadFemale baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: head_f - type: humanoidBaseSprite id: CPMobTieflingTorso baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: torso_m - type: humanoidBaseSprite id: CPMobTieflingTorsoMale baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: torso_m - type: humanoidBaseSprite id: CPMobTieflingTorsoFemale baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: torso_f - type: humanoidBaseSprite id: CPMobTieflingLLeg baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: l_leg - type: humanoidBaseSprite id: CPMobTieflingLArm baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: l_arm - type: humanoidBaseSprite id: CPMobTieflingLHand baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: l_hand - type: humanoidBaseSprite id: CPMobTieflingLFoot baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: l_foot - type: humanoidBaseSprite id: CPMobTieflingRLeg baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: r_leg - type: humanoidBaseSprite id: CPMobTieflingRArm baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: r_arm - type: humanoidBaseSprite id: CPMobTieflingRHand baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: r_hand - type: humanoidBaseSprite id: CPMobTieflingRFoot baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: r_foot diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/full.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/full.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/full.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/full.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/head_f.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/head_f.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/head_f.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/head_f.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/head_m.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/head_m.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/head_m.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/head_m.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_arm.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_arm.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_arm.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_arm.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_foot.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_foot.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_foot.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_foot.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_hand.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_hand.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_hand.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_hand.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_leg.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_leg.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_leg.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_leg.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/meta.json similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/meta.json rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/meta.json diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_arm.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_arm.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_arm.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_arm.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_foot.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_foot.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_foot.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_foot.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_hand.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_hand.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_hand.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_hand.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_leg.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_leg.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_leg.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_leg.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/torso_f.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/torso_f.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/torso_f.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/torso_f.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/torso_m.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/torso_m.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/torso_m.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/torso_m.png