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.

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

Religious Neckwear (Crucifix) And Gay Male Pin #1416

Merged
merged 5 commits into from
Jan 4, 2025

Conversation

angelofallars
Copy link
Contributor

@angelofallars angelofallars commented Jan 3, 2025

Description

Adds religious neckwear to loadouts, including crucifixes and the tallit. Also cherry-picks the gay male pride pin from space-wizards/space-station-14#32584.

  • crucifix (colorable)
  • Saint Peter crucifix (colorable)
  • gold crucifix
  • gold Saint Peter crucifix
  • silver crucifix
  • silver Saint Peter crucifix
  • scapular
  • tallit (colorable)
  • gay pin

Media

silver crucifix

image

gold Saint Peter crucifix

image

crucifix (colorable)

image

tallit

image

gay pin

image

Changelog

🆑 Skubman, BackeTako

  • add: Added religious neckwear to loadouts, such as Crucifix (with a colorable option), Scapular and Tallit.
  • tweak: Added the gay male pride pin to loadouts and the Pride-O-Mat.

@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI labels Jan 3, 2025
Copy link
Contributor

github-actions bot commented Jan 3, 2025

RSI Diff Bot; head commit 9af18e9 merging into 7d6483c
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Neck/Crucifixes/color-inverted.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/Clothing/Neck/Crucifixes/color.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/Clothing/Neck/Crucifixes/gold-inverted.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/Clothing/Neck/Crucifixes/gold.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/Clothing/Neck/Crucifixes/silver-inverted.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/Clothing/Neck/Crucifixes/silver.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/Clothing/Neck/Misc/pins.rsi

State Old New Status
gay-equipped Added
gay Added

Resources/Textures/Clothing/Neck/Misc/scapular.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/Clothing/Neck/Misc/tallit.rsi

State Old New Status
equipped-NECK Added
icon Added

Edit: diff updated after 9af18e9

@github-actions github-actions bot added Status: Needs Review Someone please review this labels Jan 3, 2025
@VMSolidus VMSolidus merged commit 7726d06 into Simple-Station:master Jan 4, 2025
13 of 14 checks passed
SimpleStation14 added a commit that referenced this pull request Jan 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants