From cc80f8d7820f4c38bf5ff6a52510cc4a0ef247a8 Mon Sep 17 00:00:00 2001 From: T Date: Mon, 21 Apr 2025 18:46:33 +0100 Subject: [PATCH] Added a semi-functional genderfluid pin. (#35854) * Added a semi-function GenderfluidPin * Update pins.yml fix bug * Fix meta.json under the newly merged "fix as you go" policy * Update pin description --------- Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> --- .../Catalog/VendingMachines/Inventories/pride.yml | 1 + .../Prototypes/Entities/Clothing/Neck/pins.yml | 11 +++++++++++ .../Markers/Spawners/Random/maintenance.yml | 1 + .../Loadouts/Miscellaneous/trinkets.yml | 6 ++++++ Resources/Prototypes/Loadouts/loadout_groups.yml | 1 + .../Neck/Misc/pins.rsi/fluid-equipped-NECK.png | Bin 0 -> 333 bytes .../Clothing/Neck/Misc/pins.rsi/fluid.png | Bin 0 -> 291 bytes .../Clothing/Neck/Misc/pins.rsi/meta.json | 9 ++++++++- 8 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/fluid-equipped-NECK.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/fluid.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml index 509104ecf5..92057ab21c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml @@ -15,6 +15,7 @@ ClothingNeckPluralPin: 3 ClothingNeckOmnisexualPin: 3 ClothingNeckGenderqueerPin: 3 + ClothingNeckGenderfluidPin: 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 bd54707fe1..e579ec38fb 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml @@ -166,6 +166,17 @@ - type: Clothing equippedPrefix: gender +- type: entity + parent: ClothingNeckPinBase + id: ClothingNeckGenderfluidPin + name: genderfluid pin + description: be gender, be fluid + components: + - type: Sprite + state: fluid + - type: Clothing + equippedPrefix: fluid + - 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 f701933f70..4f1315ce1d 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -155,6 +155,7 @@ - id: ClothingNeckPluralPin - id: ClothingNeckOmnisexualPin - id: ClothingNeckGenderqueerPin + - id: ClothingNeckGenderfluidPin - id: ClothingNeckTransPin - id: ClothingNeckAutismPin - id: ClothingNeckGoldAutismPin diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index 99dbedd456..e1d45e4784 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -184,6 +184,12 @@ back: - ClothingNeckGenderqueerPin +- type: loadout + id: ClothingNeckGenderfluidPin + storage: + back: + - ClothingNeckGenderfluidPin + - type: loadout id: ClothingNeckTransPin storage: diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 987affe13d..04b11056f3 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -32,6 +32,7 @@ - ClothingNeckPluralPin - ClothingNeckOmnisexualPin - ClothingNeckGenderqueerPin + - ClothingNeckGenderfluidPin - ClothingNeckTransPin - ClothingNeckAutismPin - ClothingNeckGoldAutismPin diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/fluid-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/fluid-equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..eb84427391a9e8e43532875bd6089b9c530b21d9 GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU=;CmaSW-5dpmU_=b;3VmiU$> zBH4}`HWaaJ6gFypoFbDh@aBl%8XcB{Q98l~d>`c-AJXd{HiVMW_0jjU_RpT_L0GXJfp%y9s%a9-G>==pFGlP z=)iMDkB|9{ny~mW2E%~e7Cakf`@~34SFvCI0r?kGL>*5(%6kP2CI(MeKbLh*2~7a2 C`h?E_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/fluid.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/fluid.png new file mode 100644 index 0000000000000000000000000000000000000000..e98ca3395aab803e31f1eda7a62d11af492e9a35 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ7oIMTArbD$DG~_>EDn4#?y*WR zVR3T?5^Z@Le{Ow!U|*zp>e(`fY3UxloC>?cl~n2@68*_Al$u#VgM6A65ZM+H?Z6I!oM{J;Ob!Nauk-`{#49`Bb|uv}#8w#7+B`d}Xe;|ym9v1W#q z(fB*mh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json index c1ec904c05..d6c4a337c0 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, genderqueer by centcomofficer24, ally by FairlySadPanda, aroace by momochitters, plural by CubixThree", + "copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay, autism pins by Terraspark, omnisexual pin by juliangiebel, genderqueer and genderfluid by centcomofficer24, ally by FairlySadPanda, aroace by momochitters, plural by CubixThree", "size": { "x": 32, "y": 32 @@ -125,6 +125,13 @@ { "name": "gender-equipped-NECK", "directions": 4 + }, + { + "name": "fluid" + }, + { + "name": "fluid-equipped-NECK", + "directions": 4 } ] } -- 2.51.2