-
Notifications
You must be signed in to change notification settings - Fork 179
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Religious Neckwear (Crucifix) And Gay Male Pin (#1416)
# 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
1 parent
0a5ec01
commit 7726d06
Showing
33 changed files
with
365 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+207 Bytes
Resources/Textures/Clothing/Neck/Crucifixes/color-inverted.rsi/equipped-NECK.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+317 Bytes
Resources/Textures/Clothing/Neck/Crucifixes/color-inverted.rsi/icon.png
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
18
Resources/Textures/Clothing/Neck/Crucifixes/color-inverted.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
} | ||
] | ||
} |
Binary file added
BIN
+208 Bytes
Resources/Textures/Clothing/Neck/Crucifixes/color.rsi/equipped-NECK.png
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
18
Resources/Textures/Clothing/Neck/Crucifixes/color.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
} | ||
] | ||
} |
Binary file added
BIN
+222 Bytes
Resources/Textures/Clothing/Neck/Crucifixes/gold-inverted.rsi/equipped-NECK.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+316 Bytes
Resources/Textures/Clothing/Neck/Crucifixes/gold-inverted.rsi/icon.png
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
18
Resources/Textures/Clothing/Neck/Crucifixes/gold-inverted.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
} | ||
] | ||
} |
Binary file added
BIN
+222 Bytes
Resources/Textures/Clothing/Neck/Crucifixes/gold.rsi/equipped-NECK.png
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
18
Resources/Textures/Clothing/Neck/Crucifixes/gold.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
} | ||
] | ||
} |
Binary file added
BIN
+218 Bytes
Resources/Textures/Clothing/Neck/Crucifixes/silver-inverted.rsi/equipped-NECK.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+347 Bytes
Resources/Textures/Clothing/Neck/Crucifixes/silver-inverted.rsi/icon.png
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
18
Resources/Textures/Clothing/Neck/Crucifixes/silver-inverted.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
} | ||
] | ||
} |
Binary file added
BIN
+221 Bytes
Resources/Textures/Clothing/Neck/Crucifixes/silver.rsi/equipped-NECK.png
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
18
Resources/Textures/Clothing/Neck/Crucifixes/silver.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+334 Bytes
Resources/Textures/Clothing/Neck/Misc/scapular.rsi/equipped-NECK.png
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.
Oops, something went wrong.