Skip to content

Commit

Permalink
Religious Neckwear (Crucifix) And Gay Male Pin (#1416)
Browse files Browse the repository at this point in the history
# 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](https://github.com/user-attachments/assets/ba232bb3-9b3b-464c-81e1-59ac67b1366c)

**gold Saint Peter crucifix**


![image](https://github.com/user-attachments/assets/0e5584d7-a96e-41ac-b1af-ef7d5b2caea7)

**crucifix (colorable)**


![image](https://github.com/user-attachments/assets/de537fc0-5427-43d4-9d68-91b12d1eab25)

**tallit**


![image](https://github.com/user-attachments/assets/da537c1f-4d9b-4fe2-bfab-c70a2a8297f6)

**gay pin**


![image](https://github.com/user-attachments/assets/5e03b9fa-cd1f-4d1f-927f-476affbffde8)


# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl: 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.
  • Loading branch information
angelofallars authored Jan 4, 2025
1 parent 0a5ec01 commit 7726d06
Show file tree
Hide file tree
Showing 33 changed files with 365 additions and 2 deletions.
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/loadouts/generic/neck.ftl
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
loadout-name-LoadoutNeckOldMantle = old mantle (colorable)
loadout-name-LoadoutNeckUnathiMantle = unathi mantle (colorable)
loadout-name-LoadoutNeckTieWhite = suit tie (colorable)
loadout-name-LoadoutNeckCrucifixColor = crucifix (colorable)
loadout-name-LoadoutNeckCrucifixColorSaintPeter = Saint Peter crucifix (colorable)
loadout-name-LoadoutNeckTallit = tallit (colorable)
loadout-name-LoadoutNeckBedsheetWhite = bedsheet (colorable)
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
ClothingNeckAromanticPin: 3
ClothingNeckAsexualPin: 3
ClothingNeckBisexualPin: 3
ClothingNeckGayPin: 3
ClothingNeckIntersexPin: 3
ClothingNeckLesbianPin: 3
ClothingNeckNonBinaryPin: 3
Expand All @@ -26,4 +27,4 @@
BedsheetRainbow: 2
ClothingUniformColorRainbow: 2
ClothingUnderSocksCoder: 1
ClothingUnderSocksBee: 1
ClothingUnderSocksBee: 1
16 changes: 16 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Neck/pins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,22 @@
neck:
- state: bi-equipped

- type: entity
parent: ClothingNeckPinBase
id: ClothingNeckGayPin
name: gay pin
description: be gay do crime
components:
- type: Sprite
sprite: Clothing/Neck/Misc/pins.rsi
layers:
- state: gay
- type: Clothing
sprite: Clothing/Neck/Misc/pins.rsi
clothingVisuals:
neck:
- state: gay-equipped

- type: entity
parent: ClothingNeckPinBase
id: ClothingNeckIntersexPin
Expand Down
87 changes: 87 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Neck/religious.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckCrucifixColor
name: crucifix
description: A small cross on a piece of string. Commonly associated with the Christian faith, it is a main symbol of this religion.
components:
- type: Sprite
sprite: Clothing/Neck/Crucifixes/color.rsi
- type: Clothing
sprite: Clothing/Neck/Crucifixes/color.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCrucifixColorSaintPeter
name: Saint Peter crucifix
description: A small cross on a piece of string. Being inverted and thus upside down marks it as the cross of Saint Peter.
components:
- type: Sprite
sprite: Clothing/Neck/Crucifixes/color-inverted.rsi
- type: Clothing
sprite: Clothing/Neck/Crucifixes/color-inverted.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCrucifixGold
name: gold crucifix
description: A small, gold cross on a piece of string. Commonly associated with the Christian faith, it is a main symbol of this religion.
components:
- type: Sprite
sprite: Clothing/Neck/Crucifixes/gold.rsi
- type: Clothing
sprite: Clothing/Neck/Crucifixes/gold.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCrucifixGoldSaintPeter
name: gold Saint Peter crucifix
description: A small, gold cross on a piece of string. Being inverted and thus upside down marks it as the cross of Saint Peter.
components:
- type: Sprite
sprite: Clothing/Neck/Crucifixes/gold-inverted.rsi
- type: Clothing
sprite: Clothing/Neck/Crucifixes/gold-inverted.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCrucifixSilver
name: silver crucifix
description: A small, silver cross on a piece of string. Commonly associated with the Christian faith, it is a main symbol of this religion.
components:
- type: Sprite
sprite: Clothing/Neck/Crucifixes/silver.rsi
- type: Clothing
sprite: Clothing/Neck/Crucifixes/silver.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCrucifixSilverSaintPeter
name: silver Saint Peter crucifix
description: A small, silver cross on a piece of string. Being inverted and thus upside down marks it as the cross of Saint Peter.
components:
- type: Sprite
sprite: Clothing/Neck/Crucifixes/silver-inverted.rsi
- type: Clothing
sprite: Clothing/Neck/Crucifixes/silver-inverted.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckScapular
name: scapular
description: As Christian garment that serves to remind the wearer of their commitment to live a Christian life.
components:
- type: Sprite
sprite: Clothing/Neck/Misc/scapular.rsi
- type: Clothing
sprite: Clothing/Neck/Misc/scapular.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckTallit
name: tallit
description: A fringed garment worn as a prayer shawl by Jewish people.
components:
- type: Sprite
sprite: Clothing/Neck/Misc/tallit.rsi
- type: Clothing
sprite: Clothing/Neck/Misc/tallit.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,8 @@
id: ClothingNeckAsexualPin
- !type:EntSelector
id: ClothingNeckBisexualPin
- !type:EntSelector
id: ClothingNeckGayPin
- !type:EntSelector
id: ClothingNeckIntersexPin
- !type:EntSelector
Expand Down
103 changes: 103 additions & 0 deletions Resources/Prototypes/Loadouts/Generic/neck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,17 @@
- !type:CharacterItemGroupRequirement
group: LoadoutNeck

- type: loadout
id: LoadoutItemsPrideGayPin
category: Neck
cost: 0
exclusive: true
items:
- ClothingNeckGayPin
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutNeck

- type: loadout
id: LoadoutItemsPrideIntersexPin
category: Neck
Expand Down Expand Up @@ -260,6 +271,98 @@
- !type:CharacterItemGroupRequirement
group: LoadoutNeck

# Religious
- type: loadout
id: LoadoutNeckCrucifixColor
category: Neck
cost: 0
exclusive: true
customColorTint: true
items:
- ClothingNeckCrucifixColor
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutNeck

- type: loadout
id: LoadoutNeckCrucifixColorSaintPeter
category: Neck
cost: 0
exclusive: true
customColorTint: true
items:
- ClothingNeckCrucifixColorSaintPeter
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutNeck

- type: loadout
id: LoadoutNeckCrucifixGold
category: Neck
cost: 0
exclusive: true
items:
- ClothingNeckCrucifixGold
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutNeck

- type: loadout
id: LoadoutNeckCrucifixGoldSaintPeter
category: Neck
cost: 0
exclusive: true
items:
- ClothingNeckCrucifixGoldSaintPeter
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutNeck

- type: loadout
id: LoadoutNeckCrucifixSilver
category: Neck
cost: 0
exclusive: true
items:
- ClothingNeckCrucifixSilver
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutNeck

- type: loadout
id: LoadoutNeckCrucifixSilverSaintPeter
category: Neck
cost: 0
exclusive: true
items:
- ClothingNeckCrucifixSilverSaintPeter
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutNeck

- type: loadout
id: LoadoutNeckScapular
category: Neck
cost: 0
exclusive: true
items:
- ClothingNeckScapular
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutNeck

- type: loadout
id: LoadoutNeckTallit
category: Neck
cost: 0
exclusive: true
customColorTint: true
items:
- ClothingNeckTallit
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutNeck

# Bedsheets
- type: loadout
id: LoadoutNeckBedsheetCosmos
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/4229a034d1bfd21e0c539b413feac6f69d725a66. Crucifix sprites edited by Skubman for SS14 (github: angelofallars)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions Resources/Textures/Clothing/Neck/Crucifixes/color.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/4229a034d1bfd21e0c539b413feac6f69d725a66. Crucifix sprites edited by Skubman for SS14 (github: angelofallars)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/4229a034d1bfd21e0c539b413feac6f69d725a66. Crucifix sprites edited by Skubman for SS14 (github: angelofallars)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions Resources/Textures/Clothing/Neck/Crucifixes/gold.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/4229a034d1bfd21e0c539b413feac6f69d725a66. Crucifix sprites edited by Skubman for SS14 (github: angelofallars)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/4229a034d1bfd21e0c539b413feac6f69d725a66. Crucifix sprites edited by Skubman for SS14 (github: angelofallars)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions Resources/Textures/Clothing/Neck/Crucifixes/silver.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/4229a034d1bfd21e0c539b413feac6f69d725a66. Crucifix sprites edited by Skubman for SS14 (github: angelofallars)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 8 additions & 1 deletion Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "PixelTK leaves his mark on upstream",
"copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay, gay-equipped modified by Skubman",
"size": {
"x": 32,
"y": 32
Expand All @@ -28,6 +28,13 @@
"name": "bi-equipped",
"directions": 4
},
{
"name": "gay"
},
{
"name": "gay-equipped",
"directions": 4
},
{
"name": "inter"
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 7726d06

Please sign in to comment.