Religious Neckwear (Crucifix) And Gay Male Pin

Resources/Locale/en-US/loadouts/generic/neck.ftl

@@ -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)

Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml

@@ -5,6 +5,7 @@
        ClothingNeckAromanticPin: 3
        ClothingNeckAsexualPin: 3
        ClothingNeckBisexualPin: 3
+       ClothingNeckGayPin: 3
        ClothingNeckIntersexPin: 3
        ClothingNeckLesbianPin: 3
        ClothingNeckNonBinaryPin: 3
@@ -26,4 +27,4 @@
        BedsheetRainbow: 2
        ClothingUniformColorRainbow: 2
        ClothingUnderSocksCoder: 1
-       ClothingUnderSocksBee: 1
+       ClothingUnderSocksBee: 1

Resources/Prototypes/Entities/Clothing/Neck/pins.yml

@@ -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

Resources/Prototypes/Entities/Clothing/Neck/religious.yml

@@ -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

Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml

@@ -244,6 +244,8 @@
           id: ClothingNeckAsexualPin
         - !type:EntSelector
           id: ClothingNeckBisexualPin
+        - !type:EntSelector
+          id: ClothingNeckGayPin
         - !type:EntSelector
           id: ClothingNeckIntersexPin
         - !type:EntSelector

Resources/Prototypes/Loadouts/Generic/neck.yml

@@ -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
@@ -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

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

@@ -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
+    }
+  ]
+}

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

@@ -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
+    }
+  ]
+}

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

@@ -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
+    }
+  ]
+}

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

@@ -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
+    }
+  ]
+}

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

@@ -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
+    }
+  ]
+}

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

@@ -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
+    }
+  ]
+}

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

@@ -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
@@ -28,6 +28,13 @@
             "name": "bi-equipped",
             "directions": 4
         },
+        {
+            "name": "gay"
+        },
+        {
+            "name": "gay-equipped",
+            "directions": 4
+        },
         {
             "name": "inter"
         },