From: centcomofficer24 Date: Thu, 6 Feb 2025 05:49:41 +0000 (+0000) Subject: Added Genderqueer pin! (Properly this time.) (#34561) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=a0fe21ac2f890922677e10760b15301b1edd7ad7;p=space-station-14.git Added Genderqueer pin! (Properly this time.) (#34561) * Added Genderqueer pin! (Properly this time.) * Update meta.json --- diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml index 5b99555c3b..5dcdce41dd 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml @@ -11,6 +11,7 @@ ClothingNeckNonBinaryPin: 3 ClothingNeckPansexualPin: 3 ClothingNeckOmnisexualPin: 3 + ClothingNeckGenderqueerPin: 3 ClothingNeckTransPin: 3 ClothingNeckAutismPin: 3 ClothingNeckGoldAutismPin: 3 diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml index 155bb9a82f..a402791f5a 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml @@ -122,6 +122,17 @@ - type: Clothing equippedPrefix: omni +- type: entity + parent: ClothingNeckPinBase + id: ClothingNeckGenderqueerPin + name: genderqueer pin + description: be crime, do gender + components: + - type: Sprite + state: gender + - type: Clothing + equippedPrefix: gender + - type: entity parent: ClothingNeckPinBase id: ClothingNeckTransPin diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 0ff3c2776c..a6b2324792 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -150,6 +150,7 @@ - id: ClothingNeckNonBinaryPin - id: ClothingNeckPansexualPin - id: ClothingNeckOmnisexualPin + - id: ClothingNeckGenderqueerPin - id: ClothingNeckTransPin - id: ClothingNeckAutismPin - id: ClothingNeckGoldAutismPin diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index 8e998d602f..5abc708afd 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -160,6 +160,12 @@ back: - ClothingNeckOmnisexualPin +- type: loadout + id: ClothingNeckGenderqueerPin + storage: + back: + - ClothingNeckGenderqueerPin + - type: loadout id: ClothingNeckTransPin storage: diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index b35fcef66f..ba76e8a1ee 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -28,6 +28,7 @@ - ClothingNeckNonBinaryPin - ClothingNeckPansexualPin - ClothingNeckOmnisexualPin + - ClothingNeckGenderqueerPin - ClothingNeckTransPin - ClothingNeckAutismPin - ClothingNeckGoldAutismPin diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gender-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gender-equipped-NECK.png new file mode 100644 index 0000000000..b617092567 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gender-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gender.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gender.png new file mode 100644 index 0000000000..10680e55ff Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gender.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json index bb1013b21a..78cf15fc4e 100644 --- a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json +++ b/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, BackeTako made the gay, autism pins by Terraspark, omnisexual pin by juliangiebel", + "copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay, autism pins by Terraspark, omnisexual pin by juliangiebel, genderqueer by centcomofficer24", "size": { "x": 32, "y": 32 @@ -97,6 +97,13 @@ { "name": "omni-equipped-NECK", "directions": 4 + }, + { + "name": "gender" + }, + { + "name": "gender-equipped-NECK", + "directions": 4 } ] }