From ef8ecf8ba30e5099b3a698c5bc396879f909eda6 Mon Sep 17 00:00:00 2001 From: DrSmugleaf Date: Sun, 5 Nov 2023 01:10:30 -0800 Subject: [PATCH] Move "id" clothing layer above gloves, shoes, ears, outerclothing, eyes and belt (#21456) --- Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 4 ++-- Resources/Prototypes/Entities/Mobs/Species/arachnid.yml | 2 +- Resources/Prototypes/Entities/Mobs/Species/base.yml | 4 ++-- Resources/Prototypes/Entities/Mobs/Species/moth.yml | 2 +- Resources/Prototypes/Entities/Mobs/Species/vox.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 3a60263540c135..95657cc431a375 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1067,9 +1067,9 @@ sprite: Objects/Misc/handcuffs.rsi state: body-overlay-2 visible: false - - map: [ "id" ] - map: [ "ears" ] - map: [ "outerClothing" ] + - map: [ "id" ] - map: [ "mask" ] - map: [ "head" ] - map: [ "clownedon" ] @@ -1696,8 +1696,8 @@ sprite: Objects/Misc/handcuffs.rsi state: body-overlay-2 visible: false - - map: [ "id" ] - map: [ "outerClothing" ] + - map: [ "id" ] - map: [ "mask" ] - map: [ "head" ] - map: [ "clownedon" ] diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index 633d8a72823dea..a996a73127bd73 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml @@ -82,13 +82,13 @@ - map: ["enum.HumanoidVisualLayers.RFoot"] - map: ["enum.HumanoidVisualLayers.LHand"] - map: ["enum.HumanoidVisualLayers.RHand"] - - map: [ "id" ] - map: [ "gloves" ] - map: [ "shoes" ] - map: [ "ears" ] - map: [ "outerClothing" ] - map: [ "eyes" ] - map: [ "belt" ] + - map: [ "id" ] - map: [ "enum.HumanoidVisualLayers.Tail" ] # Mentioned in moth code: This needs renaming lol. - map: [ "neck" ] - map: [ "back" ] diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 55473daf157db4..a5936c226939cd 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -32,13 +32,13 @@ - map: ["enum.HumanoidVisualLayers.RFoot"] - map: ["enum.HumanoidVisualLayers.LHand"] - map: ["enum.HumanoidVisualLayers.RHand"] - - map: [ "id" ] - map: [ "gloves" ] - map: [ "shoes" ] - map: [ "ears" ] - map: [ "outerClothing" ] - map: [ "eyes" ] - map: [ "belt" ] + - map: [ "id" ] - map: [ "neck" ] - map: [ "back" ] - map: [ "enum.HumanoidVisualLayers.FacialHair" ] @@ -340,13 +340,13 @@ sprite: Objects/Misc/handcuffs.rsi state: body-overlay-2 visible: false - - map: [ "id" ] - map: [ "gloves" ] - map: [ "shoes" ] - map: [ "ears" ] - map: [ "outerClothing" ] - map: [ "eyes" ] - map: [ "belt" ] + - map: [ "id" ] - map: [ "neck" ] - map: [ "back" ] - map: [ "enum.HumanoidVisualLayers.FacialHair" ] diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index 4198c605ddf192..a18e47ead36c01 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml @@ -88,13 +88,13 @@ sprite: Objects/Misc/handcuffs.rsi state: body-overlay-2 visible: false - - map: [ "id" ] - map: [ "gloves" ] - map: [ "shoes" ] - map: [ "ears" ] - map: [ "outerClothing" ] - map: [ "eyes" ] - map: [ "belt" ] + - map: [ "id" ] - map: [ "enum.HumanoidVisualLayers.Tail" ] #in the utopian future we should probably have a wings enum inserted here so everyhting doesn't break - map: [ "neck" ] - map: [ "back" ] diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml index b6c5edf7519195..c1ee7744c8ea3b 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml @@ -60,13 +60,13 @@ sprite: Objects/Misc/handcuffs.rsi state: body-overlay-2 visible: false - - map: [ "id" ] - map: [ "gloves" ] - map: [ "shoes" ] - map: [ "ears" ] - map: [ "outerClothing" ] - map: [ "eyes" ] - map: [ "belt" ] + - map: [ "id" ] - map: [ "neck" ] - map: [ "back" ] - map: [ "enum.HumanoidVisualLayers.FacialHair" ]