From 39bf2469add465a4cd97f0b2b20002abb7c79532 Mon Sep 17 00:00:00 2001 From: Cass <45694413+CubixThree@users.noreply.github.com> Date: Sun, 20 Apr 2025 02:00:33 -0500 Subject: [PATCH] Plurality pin addition (now not on master branch) (#36744) --- .../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 + .../Clothing/Neck/Misc/pins.rsi/meta.json | 9 ++++++++- .../Neck/Misc/pins.rsi/plural-equipped-NECK.png | Bin 0 -> 445 bytes .../Clothing/Neck/Misc/pins.rsi/plural.png | Bin 0 -> 496 bytes 8 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/plural-equipped-NECK.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/plural.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml index 80c1408c53..509104ecf5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml @@ -12,6 +12,7 @@ ClothingNeckLesbianPin: 3 ClothingNeckNonBinaryPin: 3 ClothingNeckPansexualPin: 3 + ClothingNeckPluralPin: 3 ClothingNeckOmnisexualPin: 3 ClothingNeckGenderqueerPin: 3 ClothingNeckTransPin: 3 diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml index 563a94779b..bd54707fe1 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml @@ -133,6 +133,17 @@ - type: Clothing equippedPrefix: pan +- type: entity + parent: ClothingNeckPinBase + id: ClothingNeckPluralPin + name: plural pin + description: Be plural, do crimes. + components: + - type: Sprite + state: plural + - type: Clothing + equippedPrefix: plural + - type: entity parent: ClothingNeckPinBase id: ClothingNeckOmnisexualPin diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 289fee8596..f701933f70 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -152,6 +152,7 @@ - id: ClothingNeckLesbianPin - id: ClothingNeckNonBinaryPin - id: ClothingNeckPansexualPin + - id: ClothingNeckPluralPin - id: ClothingNeckOmnisexualPin - id: ClothingNeckGenderqueerPin - id: ClothingNeckTransPin diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index 68eea05131..99dbedd456 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -166,6 +166,12 @@ back: - ClothingNeckPansexualPin +- type: loadout + id: ClothingNeckPluralPin + storage: + back: + - ClothingNeckPluralPin + - type: loadout id: ClothingNeckOmnisexualPin storage: diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index a93d727b43..e9473a459a 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -29,6 +29,7 @@ - ClothingNeckLesbianPin - ClothingNeckNonBinaryPin - ClothingNeckPansexualPin + - ClothingNeckPluralPin - ClothingNeckOmnisexualPin - ClothingNeckGenderqueerPin - ClothingNeckTransPin diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json index a25719fabe..c1ec904c05 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", + "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", "size": { "x": 32, "y": 32 @@ -98,6 +98,13 @@ "name": "pan-equipped-NECK", "directions": 4 }, + { + "name": "plural" + }, + { + "name": "plural-equipped-NECK", + "directions": 4 + }, { "name": "trans" }, diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/plural-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/plural-equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..ab2669f73baf2fd392fceaa2ceddec8ca8286938 GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL9r6oh?3y^w370~qEv=}#LT=BJwMkF1yeo4 z@6F#Q166EEjqptK^weVD0CHFvq!?Kl7=bJ=AeM%*L2l7tWCn{f0ojI(ObmQLItqw0 z+gZTk89+7&Bmgl;Ka57Pl7X3lVFEh?3sBy`$k>2!0mMv@de#LHb0z`VAixAPg$b-O z$kGDHg6c9fFaXIWFHt)Z@`Fi8d>%zEM%Y1JxO|$;K{pa7BqYq1Z x9^U%<=X?I|D>>8MZ;Azf&7B3Z4+g?SJ~D>7i~QYjdTR$r%+uA+Wt~$(69AA2ZleGI literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/plural.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/plural.png new file mode 100644 index 0000000000000000000000000000000000000000..983875a5b29527f556a654a679d80f72826222f7 GIT binary patch literal 496 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik70(?ST9o35C%$F(nbm-w%g#?e0h0!U0q#cV`HGgMdI3P zffP?kkYDhB1Yi)lf9@PmoU_0qvY3H^?=T269?xHq0u&T0ag8Vm&QB{TPb^Ah2uRG# zE79|F4N)-FGyLBCeKJtRmedH(G*3@01`Z&Hl|hP;m4Ok+@&aOMC>!J_4Mt|LI1`X< z$jHRN2c)BbIJ2DvES>>mgFpfhgY?5_6e}5kVKRZ8fdwdUU}S8-xBy}%NImNUh&hvh zY!F}qn!*HD8DwbzWI=Tq8W@0Nlb5I+3G(}U2FQ%|ba4!^@PB*ZE?;?QHu6ouWMZ*)ROO)GC5immvv4FO#tD#f42Yt literal 0 HcmV?d00001 -- 2.51.2