From: TakoDragon <69509841+BackeTako@users.noreply.github.com> Date: Tue, 1 Oct 2024 21:07:48 +0000 (+0200) Subject: Gay Boykissers (#32584) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=23f4bc1d7a39b1e4d3e441c587449604314dcd90;p=space-station-14.git Gay Boykissers (#32584) --- diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml index eb948d299c..9f0ff79b20 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml @@ -72,6 +72,22 @@ neck: - state: bi-equipped +- type: entity + parent: ClothingNeckPinBase + id: ClothingNeckGayPin + name: gay pin + description: Be gay~ do crime. + components: + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + layers: + - state: gay + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi + clothingVisuals: + neck: + - state: gay-equipped + - type: entity parent: ClothingNeckPinBase id: ClothingNeckIntersexPin diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 0aaaaf99b5..3f735cf98b 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -144,6 +144,7 @@ - id: ClothingNeckAromanticPin - id: ClothingNeckAsexualPin - id: ClothingNeckBisexualPin + - id: ClothingNeckGayPin - id: ClothingNeckIntersexPin - id: ClothingNeckLesbianPin - id: ClothingNeckNonBinaryPin diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index c91108124f..ea70828ce4 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -95,6 +95,12 @@ back: - ClothingNeckBisexualPin +- type: loadout + id: ClothingNeckGayPin + storage: + back: + - ClothingNeckGayPin + - type: loadout id: ClothingNeckIntersexPin storage: diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 9bf0b4eb3d..1483fc3c11 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -18,6 +18,7 @@ - ClothingNeckAromanticPin - ClothingNeckAsexualPin - ClothingNeckBisexualPin + - ClothingNeckGayPin - ClothingNeckIntersexPin - ClothingNeckLesbianPin - ClothingNeckNonBinaryPin diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay-equipped.png new file mode 100644 index 0000000000..d5127a0218 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay-equipped.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay.png new file mode 100644 index 0000000000..580d390fce Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json index 46b0496399..aab069b547 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", + "copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay", "size": { "x": 32, "y": 32 @@ -28,6 +28,13 @@ "name": "bi-equipped", "directions": 4 }, + { + "name": "gay" + }, + { + "name": "gay-equipped", + "directions": 4 + }, { "name": "inter" },