From 2580a21471809584f7e7571e59016673c8f53c4e Mon Sep 17 00:00:00 2001 From: JustinWinningham Date: Thu, 23 Jan 2025 19:56:33 -0800 Subject: [PATCH] Renaming sexy mime and clown mask (#34258) * Renamed sexy clown and mime mask and removed lusty xenomorph poster. * removing odd file changes. not sure why these were edited at all. * gaaaahhh * removed some of the old templates * Renaming sexy mime and clown instances. * removed unwanted gitignore edit * Renaming sexy clown and sexy mime mask and Removing lusty exomorph poster. * Remove lusty xenomorph poster. * reverted changes to maps files, actually. Other contrib is learning, appologies for excessive commits * requested changes * lusty migration removal * dirty hanging whitespace * correct date format comment --------- Co-authored-by: NathanielJ14 --- .../VendingMachines/Inventories/theater.yml | 4 ++-- .../Entities/Clothing/Masks/masks.yml | 18 +++++++++--------- .../equipped-MASK-reptilian.png | Bin .../equipped-MASK-vox.png | Bin .../equipped-MASK.png | Bin .../icon.png | Bin .../meta.json | 0 .../equipped-MASK-reptilian.png | Bin .../equipped-MASK-vox.png | Bin .../equipped-MASK.png | Bin .../icon.png | Bin .../meta.json | 0 Resources/migration.yml | 4 ++++ 13 files changed, 15 insertions(+), 11 deletions(-) rename Resources/Textures/Clothing/Mask/{sexyclown.rsi => blushingclown.rsi}/equipped-MASK-reptilian.png (100%) rename Resources/Textures/Clothing/Mask/{sexyclown.rsi => blushingclown.rsi}/equipped-MASK-vox.png (100%) rename Resources/Textures/Clothing/Mask/{sexyclown.rsi => blushingclown.rsi}/equipped-MASK.png (100%) rename Resources/Textures/Clothing/Mask/{sexyclown.rsi => blushingclown.rsi}/icon.png (100%) rename Resources/Textures/Clothing/Mask/{sexyclown.rsi => blushingclown.rsi}/meta.json (100%) rename Resources/Textures/Clothing/Mask/{sexymime.rsi => blushingmime.rsi}/equipped-MASK-reptilian.png (100%) rename Resources/Textures/Clothing/Mask/{sexymime.rsi => blushingmime.rsi}/equipped-MASK-vox.png (100%) rename Resources/Textures/Clothing/Mask/{sexymime.rsi => blushingmime.rsi}/equipped-MASK.png (100%) rename Resources/Textures/Clothing/Mask/{sexymime.rsi => blushingmime.rsi}/icon.png (100%) rename Resources/Textures/Clothing/Mask/{sexymime.rsi => blushingmime.rsi}/meta.json (100%) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 0de6c0af15..e530f98738 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -59,6 +59,6 @@ ClothingShoesBling: 1 ClothingShoesBootsCowboyFancy: 1 ClothingOuterDogi: 1 - ClothingMaskSexyClown: 1 - ClothingMaskSexyMime: 1 + ClothingMaskBlushingClown: 1 + ClothingMaskBlushingMime: 1 ClothingHeadHatCowboyBountyHunter: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index fa67fe65c4..0d97459353 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -591,25 +591,25 @@ - type: entity parent: ClothingMaskClownBase - id: ClothingMaskSexyClown - name: sexy clown mask - description: Some naughty clowns think this is what the Honkmother looks like. + id: ClothingMaskBlushingClown + name: blushing clown mask + description: A mask for a blushing clown. components: - type: Sprite - sprite: Clothing/Mask/sexyclown.rsi + sprite: Clothing/Mask/blushingclown.rsi - type: Clothing - sprite: Clothing/Mask/sexyclown.rsi + sprite: Clothing/Mask/blushingclown.rsi - type: entity parent: ClothingMaskMime - id: ClothingMaskSexyMime - name: sexy mime mask + id: ClothingMaskBlushingMime + name: blushing mime mask description: Those ruddy cheeks just want to be rubbed. components: - type: Sprite - sprite: Clothing/Mask/sexymime.rsi + sprite: Clothing/Mask/blushingmime.rsi - type: Clothing - sprite: Clothing/Mask/sexymime.rsi + sprite: Clothing/Mask/blushingmime.rsi - type: entity parent: ClothingMaskMime diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/blushingclown.rsi/equipped-MASK-reptilian.png similarity index 100% rename from Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK-reptilian.png rename to Resources/Textures/Clothing/Mask/blushingclown.rsi/equipped-MASK-reptilian.png diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/blushingclown.rsi/equipped-MASK-vox.png similarity index 100% rename from Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK-vox.png rename to Resources/Textures/Clothing/Mask/blushingclown.rsi/equipped-MASK-vox.png diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/blushingclown.rsi/equipped-MASK.png similarity index 100% rename from Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK.png rename to Resources/Textures/Clothing/Mask/blushingclown.rsi/equipped-MASK.png diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/icon.png b/Resources/Textures/Clothing/Mask/blushingclown.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Mask/sexyclown.rsi/icon.png rename to Resources/Textures/Clothing/Mask/blushingclown.rsi/icon.png diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json b/Resources/Textures/Clothing/Mask/blushingclown.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json rename to Resources/Textures/Clothing/Mask/blushingclown.rsi/meta.json diff --git a/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/blushingmime.rsi/equipped-MASK-reptilian.png similarity index 100% rename from Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-reptilian.png rename to Resources/Textures/Clothing/Mask/blushingmime.rsi/equipped-MASK-reptilian.png diff --git a/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/blushingmime.rsi/equipped-MASK-vox.png similarity index 100% rename from Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-vox.png rename to Resources/Textures/Clothing/Mask/blushingmime.rsi/equipped-MASK-vox.png diff --git a/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/blushingmime.rsi/equipped-MASK.png similarity index 100% rename from Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK.png rename to Resources/Textures/Clothing/Mask/blushingmime.rsi/equipped-MASK.png diff --git a/Resources/Textures/Clothing/Mask/sexymime.rsi/icon.png b/Resources/Textures/Clothing/Mask/blushingmime.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Mask/sexymime.rsi/icon.png rename to Resources/Textures/Clothing/Mask/blushingmime.rsi/icon.png diff --git a/Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json b/Resources/Textures/Clothing/Mask/blushingmime.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json rename to Resources/Textures/Clothing/Mask/blushingmime.rsi/meta.json diff --git a/Resources/migration.yml b/Resources/migration.yml index a3081713af..a6aa44b326 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -540,3 +540,7 @@ LightTree06: LightTree #2024-12-28 DrinkIrishCarBomb: DrinkIrishSlammer + +#2025-01-06 +ClothingMaskSexyClown: ClothingMaskBlushingClown +ClothingMaskSexyMime: ClothingMaskBlushingMime -- 2.51.2