Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changed Weird Clown/Mime Mask Names #32955

Closed
wants to merge 2 commits into from
Closed

Changed Weird Clown/Mime Mask Names #32955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6de745
Removed weird sexism
LaOubliette Oct 22, 2024
9e3eb99
Merge branch 'master' of https://github.com/LaOubliette/space-station-14
LaOubliette Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Resources/Prototypes/Entities/Clothing/Masks/masks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,25 +592,25 @@

- type: entity
parent: ClothingMaskClownBase
id: ClothingMaskSexyClown
name: sexy clown mask
description: Some naughty clowns think this is what the Honkmother looks like.
id: ClothingMaskBlushClown
name: blush clown mask
description: Some clowns think this is what the Honkmother looks like.
components:
- type: Sprite
sprite: Clothing/Mask/sexyclown.rsi
sprite: Clothing/Mask/blushclown.rsi
- type: Clothing
sprite: Clothing/Mask/sexyclown.rsi
sprite: Clothing/Mask/blushclown.rsi

- type: entity
parent: ClothingMaskMime
id: ClothingMaskSexyMime
name: sexy mime mask
description: Those ruddy cheeks just want to be rubbed.
id: ClothingMaskBlushMime
name: blushing mime mask
description: Those ruddy cheeks belie the hidden malice you feel emanating from this mask.
components:
- type: Sprite
sprite: Clothing/Mask/sexymime.rsi
sprite: Clothing/Mask/blushmime.rsi
- type: Clothing
sprite: Clothing/Mask/sexymime.rsi
sprite: Clothing/Mask/blushmime.rsi

- type: entity
parent: ClothingMaskMime
Expand Down
0 ...sexyclown.rsi/equipped-MASK-reptilian.png → ...lushclown.rsi/equipped-MASK-reptilian.png
View file
Open in desktop
File renamed without changes
0 .../Mask/sexyclown.rsi/equipped-MASK-vox.png → ...Mask/blushclown.rsi/equipped-MASK-vox.png
View file
Open in desktop
File renamed without changes
0 ...hing/Mask/sexyclown.rsi/equipped-MASK.png → ...ing/Mask/blushclown.rsi/equipped-MASK.png
View file
Open in desktop
File renamed without changes
0 ...ures/Clothing/Mask/sexyclown.rsi/icon.png → ...res/Clothing/Mask/blushclown.rsi/icon.png
View file
Open in desktop
File renamed without changes
0 ...res/Clothing/Mask/sexyclown.rsi/meta.json → ...es/Clothing/Mask/blushclown.rsi/meta.json
View file
Open in desktop
File renamed without changes.
0 .../sexymime.rsi/equipped-MASK-reptilian.png → ...blushmime.rsi/equipped-MASK-reptilian.png
View file
Open in desktop
File renamed without changes
0 ...g/Mask/sexymime.rsi/equipped-MASK-vox.png → .../Mask/blushmime.rsi/equipped-MASK-vox.png
View file
Open in desktop
File renamed without changes
0 ...thing/Mask/sexymime.rsi/equipped-MASK.png → ...hing/Mask/blushmime.rsi/equipped-MASK.png
View file
Open in desktop
File renamed without changes
0 ...tures/Clothing/Mask/sexymime.rsi/icon.png → ...ures/Clothing/Mask/blushmime.rsi/icon.png
View file
Open in desktop
File renamed without changes
0 ...ures/Clothing/Mask/sexymime.rsi/meta.json → ...res/Clothing/Mask/blushmime.rsi/meta.json
View file
Open in desktop
File renamed without changes.
Loading