From a967fc748613fd34a9f6144ef6f702e30fb4f1a8 Mon Sep 17 00:00:00 2001 From: Julian Giebel Date: Tue, 14 Jan 2025 23:41:04 +0100 Subject: [PATCH] Adds omnisexual pin (#34439) * Make important change (#7) This is to help julian test his bot * Omnibus * Remove random test file from testing a gh bot * Add pin to vendor, spawners and loadout --------- Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> --- .../Catalog/VendingMachines/Inventories/pride.yml | 1 + .../Prototypes/Entities/Clothing/Neck/pins.yml | 13 ++++++++++++- .../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/omni-equipped-NECK.png | Bin 0 -> 183 bytes .../Textures/Clothing/Neck/Misc/pins.rsi/omni.png | Bin 0 -> 287 bytes 8 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/omni-equipped-NECK.png create mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/omni.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml index e93c27c041..d4ffe6be33 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml @@ -10,6 +10,7 @@ ClothingNeckLesbianPin: 3 ClothingNeckNonBinaryPin: 3 ClothingNeckPansexualPin: 3 + ClothingNeckOmnisexualPin: 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 a7dcf03f28..155bb9a82f 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml @@ -111,6 +111,17 @@ - type: Clothing equippedPrefix: pan +- type: entity + parent: ClothingNeckPinBase + id: ClothingNeckOmnisexualPin + name: omnisexual pin + description: Be omni do crime. + components: + - type: Sprite + state: omni + - type: Clothing + equippedPrefix: omni + - type: entity parent: ClothingNeckPinBase id: ClothingNeckTransPin @@ -121,7 +132,7 @@ state: trans - type: Clothing equippedPrefix: trans - + - type: entity parent: ClothingNeckPinBase id: ClothingNeckAutismPin diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index be26279365..96cf75d935 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -149,6 +149,7 @@ - id: ClothingNeckLesbianPin - id: ClothingNeckNonBinaryPin - id: ClothingNeckPansexualPin + - id: ClothingNeckOmnisexualPin - id: ClothingNeckTransPin - id: ClothingNeckAutismPin - id: ClothingNeckGoldAutismPin diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index b4e2cecf8b..8e998d602f 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -154,6 +154,12 @@ back: - ClothingNeckPansexualPin +- type: loadout + id: ClothingNeckOmnisexualPin + storage: + back: + - ClothingNeckOmnisexualPin + - type: loadout id: ClothingNeckTransPin storage: diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 990c6f41bb..b35fcef66f 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -27,6 +27,7 @@ - ClothingNeckLesbianPin - ClothingNeckNonBinaryPin - ClothingNeckPansexualPin + - ClothingNeckOmnisexualPin - ClothingNeckTransPin - ClothingNeckAutismPin - ClothingNeckGoldAutismPin diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json index 0619f962df..bb1013b21a 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", + "copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay, autism pins by Terraspark, omnisexual pin by juliangiebel", "size": { "x": 32, "y": 32 @@ -90,6 +90,13 @@ { "name": "trans-equipped-NECK", "directions": 4 + }, + { + "name": "omni" + }, + { + "name": "omni-equipped-NECK", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/omni-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/omni-equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..af88fc50ae0d00e160b511c4808ac29d8d1958f0 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|3O!vMLn`LH zy|9s!DNw}a;?Eh{WeExF+-+tlIUwlV#tq^x+G*4ML*d1|-~*{MSQr=*nxgU-^i4nY zbuQ25Er+-5{+@fcd3xk^rPVgY=asj=l-*z-zV}$lK2N{h--_9Rw!p#v=giAX1zB#n R`GQ=+;OXk;vd$@?2>>4%KzaZG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/omni.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/omni.png new file mode 100644 index 0000000000000000000000000000000000000000..fea907514486de1ab77f0bb25e3b607f457e1ba6 GIT binary patch literal 287 zcmV+)0pR|LP)Px#*-1n}R9J=Wl)nxEK@f+(6AE%6QQ$NbYPE)!@DK{MO080Byn~leUF`{I?)*s< z2!&!5myjh9vx!j5*X(8{^PAu9W(O2SQIsF!xfYty+*m@xj+2(S=-#;O+lkG|$w*pi zfawl`EO3Hq_7RUR5MRV{BDbbCGf8vo=1(TPRrh0Ek%0_3<5LBoK>a0uV9Ak)E9Z}O zQxXH;Ky(AGrZGW~>`Rr`{B{j-4B^82&J(;d;nEx&enGpJtd*i2&+nlDgngNw^B@{b lj5UbHec8zsMNyQ$;RYI9HmtYj?H>RD002ovPDHLkV1gGNdAtAs literal 0 HcmV?d00001 -- 2.51.2