From 50ba607bf54a5222f640ec0bf8025fdc8c5fc4eb Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sun, 9 Feb 2025 00:02:00 +0100 Subject: [PATCH] add straight ally pin (#34977) --- .../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/ally-equipped-NECK.png | Bin 0 -> 198 bytes .../Textures/Clothing/Neck/Misc/pins.rsi/ally.png | Bin 0 -> 425 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/ally-equipped-NECK.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/ally.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml index 5dcdce41dd..28d0ec7b25 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml @@ -2,6 +2,7 @@ id: PrideDrobeInventory startingInventory: ClothingNeckLGBTPin: 3 + ClothingNeckAllyPin: 3 ClothingNeckAromanticPin: 3 ClothingNeckAsexualPin: 3 ClothingNeckBisexualPin: 3 diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml index a402791f5a..ea781fb3f3 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml @@ -23,6 +23,17 @@ - type: Clothing equippedPrefix: lgbt +- type: entity + parent: ClothingNeckPinBase + id: ClothingNeckAllyPin + name: straight ally pin + description: Be ally do crime. + components: + - type: Sprite + state: ally + - type: Clothing + equippedPrefix: ally + - type: entity parent: ClothingNeckPinBase id: ClothingNeckAromanticPin diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index a6b2324792..78f7aed89d 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -141,6 +141,7 @@ - !type:GroupSelector children: - id: ClothingNeckLGBTPin + - id: ClothingNeckAllyPin - id: ClothingNeckAromanticPin - id: ClothingNeckAsexualPin - id: ClothingNeckBisexualPin diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index 5abc708afd..51a96c06d3 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -106,6 +106,12 @@ back: - ClothingNeckLGBTPin +- type: loadout + id: ClothingNeckAllyPin + storage: + back: + - ClothingNeckAllyPin + - type: loadout id: ClothingNeckAromanticPin storage: diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index ba76e8a1ee..433cebee37 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -19,6 +19,7 @@ - CigarCase - CigarGold - ClothingNeckLGBTPin + - ClothingNeckAllyPin - ClothingNeckAromanticPin - ClothingNeckAsexualPin - ClothingNeckBisexualPin diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/ally-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/ally-equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..1dd4f7358a46cf0788678024c62c5dea70473c82 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@3A^6XFV_jg5`(?ba|cHfEU0w0XIN_;`k~@Hv*`Y!PC{xWt~$(69DV-JA?oL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/ally.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/ally.png new file mode 100644 index 0000000000000000000000000000000000000000..3ff67be50529009c04517ecd5e57cce24472a09e GIT binary patch literal 425 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP;hd9Plzj!mY0)LmX%YIl>-7}V`FP$0|#5{d69C9qGX+Htxb)M>}_mv zBAx%u)ynbGv$L^@jg8IA&8)Ah`1~l~{~Mp0^2F@y?3|pe9qUup&vq`%&zLb|`m|-! z1Xs&5Ol7KATrqRTjEPhG^=27#Zt5xCP}w`Bn^$9|g3(z=*EhFs-???`&g%8&&z(De z^w{}VuU@}=@v88^Jw>3i3`>Iif*Jmk2wn+1x(3u-$`3O#zmd?2(^e+w!r#N%$Qpx&L8+!r>Dfr7vpVa7}4= zmz@0P0&QpTboFyt=akR{0Lk#c_y7O^ 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 78cf15fc4e..a9e20917af 100644 --- a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json @@ -1,12 +1,19 @@ { "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", + "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", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "ally" + }, + { + "name": "ally-equipped-NECK", + "directions": 4 + }, { "name": "aro" }, -- 2.51.2