From: Momo Date: Sat, 8 Mar 2025 15:21:21 +0000 (-0500) Subject: Aroace pride pin, scarf, and cloak (#35718) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=2412b4f63442e74d3457dd22f66e5b001ca09b26;p=space-station-14.git Aroace pride pin, scarf, and cloak (#35718) cloak, pin, and scarf added yayyyy --- diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml index c31ba95565..80c1408c53 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml @@ -5,6 +5,7 @@ ClothingNeckAllyPin: 3 ClothingNeckAromanticPin: 3 ClothingNeckAsexualPin: 3 + ClothingNeckAroacePin: 3 ClothingNeckBisexualPin: 3 ClothingNeckGayPin: 3 ClothingNeckIntersexPin: 3 @@ -21,6 +22,7 @@ PlushieSharkGrey: 2 ClothingNeckScarfStripedAce: 2 ClothingNeckScarfStripedAro: 2 + ClothingNeckScarfStripedAroace: 2 ClothingNeckScarfStripedBiSexual: 2 ClothingNeckScarfStripedGay: 2 ClothingNeckScarfStripedInter: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index 02a8ec62b1..facafd0458 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -226,6 +226,15 @@ - type: Sprite sprite: Clothing/Neck/Cloaks/aro.rsi +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakAroace + name: aeropilot's cloak # thank you happyman442 this was the best name idea ever + description: Cloak awarded to Nanotrasen's finest pilots on planets with inhabitable atmospheres. + components: + - type: Sprite + sprite: Clothing/Neck/Cloaks/aroace.rsi + - type: entity parent: ClothingNeckBase id: ClothingNeckCloakBi diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml index ea781fb3f3..563a94779b 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml @@ -45,6 +45,17 @@ - type: Clothing equippedPrefix: aro +- type: entity + parent: ClothingNeckPinBase + id: ClothingNeckAroacePin + name: aroace pin + description: Be aroace do crime. + components: + - type: Sprite + state: aroace + - type: Clothing + equippedPrefix: aroace + - type: entity parent: ClothingNeckPinBase id: ClothingNeckAsexualPin diff --git a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml index 659bce9964..22f92c4f21 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml @@ -153,6 +153,17 @@ - type: Clothing sprite: Clothing/Neck/Scarfs/PrideScarfs/aro.rsi +- type: entity + parent: ClothingScarfBase + id: ClothingNeckScarfStripedAroace + name: striped aroace scarf + description: A stylish striped aroace scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks. + components: + - type: Sprite + sprite: Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi + - type: Clothing + sprite: Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi + - type: entity parent: ClothingScarfBase id: ClothingNeckScarfStripedBiSexual diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 78f7aed89d..289fee8596 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -104,6 +104,7 @@ - id: ClothingNeckCloakGoliathCloak - id: ClothingNeckCloakAce - id: ClothingNeckCloakAro + - id: ClothingNeckCloakAroace - id: ClothingNeckCloakBi - id: ClothingNeckCloakIntersex - id: ClothingNeckCloakLesbian @@ -144,6 +145,7 @@ - id: ClothingNeckAllyPin - id: ClothingNeckAromanticPin - id: ClothingNeckAsexualPin + - id: ClothingNeckAroacePin - id: ClothingNeckBisexualPin - id: ClothingNeckGayPin - id: ClothingNeckIntersexPin diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index 51a96c06d3..68eea05131 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -124,6 +124,12 @@ back: - ClothingNeckAsexualPin +- type: loadout + id: ClothingNeckAroacePin + storage: + back: + - ClothingNeckAroacePin + - type: loadout id: ClothingNeckBisexualPin storage: diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index fc73ffb9b9..bcdd592007 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -22,6 +22,7 @@ - ClothingNeckAllyPin - ClothingNeckAromanticPin - ClothingNeckAsexualPin + - ClothingNeckAroacePin - ClothingNeckBisexualPin - ClothingNeckGayPin - ClothingNeckIntersexPin diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/equipped-NECK.png new file mode 100644 index 0000000000..a4dcaedee7 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/icon.png new file mode 100644 index 0000000000..9128954cb6 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/inhand-left.png new file mode 100644 index 0000000000..1d96f75048 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/inhand-right.png new file mode 100644 index 0000000000..21fb10e4fc Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/meta.json new file mode 100644 index 0000000000..f7c8c426fb --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Base made by superfreak9111 on discord for Space Station 14, recoloured by momochitters", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aroace-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aroace-equipped-NECK.png new file mode 100644 index 0000000000..6d24b8e0e1 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aroace-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aroace.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aroace.png new file mode 100644 index 0000000000..a241f4c776 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aroace.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 a9e20917af..a25719fabe 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", + "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", "size": { "x": 32, "y": 32 @@ -21,6 +21,13 @@ "name": "aro-equipped-NECK", "directions": 4 }, + { + "name": "aroace" + }, + { + "name": "aroace-equipped-NECK", + "directions": 4 + }, { "name": "asex" }, diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/equipped-NECK.png new file mode 100644 index 0000000000..b361d17187 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/icon.png new file mode 100644 index 0000000000..40da622c6b Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/inhand-left.png new file mode 100644 index 0000000000..d21cedcbcb Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/inhand-right.png new file mode 100644 index 0000000000..d4c4a3982d Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/meta.json new file mode 100644 index 0000000000..b226dc0349 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da | In hand sprites sprited by PuroSlavKing (Github) for Space Station 14, recoloured by momochitters", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}