Renaming sexy mime and clown mask (space-wizards#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 <[email protected]>
DebugOk · Jan 24, 2025 · 2580a21 · 2580a21
1 parent 371b1f8
commit 2580a21
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 11 deletions.
diff --git 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
@@ -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/...sexyclown.rsi/equipped-MASK-reptilian.png → ...hingclown.rsi/equipped-MASK-reptilian.png b/...sexyclown.rsi/equipped-MASK-reptilian.png → ...hingclown.rsi/equipped-MASK-reptilian.png
diff --git a/.../Mask/sexyclown.rsi/equipped-MASK-vox.png → ...k/blushingclown.rsi/equipped-MASK-vox.png b/.../Mask/sexyclown.rsi/equipped-MASK-vox.png → ...k/blushingclown.rsi/equipped-MASK-vox.png
diff --git a/...hing/Mask/sexyclown.rsi/equipped-MASK.png → .../Mask/blushingclown.rsi/equipped-MASK.png b/...hing/Mask/sexyclown.rsi/equipped-MASK.png → .../Mask/blushingclown.rsi/equipped-MASK.png
diff --git a/...ures/Clothing/Mask/sexyclown.rsi/icon.png → .../Clothing/Mask/blushingclown.rsi/icon.png b/...ures/Clothing/Mask/sexyclown.rsi/icon.png → .../Clothing/Mask/blushingclown.rsi/icon.png
diff --git a/...res/Clothing/Mask/sexyclown.rsi/meta.json → ...Clothing/Mask/blushingclown.rsi/meta.json b/...res/Clothing/Mask/sexyclown.rsi/meta.json → ...Clothing/Mask/blushingclown.rsi/meta.json
diff --git a/.../sexymime.rsi/equipped-MASK-reptilian.png → ...shingmime.rsi/equipped-MASK-reptilian.png b/.../sexymime.rsi/equipped-MASK-reptilian.png → ...shingmime.rsi/equipped-MASK-reptilian.png
diff --git a/...g/Mask/sexymime.rsi/equipped-MASK-vox.png → ...sk/blushingmime.rsi/equipped-MASK-vox.png b/...g/Mask/sexymime.rsi/equipped-MASK-vox.png → ...sk/blushingmime.rsi/equipped-MASK-vox.png
diff --git a/...thing/Mask/sexymime.rsi/equipped-MASK.png → ...g/Mask/blushingmime.rsi/equipped-MASK.png b/...thing/Mask/sexymime.rsi/equipped-MASK.png → ...g/Mask/blushingmime.rsi/equipped-MASK.png
diff --git a/...tures/Clothing/Mask/sexymime.rsi/icon.png → ...s/Clothing/Mask/blushingmime.rsi/icon.png b/...tures/Clothing/Mask/sexymime.rsi/icon.png → ...s/Clothing/Mask/blushingmime.rsi/icon.png
diff --git a/...ures/Clothing/Mask/sexymime.rsi/meta.json → .../Clothing/Mask/blushingmime.rsi/meta.json b/...ures/Clothing/Mask/sexymime.rsi/meta.json → .../Clothing/Mask/blushingmime.rsi/meta.json
diff --git 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