From c55e311c7e599111efd4231937e7d8e49734fc09 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Wed, 2 Oct 2024 13:23:32 +0200 Subject: [PATCH] Cleanup pins.yml (#32593) * Cleanup pins.yml * oh my * forgor --- .../Entities/Clothing/Neck/pins.yml | 112 +++++------------- .../Neck/Misc/autismpin.rsi/meta.json | 18 --- .../Neck/Misc/goldautismpin.rsi/meta.json | 18 --- ...aro-equipped.png => aro-equipped-NECK.png} | Bin ...ex-equipped.png => asex-equipped-NECK.png} | Bin .../autism-equipped-NECK.png} | Bin .../{autismpin.rsi => pins.rsi}/autism.png | Bin .../{bi-equipped.png => bi-equipped-NECK.png} | Bin ...gay-equipped.png => gay-equipped-NECK.png} | Bin .../goldautism-equipped-NECK.png} | Bin .../goldautism.png | Bin ...r-equipped.png => inter-equipped-NECK.png} | Bin ...les-equipped.png => les-equipped-NECK.png} | Bin ...bt-equipped.png => lgbt-equipped-NECK.png} | Bin .../Clothing/Neck/Misc/pins.rsi/meta.json | 36 ++++-- ...non-equipped.png => non-equipped-NECK.png} | Bin ...pan-equipped.png => pan-equipped-NECK.png} | Bin ...s-equipped.png => trans-equipped-NECK.png} | Bin 18 files changed, 53 insertions(+), 131 deletions(-) delete mode 100644 Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/meta.json rename Resources/Textures/Clothing/Neck/Misc/pins.rsi/{aro-equipped.png => aro-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/pins.rsi/{asex-equipped.png => asex-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/{autismpin.rsi/autism-equipped.png => pins.rsi/autism-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/{autismpin.rsi => pins.rsi}/autism.png (100%) rename Resources/Textures/Clothing/Neck/Misc/pins.rsi/{bi-equipped.png => bi-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/pins.rsi/{gay-equipped.png => gay-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/{goldautismpin.rsi/goldautism-equipped.png => pins.rsi/goldautism-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/{goldautismpin.rsi => pins.rsi}/goldautism.png (100%) rename Resources/Textures/Clothing/Neck/Misc/pins.rsi/{inter-equipped.png => inter-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/pins.rsi/{les-equipped.png => les-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/pins.rsi/{lgbt-equipped.png => lgbt-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/pins.rsi/{non-equipped.png => non-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/pins.rsi/{pan-equipped.png => pan-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/pins.rsi/{trans-equipped.png => trans-equipped-NECK.png} (100%) diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml index 9f0ff79b20..a7dcf03f28 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml @@ -7,6 +7,10 @@ components: - type: Item size: Tiny + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi - type: entity parent: ClothingNeckPinBase @@ -15,14 +19,9 @@ description: Be gay do crime. components: - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: lgbt + state: lgbt - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: lgbt-equipped + equippedPrefix: lgbt - type: entity parent: ClothingNeckPinBase @@ -31,14 +30,9 @@ description: Be aro do crime. components: - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: aro + state: aro - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: aro-equipped + equippedPrefix: aro - type: entity parent: ClothingNeckPinBase @@ -47,14 +41,9 @@ description: Be ace do crime. components: - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: asex + state: asex - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: asex-equipped + equippedPrefix: asex - type: entity parent: ClothingNeckPinBase @@ -63,14 +52,9 @@ description: Be bi do crime. components: - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: bi + state: bi - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: bi-equipped + equippedPrefix: bi - type: entity parent: ClothingNeckPinBase @@ -79,14 +63,9 @@ description: Be gay~ do crime. components: - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: gay + state: gay - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: gay-equipped + equippedPrefix: gay - type: entity parent: ClothingNeckPinBase @@ -95,14 +74,9 @@ description: Be intersex do crime. components: - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: inter + state: inter - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: inter-equipped + equippedPrefix: inter - type: entity parent: ClothingNeckPinBase @@ -111,14 +85,9 @@ description: Be lesbian do crime. components: - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: les + state: les - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: les-equipped + equippedPrefix: les - type: entity parent: ClothingNeckPinBase @@ -127,14 +96,9 @@ description: "01100010 01100101 00100000 01100101 01101110 01100010 01111001 00100000 01100100 01101111 00100000 01100011 01110010 01101001 01101101 01100101" components: - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: non + state: non - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: non-equipped + equippedPrefix: non - type: entity parent: ClothingNeckPinBase @@ -143,14 +107,9 @@ description: Be pan do crime. components: - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: pan + state: pan - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: pan-equipped + equippedPrefix: pan - type: entity parent: ClothingNeckPinBase @@ -159,14 +118,9 @@ description: Be trans do crime. components: - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: trans + state: trans - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: trans-equipped + equippedPrefix: trans - type: entity parent: ClothingNeckPinBase @@ -175,14 +129,9 @@ description: Be autism do crime. components: - type: Sprite - sprite: Clothing/Neck/Misc/autismpin.rsi - layers: - - state: autism + state: autism - type: Clothing - sprite: Clothing/Neck/Misc/autismpin.rsi - clothingVisuals: - neck: - - state: autism-equipped + equippedPrefix: autism - type: entity parent: ClothingNeckPinBase @@ -191,11 +140,6 @@ description: Be autism do warcrime. components: - type: Sprite - sprite: Clothing/Neck/Misc/goldautismpin.rsi - layers: - - state: goldautism + state: goldautism - type: Clothing - sprite: Clothing/Neck/Misc/goldautismpin.rsi - clothingVisuals: - neck: - - state: goldautism-equipped + equippedPrefix: goldautism diff --git a/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/meta.json deleted file mode 100644 index e82672f071..0000000000 --- a/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-NC-4.0", - "copyright": "Terraspark's work", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "autism" - }, - { - "name": "autism-equipped", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/meta.json deleted file mode 100644 index 6848744ab8..0000000000 --- a/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-NC-4.0", - "copyright": "Terraspark's work", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "goldautism" - }, - { - "name": "goldautism-equipped", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/autism-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/autism-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/autism-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/autism-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/autism.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/autism.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/autism.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/autism.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/goldautism-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/goldautism-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/goldautism-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/goldautism-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/goldautism.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/goldautism.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/goldautism.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/goldautism.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json index aab069b547..0619f962df 100644 --- a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay", + "copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay, autism pins by Terraspark", "size": { "x": 32, "y": 32 @@ -11,70 +11,84 @@ "name": "aro" }, { - "name": "aro-equipped", + "name": "aro-equipped-NECK", "directions": 4 }, { "name": "asex" }, { - "name": "asex-equipped", + "name": "asex-equipped-NECK", + "directions": 4 + }, + { + "name": "autism" + }, + { + "name": "autism-equipped-NECK", "directions": 4 }, { "name": "bi" }, { - "name": "bi-equipped", + "name": "bi-equipped-NECK", "directions": 4 }, { "name": "gay" }, { - "name": "gay-equipped", + "name": "gay-equipped-NECK", + "directions": 4 + }, + { + "name": "goldautism" + }, + { + "name": "goldautism-equipped-NECK", "directions": 4 }, { "name": "inter" }, { - "name": "inter-equipped", + "name": "inter-equipped-NECK", "directions": 4 }, { "name": "les" }, { - "name": "les-equipped", + "name": "les-equipped-NECK", "directions": 4 }, { "name": "lgbt" }, { - "name": "lgbt-equipped", + "name": "lgbt-equipped-NECK", "directions": 4 }, { "name": "non" }, { - "name": "non-equipped", + "name": "non-equipped-NECK", "directions": 4 }, { "name": "pan" }, { - "name": "pan-equipped", + "name": "pan-equipped-NECK", "directions": 4 }, { "name": "trans" }, { - "name": "trans-equipped", + "name": "trans-equipped-NECK", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped-NECK.png -- 2.51.2