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 <nathanielalbert1202@gmail.com>

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
index 0de6c0af152504d338bf8f182ea5c8075fcf021e..e530f98738a42cbba3f0b2921c8f04f1326703e6 100644 (file)
--- 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 fa67fe65c41c896468293b99b42daee9e7880eb8..0d974593533a085ff7832ee17a1160f681e9b6b6 100644 (file)
--- 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 a3081713aff04105c35bb04dfc1933947e6c2862..a6aa44b326dd6dcca2cb659d920a92cce1b1e8ee 100644 (file)
--- 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