From: Julian Giebel Date: Tue, 14 Jan 2025 22:41:04 +0000 (+0100) Subject: Adds omnisexual pin (#34439) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=a967fc748613fd34a9f6144ef6f702e30fb4f1a8;p=space-station-14.git 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> --- 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 0000000000..af88fc50ae Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/omni-equipped-NECK.png differ 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 0000000000..fea9075144 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/omni.png differ