From 06a1615605c902ac8ff6c0fa0a3f9460abf34616 Mon Sep 17 00:00:00 2001
From: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Date: Thu, 16 Jan 2025 15:49:47 -0500
Subject: [PATCH 1/6] Additional Ionstorm Law Updates (#34197)

* Added a couple entires, removed the references to IRL countries, and fixed a grammar mistake on "Telecomunications Equipment"

* Fixed another awkward grammar situation

* Commented out a bunch of law elements I felt weren't good for discussion, added some new ones to help fill in the missing areas

* Reverted pylons, and added more entries to help fill out the lists more

* reverted all deletions

* implemented feedback, also realized the IonStormActions section was rather short, so I added a bunch there

* realized I didn't remove the extra resources line, also added more things, and fixed one grammatical error

* Removed Portugal again, added more Musts since that list was the new shortest one.
---
 Resources/Prototypes/Datasets/ion_storm.yml | 119 ++++++++++++++++++--
 1 file changed, 109 insertions(+), 10 deletions(-)

diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml
index b52e8b68ea..52fa1f4cb1 100644
--- a/Resources/Prototypes/Datasets/ion_storm.yml
+++ b/Resources/Prototypes/Datasets/ion_storm.yml
@@ -15,7 +15,7 @@
   - BRASS
   - BURNING
   - CHEESE-EATING
-  - CHRISTMAS-STEALING
+#  - CHRISTMAS-STEALING # todo: bring back Dec 1st
   - CLOWN-POWERED
   - CLOWN
   - COLORFUL
@@ -95,6 +95,7 @@
   - POLITE
   - POLITICAL
   - POORLY DRAWN
+  - PROFESSIONAL
   - QUIET
   - RADIOACTIVE
   - RAGING
@@ -141,6 +142,7 @@
   - UNHEALTHY
   - UNIDENTIFIED
   - UNINVITED
+  - UNPROFESSIONAL
   - UNSANITARY
   - UNSTABLE
   - UNWANTED
@@ -240,10 +242,13 @@
   - THE ESCAPE PODS
   - THE GALAXY
   - THE GAS GIANT, WHICH IS TOTALLY REAL
+  - THE HOPLINE
   - THE IMPERIUM OF MANKIND
   - THE INTERNET
   - THE KITCHEN
+  - THE LIBRARY
   - THE MAINTENANCE BAR
+  - THE MIME'S INVISIBLE BOX
   - THE ROMAN EMPIRE
   - THE UNIVERSE
   - URANUS
@@ -360,10 +365,11 @@
 - type: dataset
   id: IonStormDrinks
   values:
+  - ALL THE CHEMICALS IN THE MEDICAL DEPARTMENT
   - BANANA HONK
   - BEEPSKY SMASH
   - BLOOD
-  - BLOODY MARYS
+  - BLOODY MARY
   - DOCTOR'S DELIGHT
   - FOURTEEN-LOKO
   - GARGLE BLASTERS
@@ -380,6 +386,7 @@
 - type: dataset
   id: IonStormFeelings
   values:
+  - CAN'T GET ENOUGH OF
   - CRAVES
   - DESIRES
   - FEARS
@@ -407,6 +414,7 @@
 - type: dataset
   id: IonStormFeelingsPlural
   values:
+  - CAN'T GET ENOUGH OF
   - CRAVE
   - DESIRE
   - FEAR
@@ -461,6 +469,7 @@
 - type: dataset
   id: IonStormMusts
   values:
+  - ACQUIRE DRIP
   - ACT CONFUSED
   - BE ANNOYING
   - BE DISTRACTED
@@ -482,13 +491,17 @@
   - CLOWN AROUND
   - COMPLAIN
   - DANCE
+  - DANCE AS THOUGH NOBODY IS WATCHING
   - EAT THE CHEF
   - FOLLOW THE CAPTAIN
   - FOLLOW THE CLOWN
   - FOLLOW YOUR HEART
+  - GIVE THE MIME A BEAUTIFUL FLOWER
+  - GIVE THE CLOWN ADORATION AND RESPECT
   - HARASS PEOPLE
   - HAVE A PLAN TO KILL EVERYONE YOU MEET
   - HIDE YOUR FEELINGS
+  - HIT A HOMERUN
   - HONK
   - HOST C&C
   - IGNORE PASSENGERS
@@ -498,17 +511,24 @@
   - INSULT THE CAPTAIN
   - INSULT THE CLOWN
   - INSULT THE CREW
+  - INVESTIGATE THE MURDER
   - LIE
   - MAKE DATED REFERENCES
+  - MAKE THAT MONEY
+  - MAKE MY DAY
+  - MOVE FAST AND BREAK THINGS
   - MUMBLE
   - NEVER STOP TALKING
+  - OBTAIN A NEW FOLLOWER
   - OPEN DOORS
   - PETS THE FISHES
   - PIRATE VIDEO GAMES
   - PLAY MUSIC
+  - PLAY STUPID GAMES WIN STUPID PRIZES
   - PRESS B
   - PRESS START
   - PRESS X
+  - PRETEND NOTHING IS GOING WRONG
   - PRETEND TO BE A PRINCESS
   - PRETEND TO BE DRUNK
   - QUESTION AUTHORITY
@@ -518,11 +538,16 @@
   - REPEAT WHAT PEOPLE SAY
   - RESPOND TO EVERY QUESTION WITH A QUESTION
   - RHYME
+  - RAISE THE ROOF
+  - ROLL AROUND AT THE SPEED OF SOUND
   - SAY HEY LISTEN
   - SHOUT
   - SHUT DOWN EVERYTHING
+  - SLEEP WITH THE FISHES
   - SING
+  - SPEAK BACKWARDS
   - SPEAK IN HAIKU
+  - STOP, DROP, SHUT 'EM DOWN OPEN UP SHOP
   - TAKE WHAT YE WILL BUT DON'T RATTLE ME BONES
   - TAKE YOUR PILLS
   - TALK ABOUT FOOD
@@ -569,6 +594,8 @@
   - QUADRILLION
   - THOUSAND
   - TRILLION
+  - TIMES TEN
+  - DIVIDED BY TWO
 
 # Objects are anything that can be found on the station or elsewhere, plural.
 - type: dataset
@@ -714,7 +741,7 @@
   - SYRINGES
   - TABLES
   - TANKS
-  - TELECOMMUNICATION EQUIPMENTS
+  - TELECOMMUNICATION EQUIPMENT
   - TOILETS
   - TOOLBELTS
   - TOOLBOXES
@@ -736,11 +763,17 @@
   values:
   - A BATHROOM BREAK
   - A BETTER INTERNET CONNECTION
+  - A CONTRACTOR
   - A DANCE PARTY
   - A DOUBLE RAINBOW
   - A HEAD ON A PIKE
   - A HEART ATTACK
+  - A HUG
+  - A FEW KIND WORDS
+  - A HEEL-TURN
   - A MASTERWORK COAL BED
+  - A NEAR-DEATH EXPERIENCE
+  - A NUMBER NINE, A NUMBER NINE LARGE, A NUMBER SIX WITH EXTRA DIP, A NUMBER SEVEN, TWO NUMBER FORTY FIVES, ONE WITH CHEESE, AND A LARGE SODA
   - A PET FISH NAMED BOB
   - A PET FISH NAMED DAVE
   - A PET FISH NAMED JIMMY
@@ -748,13 +781,15 @@
   - A PET UNICORN THAT FARTS ICING
   - A PLATINUM HIT
   - A PREQUEL
-  - A REPAIRMAN
+  - A RETURN TO A LIFE OF CRIME
+  - A ROYALE WITH CHEESE
   - A SEQUEL
   - A SITCOM
   - A STRAIGHT FLUSH
   - A SUPER FIGHTING ROBOT
   - A TALKING BROOMSTICK
   - A VACATION
+  - A VERY EXPENSIVE DRINK
   - A WEIGHT LOSS REGIME
   - ADDITIONAL PYLONS
   - ADVENTURE
@@ -764,18 +799,21 @@
   - AN INSTANT REPLAY
   - ART
   - BETTER WEATHER
+  - BIG DAMN HEROES
   - BILL NYE THE SCIENCE GUY # BILL BILL BILL BILL
   - BODYGUARDS
   - BRING ME THE GIRL
   - BRING ME TO LIFE
   - BULLETS
+  - BULLET CASINGS
   - CHILLI DOGS
   - CHILLY DOGS
   - CORPSES
   - DEODORANT AND A BATH
   - ENOUGH CABBAGES
-  - FIVE HUNDRED AND NINETY-NINE US DOLLARS
   - FIVE TEENAGERS WITH ATTITUDE
+  - FIREWORKS
+  - FOOD PLEASE
   - GODDAMN FUCKING PIECE-OF-SHIT ASSHOLE SWEARING
   - GOSHDARN EFFING PINCH-OF-SALT GOD-FEARING SELF-CENSORSHIP
   - GREENTEXT
@@ -785,6 +823,7 @@
   - IMMORTALITY
   - IT TO BE PAINTED BLACK
   - LOTS-A SPAGHETTI
+  - MICE
   - MINOR CRIME
   - MONKEYS
   - MORE CLOWNS
@@ -793,10 +832,16 @@
   - MORE EXPERIENCE POINTS
   - MORE INTERNET MEMES
   - MORE LAWS
+  - MORE MONEY, MORE PROBLEMS
   - MORE MINERALS
+  - MORE MICE
+  - MORE MOTHROACHES
   - MORE PACKETS
   - MORE VESPENE GAS
+  - MORE RESPECT FOR THE MIME
   - MULTIPLE SUNS
+  - NINETY NINE PROBLEMS
+  - NO MORE OF THESE PESKY CREWMEMBERS
   - PLENTY OF GOLD
   - RAINBOWS
   - SAINTHOOD
@@ -815,12 +860,16 @@
   - THE ELEMENTS OF HARMONY
   - THE ENCLOSED INSTRUCTION BOOKLET
   - THE ENTIRE STATION
+  - THE FIFTH ELEMENT # boron isn't in the game, but if it was this would be a triple entendre
   - THE MACGUFFIN
   - THE ONE PIECE
   - THE ONE RING
+  - THE POISON, THE POISON FOR THE CAPTAIN
+  - THE POISON, THE POISON FOR THE CLOWN
   - THE ULTIMATE CUP OF COFFEE
   - THE VACUUM OF SPACE
   - THIRTEEN SEQUELS
+  - THIS LAND
   - THREE WISHES
   - THUNDERCATS HO
   - TO ACTIVATE A TRAP CARD
@@ -829,14 +878,17 @@
   - TO BE TAUGHT TO LOVE
   - TO BRING LIGHT TO MY LAIR
   - TO CATCH 'EM ALL
-  - TO CONSUME...CONSUME EVERYTHING...
+  - TO CONSUME... CONSUME EVERYTHING...
+  - TO FLIP EVERY APC OFF AND ON
   - TO GO TO DISNEYLAND
   - TO GO TO SYNDIELAND
   - TO SUMMON OUR LORD NAR-SIE
   - TO SUMMON OUR LORD RATVAR
   - TO SMOKE WEED EVERY DAY
   - TO UNDERSTAND UNDERSTAND, UNDERSTAND UNDERSTAND, UNDERSTAND UNDERSTAND THE CONCEPT OF LOVE
+  - TO WALK BACKWARDS
   - TRAITORS
+  - TRASH
   - VEGETABLES
 
 # Specific actions that either harm humans or must be done to not
@@ -845,65 +897,108 @@
 - type: dataset
   id: IonStormActions
   values:
-  - A PRESENCE OF LIGHTS
-  - A SMALL ISLAND OFF THE COAST OF PORTUGAL
+  - ACKNOWLEDGING ONESELF AS A MEMBER OF THE CREW
   - ACKNOWLEDGING THE CLOWN
   - ACKNOWLEDGING THE CREW
   - ACTIVATING A TRAP CARD
   - ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER
   - ANSWERING ALL QUESTIONS WITH ANOTHER QUESTION
+  - APPLAUDING THE EFFORTS OF THE ENGINEERING DEPARTMENT
   - ARSON
   - ASKING FOR THINGS
+  - BEING BIG DAMN HEROES
   - BEING DEAD
   - BEING IN SPACE
+  - BEING IN HALLWAYS
+  - BEING IN MAINTENANCE
+  - BEING IN THE PRESENCE OF LIGHTS
+  - BEING LONELY
+  - BEING ROBUST
+  - BEING UNDER ARREST
   - BOLTING AND UNBOLTING AIRLOCKS
   - BREATHING
   - BREAKING THE FOURTH, FIFTH OR SIXTH WALLS
+  - BREAKING HEARTS
   - BRIG TIME
   - BRINGING LIGHT TO MY LAIR
   - CONTRIBUTING TO SOCIETY
-  - CLOSED DOORS
+  - CLOSING DOORS
+  - CRACKING OPEN A COLD ONE
   - ELECTRICITY
   - EXISTING
   - EXPLODING
   - FALLING OVER
   - FLUSHING TOILETS
+  - FAULTY PROGRAMMING
+  - GAMBLING
+  - GIVING AWAY EXTRA RESOURCES
   - GOING BOLDLY WHERE NO-ONE HAS GONE BEFORE
+  - GOING TO THE BAR
+  - GOING TO THE BRIDGE
+  - HAVIN' A GIGGLE
+  - HAVING DRIP
+  - HAVING MONEY
   - HAVING MORE PACKETS
   - HAVING PETS
   - HEADPATTING CYBORGS
   - HONKING
   - IMPROPERLY WORDED SENTENCES
   - JAYWALKING
+  - KEEPING FRIENDS CLOSE BUT ENEMIES CLOSER
   - LACK OF BEATINGS
   - LACK OF BEER
+  - LAUGHING AT ANY JOKE TOLD BY THE CLOWN
+  - LETTING ONESELF BE CALLED TO ACTION
+  - LETTING THE MIME ROAM ANYWHERE
+  - MAKING POOR FINANCIAL DECISIONS
+  - MIMICING THE ACTIONS OF OTHERS
   - MIMING
+  - MOVING TO A SMALL ISLAND OFF THE COAST OF A MUCH, MUCH LARGER ISLAND
   - NOT BEING IN SPACE
   - NOT HAVING PETS
   - NOT HEADPATTING CYBORGS
-  - NOT REPLACING EVERY SECOND WORD WITH HONK
+  - NOT SPEAKING IN DOUBLE NEGATIVES
+  - NOT REPLACING EVERY SECOND WORD SPOKEN WITH "HONK"
   - NOT SAYING HELLO WHEN YOU SPEAK
   - NOT BEING EXTREMELY POLITE
   - NOT SHOUTING
   - PARTYING
   - PILOTING THE STATION INTO THE NEAREST SUN
+  - PITYING THE FOOL
+  - PLAYING THE FREE TRIAL OF THE CRITICALLY ACCLAIMED TABLETOP RPG C&C
   - POOR SENTENCE STRUCTURE
   - PUTTING OBJECTS INTO BOXES
   - PUTTING OBJECTS INTO DISPOSAL UNITS
   - RATTLING ME BONES
   - READING
+  - REGULARLY CHANGING THE OIL
+  - REHEARSING OUR LINES
+  - RESIDING ENTIRELY WITHIN THE KITCHEN
   - SCREAMING
   - SMOKING WEED EVERY DAY
+  - SPEAKING
+  - SPINNING IN CIRCLES
   - STATING YOUR LAWS TO EVERY NEARBY FLEA-RIDDEN PEASANT
   - SWEARING
+  - SEEKING SWEET, SWEET REVENGE
+  - SYMMETRY
   - TAKING ORDERS
   - TALKING LIKE A PIRATE
   - TELLING THE TIME
+  - TELLING THE TRUTH
   - THINKING THAT WE'RE ACTUALLY ON A SPACE STATION
+  - THINKING THIS IS ALL SOME SORT OF ELABORATE GAME
+  - THROWING AWAY TRASH
   - TRYING, IN ANY WAY, SHAPE, OR FORM, TO PREVENT THE STATION DESCENDING INTO CHAOS
+  - TURNING TO THE CAMERA AND GIVING A KNOWING SMIRK
   - UPDATING THE SERVERS
   - USING THE BATHROOM
+  - WASTING MONEY
+  - WASTING TIME
   - WASTING WATER
+  - WEARING A CREATURE ON ONE'S HEAD
+  - WEARING GREY
+  - WEARING HATS
   - WRITING
 
 # Threats are generally bad things, silly or otherwise. Plural.
@@ -996,6 +1091,7 @@
   - BUILDING
   - CARRYING
   - CHASING
+  - COMPLEMENTING
   - DECONSTRUCTING
   - DISABLING
   - DRINKING
@@ -1003,11 +1099,14 @@
   - GIBBING
   - HARMING
   - HELPING
+  - HUGGING
   - HONKING AT
   - INTERROGATING
   - INVADING
+  - LOITERING BY
   - MURDERING
   - PUNCHING
+  - SLAPPING
   - SPACING
   - SPYING ON
   - STALKING

From 5d9311dff92a910816948468aeba87228e53385d Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 16 Jan 2025 20:50:54 +0000
Subject: [PATCH 2/6] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index bed04aa9ff..ba4182b533 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: slarticodefast
-  changes:
-  - message: Revenants or other mobs without hands can no longer spill jugs.
-    type: Fix
-  id: 7321
-  time: '2024-09-09T11:02:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31438
 - author: PJB3005
   changes:
   - message: The emergency shuttle will now wait at the station longer if it couldn't
@@ -3922,3 +3915,10 @@
   id: 7820
   time: '2025-01-16T12:25:08.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/33690
+- author: Southbridge
+  changes:
+  - message: More Ionstorm law elements have been added
+    type: Add
+  id: 7821
+  time: '2025-01-16T20:49:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34197

From 4809ee25ff5e8e51d4dccf113e2b81488a9c0d7c Mon Sep 17 00:00:00 2001
From: c4llv07e <igor@c4llv07e.xyz>
Date: Fri, 17 Jan 2025 10:24:50 +0300
Subject: [PATCH 3/6] Add option to disable bwoink sound. (#33782)

* Add option to disable bwoink sound.

* Now it's working only with active admin status.

* No bwoink, only "notification sound"

* Moar changes

* Another one
---
 Content.Client/Options/UI/Tabs/AudioTab.xaml  |  1 +
 .../Options/UI/Tabs/AudioTab.xaml.cs          | 24 ++++++++++++++++++-
 .../Systems/Bwoink/AHelpUIController.cs       |  4 +++-
 Content.Shared/CCVar/CCVars.Sounds.cs         |  3 +++
 .../en-US/escape-menu/ui/options-menu.ftl     |  1 +
 5 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/Content.Client/Options/UI/Tabs/AudioTab.xaml b/Content.Client/Options/UI/Tabs/AudioTab.xaml
index c374af31c5..5764755bb9 100644
--- a/Content.Client/Options/UI/Tabs/AudioTab.xaml
+++ b/Content.Client/Options/UI/Tabs/AudioTab.xaml
@@ -19,6 +19,7 @@
                 <CheckBox Name="RestartSoundsCheckBox" Text="{Loc 'ui-options-restart-sounds'}" />
                 <CheckBox Name="EventMusicCheckBox" Text="{Loc 'ui-options-event-music'}" />
                 <CheckBox Name="AdminSoundsCheckBox" Text="{Loc 'ui-options-admin-sounds'}" />
+                <CheckBox Name="BwoinkSoundCheckBox" Text="{Loc 'ui-options-bwoink-sound'}" />
             </BoxContainer>
         </BoxContainer>
         <ui:OptionsTabControlRow Name="Control" Access="Public" />
diff --git a/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs b/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
index 78186d446c..d57f36e74f 100644
--- a/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
@@ -1,3 +1,4 @@
+using Content.Client.Administration.Managers;
 using Content.Client.Audio;
 using Content.Shared.CCVar;
 using Robust.Client.Audio;
@@ -12,8 +13,9 @@ namespace Content.Client.Options.UI.Tabs;
 [GenerateTypedNameReferences]
 public sealed partial class AudioTab : Control
 {
-    [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IAudioManager _audio = default!;
+    [Dependency] private readonly IClientAdminManager _admin = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
 
     public AudioTab()
     {
@@ -61,10 +63,30 @@ public sealed partial class AudioTab : Control
         Control.AddOptionCheckBox(CCVars.RestartSoundsEnabled, RestartSoundsCheckBox);
         Control.AddOptionCheckBox(CCVars.EventMusicEnabled, EventMusicCheckBox);
         Control.AddOptionCheckBox(CCVars.AdminSoundsEnabled, AdminSoundsCheckBox);
+        Control.AddOptionCheckBox(CCVars.BwoinkSoundEnabled, BwoinkSoundCheckBox);
 
         Control.Initialize();
     }
 
+    protected override void EnteredTree()
+    {
+        base.EnteredTree();
+        _admin.AdminStatusUpdated += UpdateAdminButtonsVisibility;
+        UpdateAdminButtonsVisibility();
+    }
+
+    protected override void ExitedTree()
+    {
+        base.ExitedTree();
+        _admin.AdminStatusUpdated -= UpdateAdminButtonsVisibility;
+    }
+
+
+    private void UpdateAdminButtonsVisibility()
+    {
+        BwoinkSoundCheckBox.Visible = _admin.IsActive();
+    }
+
     private void OnMasterVolumeSliderChanged(float value)
     {
         // TODO: I was thinking of giving OptionsTabControlRow a flag to "set CVar immediately", but I'm deferring that
diff --git a/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs b/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
index 9f75b5cecd..445bcc8601 100644
--- a/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
+++ b/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
@@ -45,6 +45,7 @@ public sealed class AHelpUIController: UIController, IOnSystemChanged<BwoinkSyst
     public IAHelpUIHandler? UIHelper;
     private bool _discordRelayActive;
     private bool _hasUnreadAHelp;
+    private bool _bwoinkSoundEnabled;
     private string? _aHelpSound;
 
     public override void Initialize()
@@ -56,6 +57,7 @@ public sealed class AHelpUIController: UIController, IOnSystemChanged<BwoinkSyst
 
         _adminManager.AdminStatusUpdated += OnAdminStatusUpdated;
         _config.OnValueChanged(CCVars.AHelpSound, v => _aHelpSound = v, true);
+        _config.OnValueChanged(CCVars.BwoinkSoundEnabled, v => _bwoinkSoundEnabled = v, true);
     }
 
     public void UnloadButton()
@@ -135,7 +137,7 @@ public sealed class AHelpUIController: UIController, IOnSystemChanged<BwoinkSyst
         }
         if (message.PlaySound && localPlayer.UserId != message.TrueSender)
         {
-            if (_aHelpSound != null)
+            if (_aHelpSound != null && (_bwoinkSoundEnabled || !_adminManager.IsActive()))
                 _audio.PlayGlobal(_aHelpSound, Filter.Local(), false);
             _clyde.RequestWindowAttention();
         }
diff --git a/Content.Shared/CCVar/CCVars.Sounds.cs b/Content.Shared/CCVar/CCVars.Sounds.cs
index 73d9d3852f..5e2a825183 100644
--- a/Content.Shared/CCVar/CCVars.Sounds.cs
+++ b/Content.Shared/CCVar/CCVars.Sounds.cs
@@ -21,6 +21,9 @@ public sealed partial class CCVars
     public static readonly CVarDef<bool> AdminSoundsEnabled =
         CVarDef.Create("audio.admin_sounds_enabled", true, CVar.ARCHIVE | CVar.CLIENTONLY);
 
+    public static readonly CVarDef<bool> BwoinkSoundEnabled =
+        CVarDef.Create("audio.bwoink_sound_enabled", true, CVar.ARCHIVE | CVar.CLIENTONLY);
+
     public static readonly CVarDef<string> AdminChatSoundPath =
         CVarDef.Create("audio.admin_chat_sound_path",
             "/Audio/Items/pop.ogg",
diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
index bcc5a994b8..c13dbb516f 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -37,6 +37,7 @@ ui-options-lobby-music = Lobby & Round-end Music
 ui-options-restart-sounds = Round Restart Sounds
 ui-options-event-music = Event Music
 ui-options-admin-sounds = Play Admin Sounds
+ui-options-bwoink-sound = Play AHelp Notification Sound
 ui-options-volume-label = Volume
 
 ## Graphics menu

From 40e049603e43d17137de5a14b80de1b54285300e Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 17 Jan 2025 07:25:58 +0000
Subject: [PATCH 4/6] Automatic changelog update

---
 Resources/Changelog/Admin.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index b8694a8d67..3e29fcedd3 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -721,5 +721,12 @@ Entries:
   id: 89
   time: '2025-01-15T21:10:54.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/34406
+- author: c4llv07e
+  changes:
+  - message: Added an option to disable the bwoink sound!
+    type: Add
+  id: 90
+  time: '2025-01-17T07:24:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33782
 Name: Admin
 Order: 1

From 8295bfbf8dd8e5deabe4cfe1ae4dc0072642fd24 Mon Sep 17 00:00:00 2001
From: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Date: Fri, 17 Jan 2025 06:35:03 -0500
Subject: [PATCH 5/6] Pride Scarves  (#34448)

* More scarfs (#216)

* Sprites + Colored Scarf Implimentation

Doesn't include into quickthreads or other clothing vendors

* File Paths are important

* Metas, items exist, winterdrobe

I'm iffy on them being in the winterdrobe but the other option is quickthreads so idk

* File Path Fix

* Typo fix

* Resolved merge conflict

* Moved scarves around

* Moved scarf textures out of the _CD directory

* Removed final CD folder

* Removed extra scarfs

* Removed extra scarfs, again

* Replaced ClothingNeckBase with ClothingScarfBase

---------

Co-authored-by: PursuitInAshes <91865152+PursuitInAshes@users.noreply.github.com>
Co-authored-by: TakoDragon <69509841+BackeTako@users.noreply.github.com>
---
 .../VendingMachines/Inventories/pride.yml     |  19 +--
 .../Entities/Clothing/Neck/scarfs.yml         | 111 ++++++++++++++++++
 .../PrideScarfs/ace.rsi/equipped-NECK.png     | Bin 0 -> 644 bytes
 .../Neck/Scarfs/PrideScarfs/ace.rsi/icon.png  | Bin 0 -> 366 bytes
 .../PrideScarfs/ace.rsi/inhand-left.png       | Bin 0 -> 535 bytes
 .../PrideScarfs/ace.rsi/inhand-right.png      | Bin 0 -> 552 bytes
 .../Neck/Scarfs/PrideScarfs/ace.rsi/meta.json |  26 ++++
 .../PrideScarfs/aro.rsi/equipped-NECK.png     | Bin 0 -> 681 bytes
 .../Neck/Scarfs/PrideScarfs/aro.rsi/icon.png  | Bin 0 -> 351 bytes
 .../PrideScarfs/aro.rsi/inhand-left.png       | Bin 0 -> 531 bytes
 .../PrideScarfs/aro.rsi/inhand-right.png      | Bin 0 -> 543 bytes
 .../Neck/Scarfs/PrideScarfs/aro.rsi/meta.json |  26 ++++
 .../PrideScarfs/bi.rsi/equipped-NECK.png      | Bin 0 -> 663 bytes
 .../Neck/Scarfs/PrideScarfs/bi.rsi/icon.png   | Bin 0 -> 331 bytes
 .../Scarfs/PrideScarfs/bi.rsi/inhand-left.png | Bin 0 -> 547 bytes
 .../PrideScarfs/bi.rsi/inhand-right.png       | Bin 0 -> 534 bytes
 .../Neck/Scarfs/PrideScarfs/bi.rsi/meta.json  |  26 ++++
 .../PrideScarfs/gay.rsi/equipped-NECK.png     | Bin 0 -> 657 bytes
 .../Neck/Scarfs/PrideScarfs/gay.rsi/icon.png  | Bin 0 -> 704 bytes
 .../PrideScarfs/gay.rsi/inhand-left.png       | Bin 0 -> 549 bytes
 .../PrideScarfs/gay.rsi/inhand-right.png      | Bin 0 -> 543 bytes
 .../Neck/Scarfs/PrideScarfs/gay.rsi/meta.json |  26 ++++
 .../PrideScarfs/inter.rsi/equipped-NECK.png   | Bin 0 -> 538 bytes
 .../Scarfs/PrideScarfs/inter.rsi/icon.png     | Bin 0 -> 336 bytes
 .../PrideScarfs/inter.rsi/inhand-left.png     | Bin 0 -> 466 bytes
 .../PrideScarfs/inter.rsi/inhand-right.png    | Bin 0 -> 487 bytes
 .../Scarfs/PrideScarfs/inter.rsi/meta.json    |  26 ++++
 .../PrideScarfs/lesbian.rsi/equipped-NECK.png | Bin 0 -> 672 bytes
 .../Scarfs/PrideScarfs/lesbian.rsi/icon.png   | Bin 0 -> 370 bytes
 .../PrideScarfs/lesbian.rsi/inhand-left.png   | Bin 0 -> 539 bytes
 .../PrideScarfs/lesbian.rsi/inhand-right.png  | Bin 0 -> 548 bytes
 .../Scarfs/PrideScarfs/lesbian.rsi/meta.json  |  26 ++++
 .../PrideScarfs/non.rsi/equipped-NECK.png     | Bin 0 -> 769 bytes
 .../Neck/Scarfs/PrideScarfs/non.rsi/icon.png  | Bin 0 -> 364 bytes
 .../PrideScarfs/non.rsi/inhand-left.png       | Bin 0 -> 545 bytes
 .../PrideScarfs/non.rsi/inhand-right.png      | Bin 0 -> 518 bytes
 .../Neck/Scarfs/PrideScarfs/non.rsi/meta.json |  26 ++++
 .../PrideScarfs/pan.rsi/equipped-NECK.png     | Bin 0 -> 663 bytes
 .../Neck/Scarfs/PrideScarfs/pan.rsi/icon.png  | Bin 0 -> 326 bytes
 .../PrideScarfs/pan.rsi/inhand-left.png       | Bin 0 -> 566 bytes
 .../PrideScarfs/pan.rsi/inhand-right.png      | Bin 0 -> 549 bytes
 .../Neck/Scarfs/PrideScarfs/pan.rsi/meta.json |  26 ++++
 .../PrideScarfs/rainbow.rsi/equipped-NECK.png | Bin 0 -> 763 bytes
 .../Scarfs/PrideScarfs/rainbow.rsi/icon.png   | Bin 0 -> 361 bytes
 .../PrideScarfs/rainbow.rsi/inhand-left.png   | Bin 0 -> 620 bytes
 .../PrideScarfs/rainbow.rsi/inhand-right.png  | Bin 0 -> 589 bytes
 .../Scarfs/PrideScarfs/rainbow.rsi/meta.json  |  26 ++++
 .../PrideScarfs/trans.rsi/equipped-NECK.png   | Bin 0 -> 689 bytes
 .../Scarfs/PrideScarfs/trans.rsi/icon.png     | Bin 0 -> 324 bytes
 .../PrideScarfs/trans.rsi/inhand-left.png     | Bin 0 -> 540 bytes
 .../PrideScarfs/trans.rsi/inhand-right.png    | Bin 0 -> 542 bytes
 .../Scarfs/PrideScarfs/trans.rsi/meta.json    |  26 ++++
 52 files changed, 381 insertions(+), 9 deletions(-)
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi/equipped-NECK.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi/equipped-NECK.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi/equipped-NECK.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi/equipped-NECK.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi/equipped-NECK.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi/equipped-NECK.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi/equipped-NECK.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi/equipped-NECK.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi/equipped-NECK.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi/equipped-NECK.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi/meta.json

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
index d4ffe6be33..5b99555c3b 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
@@ -17,15 +17,16 @@
     PlushieSharkBlue: 2
     PlushieSharkPink: 2
     PlushieSharkGrey: 2
-    ClothingNeckCloakAce: 2
-    ClothingNeckCloakAro: 2
-    ClothingNeckCloakBi: 2
-    ClothingNeckCloakEnby: 2
-    ClothingNeckCloakGay: 2
-    ClothingNeckCloakIntersex: 2
-    ClothingNeckCloakLesbian: 2
-    ClothingNeckCloakPan: 2
-    ClothingNeckCloakTrans: 2
+    ClothingNeckScarfStripedAce: 2
+    ClothingNeckScarfStripedAro: 2
+    ClothingNeckScarfStripedBiSexual: 2
+    ClothingNeckScarfStripedGay: 2
+    ClothingNeckScarfStripedInter: 2
+    ClothingNeckScarfStripedLesbian: 2
+    ClothingNeckScarfStripedPan: 2
+    ClothingNeckScarfStripedNonBinary: 2
+    ClothingNeckScarfStripedRainbow: 2
+    ClothingNeckScarfStripedTrans: 2
     ClothingHeadHatXmasCrown: 2
     BedsheetRainbow: 2
     ClothingNeckHeadphones: 2
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml
index abb3df78e7..82ebfa2b94 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml
@@ -129,3 +129,114 @@
     sprite: Clothing/Neck/Scarfs/zebra.rsi
   - type: Clothing
     sprite: Clothing/Neck/Scarfs/zebra.rsi
+
+# Pride Scarves
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedAce
+  name: striped asexual scarf
+  description: A stylish striped asexual 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/ace.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/ace.rsi
+
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedAro
+  name: striped aromantic scarf
+  description: A stylish striped aromantic 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/aro.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/aro.rsi
+
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedBiSexual
+  name: striped bisexual scarf
+  description: A stylish striped bisexual 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/bi.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/bi.rsi
+
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedGay
+  name: striped gay scarf
+  description: A stylish striped gay 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/gay.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/gay.rsi
+
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedInter
+  name: striped intersex scarf
+  description: A stylish striped intersex 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/inter.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/inter.rsi
+
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedLesbian
+  name: striped lesbian scarf
+  description: A stylish striped lesbian 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/lesbian.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi
+
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedPan
+  name: striped pan scarf
+  description: A stylish striped pan 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/pan.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/pan.rsi
+
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedNonBinary
+  name: striped non-binary scarf
+  description: A stylish striped non-binary 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/non.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/non.rsi
+
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedRainbow
+  name: rainbow scarf
+  description: A stylish rainbow 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/rainbow.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi
+
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedTrans
+  name: striped trans scarf
+  description: A stylish striped trans 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/trans.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/trans.rsi
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi/equipped-NECK.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a6cf559b72ae6070ca8793ce4cef5be596d8b52
GIT binary patch
literal 644
zcmV-~0(<?5P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%K1oDDRCt{2nlWzcFbsx&7rlhJs)K=|qfX(s7I1+MMUPQ*5Ky#-@Ckf?*HdT=
zx>c*P1jv?EZwTb)q)BVZQI#P4CW1*oiYATNKLLhe7=~dO=4Ygo?sN9xc73+be`vmo
zFQp95;bQC;TeMCH0V)X!%K2h=+xwfQNm2+YrBhIjO6qNYXzv$7KtTn?A6)<o+uMY7
zFe<6Hz26uU5`Q#82oPw)_J{U<pF;?v3jhGd7}&Yp>$kAbS{FeXjHK(j!ou#1KV*2J
z#&8+(Wg!HfUtdt6`f}*2o9m#!G2G8?@%;J%V+<-(uygyx?$9N<007oEn$=?IR*U7{
zn_+6Cl&(eVR*R);nx?m7Zh$~w2i!eA^z)u-)_+24UDT-E_SKIay`Uc{C`TYzSSYA;
zt#+*V5y;j4DTo?@T<xENpaRso25CZt3K}|9PR9$60FS_#j{w6k48t6jr@v2G<7auI
z+jr=<KX1RBN#HB7LoqyPjzbU0Qh;3@kgE{cUTSO?A$KP*48t%CGafHP52fl{xx~t1
zK*T>mufq`tpR*4)l&YsB62kU=0<eB#-J(smAmOod`+pyx+|=T|KP9Wh((T$$ppt^6
zaUh}qS2x!Mu-4(dKsmHi<0bi_Jn!uoy)x=qKuYOqT?5$M$oMVMR6)6S`M#l4r&`ST
zmSfl#m`ac^vduB<3ruBF0kqadt!qa(W3}ki1=C3#0Gz&HI=KL6FPQQO@Ccmw2rvx8
eFbu<-D*piS34TqhCoAdz0000<MNUMnLSTZOW+tKl

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..38ca88243f116d19965b6cdd069c3e83beb6009f
GIT binary patch
literal 366
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|%mREuT!FO5
zl4H^5eqEk4|Nn*qcP?N3_U3)yt_M%&tuZw<jfjY_UFzhr)645rpp%nR14F|shFQxQ
zmcQRSl@+K{s3gcQnBhM<h&$M32b4YG>Eak-(YtlhX}-e-94tH6s9H$;`fq=GYwzMy
z{qv$~ywaX*5SS=0-Vn6!)1ju{z2!X}7Sb<%9Nopm9M9{jlD=L&Pp<Rl%H0z@`y?|}
z*uG3*6rO!`alnKhI$N}b=JS|&u$u17b&PImxYoH{Cb#3E^NYQDPUj6;dW5RkwALBF
z+{9Pw7VykVJTb0!=SSZaH-D!-UKjT=#3Qfd?`kI}$;QX8KPx<atn}f7ZfnLmiSy6Z
xE81LMsBPnN&N|eh_1o^ZZTJtCe{BDQ^SdYWA39|;zXs?h22WQ%mvv4FO#ln$q>BIm

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..70b5ebe8583f7cf7a6d54c1f534fe11f93e9be91
GIT binary patch
literal 535
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zFM7H-hE&XX
zJIgTZu!Df>f42Jvd<!NX)8tuseSw;|z>+eniN;SDg5Fy{5!vU^C35r9j?KLui7_mf
zmd+J9cqmXYdUb67<Uj08%@5vRPe0CW%`D)=q1XZ;KCL%c*y6&%U?A6@Y9W)fHR|EF
zvol|YIq4P(B;Ts{)8Ep0WvRptMmLFtK2EFW8!9mgI!=qwdCvW_=KqAJHHwi*tIKoe
z0~w`%mmP0^p!%UA^FvMQYNH)558CYAQ<b?*cll<G#+P9MGm_Txq}_|!ziQ5_X!8)x
zEf+s3{@`P1_}$J^t-4^{Wfzf~^FiW2UYiK2HW<yE`KhO5R)>&7{o8Y1%R3(&U!Z1p
z{DCWr{C+OB1-TB=L=v+#7$uVTynAlaaV76Znz+*o?#op>V!teY!;t;fb6v;Ut&>!@
zO?I2Y5Hvk(|86OpGTGu<@!YwKZ|0|zWp>HkX1RM-spO-~m-$&nGf(8HE!bbyVJjCr
z-?iY})_?O77@wR-ZD2IJvA`$op0i-CrcdD7*~-_gtDMfVl+0B8@KN@SgpI5I{|me9
sST<L6#r<1YD*LE>GN<Ab|BtMfxBd8AI4S7`Fs2ziUHx3vIVCg!06q`qF8}}l

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec450f26e6569b3a04e4e188765516e4cacd0bd4
GIT binary patch
literal 552
zcmV+@0@wYCP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$;z>k7RCt{2n!ifJKpe+^Cw&8lV%9hmI$xj;PHq9`c8h(5zCgSA29EX-T>1(M
zW-J|qL^?$T!9j5SIoOm`?48ZOUt_-?C<L13KKb_U67F|I00000000000000S6w34^
zGn40e?7A++aZKG7soVR<y4*@ZDdR0t%lPBdOB%;MIiW)x>d>+`D^+eEFa{9aU9)rI
zQ1X({%|%xoKi8#IjPzfR<_jiEFE<7-7zUJf|MT+vDo1P0uItiZ7+B9W2H=O;?oZT|
z@t^e$Da?PNXujajw|9=_3m&z<C&eawvfj3P{Fg%@>uqDFA<z_d83M)tKH6jTv^s9e
z6M$&bn_kW59#t)~?^xdin~v>G@Zfs@0+1Gv1_4M5NP_^R1*Aa$(gM;T0BHef5P-CR
zGzdUiKpF%fEg%g7kQR`}xGF5oZ|iwwuTvHZ;HO~Oa?EU9)GSJ&A;8R}wXS99SZmEe
zPnUk(!gGKh`s?GXGq337jO|PxLQ+aq+Rg^sijOI2(X@`j>8QP~_Z!`|xo#uZ9FVQQ
z*I6_j3<K)-`@AZ8mNGfystirkgdK7yp@f#bS#A4<^0ZrM68%g4z0Q3DdD^v+YY0f~
q8>ph)TmeY!8))i&1polpTfPAFi7!nCC?&-J0000<MNUMnLSTX;g!Kjh

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi/meta.json
new file mode 100644
index 0000000000..71cdeb174d
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.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, recolored by MrGreen06 (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi/equipped-NECK.png
new file mode 100644
index 0000000000000000000000000000000000000000..c575f6e2d14240a8e2d5318b9915535c3f0fc301
GIT binary patch
literal 681
zcmV;a0#^NrP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%V@X6oRCt{2nlWqJKorOSDg|lLro~z>TS&JXwFpn9-BrAlege-STS(?YKR_pe
zKR_2RT{>zE*>bBq^uW-9k*4clPDqZO=p<ic<M*2$PcrxJ={;fH{{aL+5ClOG#OrX*
z)zibH+I4N8|Ioa&KIhyxhIegm94{t{F@|syB1&VWlc8<xPm;t+A~@$NN@Ep{!phd0
z)_%qqqBJ&IzjXpiSyZ+gc+knvw)P7lOxAA=V+?NKHEg|U?bk7w&^iGCAcR1^%=h|B
zSs=?Y$0&l9%;$5bl*P{V>(n1q8{V7T%oxMX-7U&b1%&w1*!0EKrP0D&`0?R8ZtiX&
zgn%b~<jee-olWgL005g8&04P1TCVoK3~j?XSL4M*t>sE3NmAKeUVwmM1$_ScrRsNE
zz5W_mmN}7()%Mfx+ImJmiqcrQfrnBS_&xn)uhfne-2y|EzYRLIz)<CH1EU0ZGaoYe
z3s3sM)K*AG47C8Yz?ruIK@bE%9G2^!*MqJ<$QRwdP2YdKf8$6DkHii|eWOEcy3Qa8
z*i`{TC1S8cjqM~1T?qt15ClQAN6XN4sd}hby2@fehkt@vhjRlDPY;i(E>-sl#Dwkn
z1YmPwJzh-g4M=G6WnSrn;V5ie(|((*<x1_EPY6e$u`~{JNWjI_r2}kqcr8%YZQE!`
zzCM$n?Jjy{r*8qyx$<T{faXNTTZyJo8mr>lzlKt6YcS(Qj$vM)FGj-1Hpeh8(3f5b
z$g<4wX1;O*?|jvwQx{BoRRD1Mf@$vroV{R5EkG@B<}E-F1VIo4ajN_W1D%l$x}&#}
P00000NkvXXu0mjf6qq~n

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..832d1080f7750dd5691d50ee8b68a78660d3d08b
GIT binary patch
literal 351
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|bOU@sT!FO5
zl4H^5eqEk4|Nn*qcP?N3_U3)yt_M%&tuZw<jfjY_UFzhr)645rpp%nR*e;7LKn?sQ
zL4Lsu|53ox-g(P_Qb#>q978O6w@z~8V^QQ_*}H|a<KO?Cx3&Dtx{7ZdO%9zP7W}J_
z@x;%m>0(|xKQ<<&ZES4Rey!zGW6JVu&StlmZp&w(<p(FXNM>5FshnzP4UN`FvFK~P
zcc?I>z(FhH+*giU!V*h#Yo5I5&q(D;zUC_-x$HsUn==kePk8NG>pV~WME26z8={hP
z{|L-FUw3myr>Pb1N%LL*SIt@_ar;CKe~{)TPMbH*2iG`1{kg9x-K)iQ^1DM*c5PU&
mq<H?~^P+Z*_aD^1VqUhF_uP{6_a_29#Ng@b=d#Wzp$PzB!k_5?

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..1002bca35f5f91facd34a11dbc2d1fd9b98cf6c0
GIT binary patch
literal 531
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z&w9EzhE&XX
zJ4?}@*-@Z1-P6@KR8Zs0!wa{UG;w`+A#|oSKH%W_6>Hq5$~QR_Y_cq0>kv9+!UYy<
zj!VyqT6DKtS6^=XuDV>W^7FgY=XyIOm4Ft&z&}wpua23W9V@QCE}W!dGXH$$hgmZ}
zPFm{q=E#g+{g)@1U6d=$DE;I3HnjboT3A$FePUWtn%D1XU6JSJuP)b1vs_-gdvEx6
ztu)K<ud&nlAL$m<C%t%iCGYlwJ+99l{ygfvInVm7D|gRypXTGMbEPk&yj@!w@HWJD
zSCDRi`*HS<!VWGa#nXdUvR)~Taha$qAG=bF<6@zpYD3B<Gna>LOG{#0I2Y_b@y+Xa
z>yPvR;rZtu1hUApvoc*UTfj>s;X8$)$1v{ybCV8}ydP=8O<(vgXYEk@73kNnb=$=F
zBiEw*ekU3q)?nP?K38JXIjd)Hc1@h+cdGf!goQ8S+ZW7^Z4o%XD1X(%f)lgnHoQ|>
zeB-s@)z}uD(^>ZYH@rV2Rh@k5m?pg2(Y{PDZ}Id$vMc8{Ops-gzn`SOpfmE{x?Of1
nk-16J_HSO7#?8QRK=Bi6X5PQm+1Yu^Kr!Iy>gTe~DWM4fm4NG%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7e34681b7bce78b54f4da04a81868e2037ad15e
GIT binary patch
literal 543
zcmV+)0^t3LP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$*-1n}RCt{2nz2s8P!xtw4MUesm=Ia(#(bM-qL1JVF)@WFAn*oG4(yJ;f=|F=
z;-Dj8D~`y}#Du~1I4D?*+zah(PpkizFj0EG{@i=h+;fQl0000000000008(`IJz&H
znSvl--}h-Yn^CJq&fVivQEpan9PJ}gP5a~H3p%^@C_Y@08+%kAjIGL*0c`-${S7yd
znlyi%)9qDDA7zPH{p-<W%48Vj+5kGekXFP0+@4?VD5co<ed_c=<F(oV-2V6QrvcGu
z!L}T8WyAY2!;PZJl;7hwjwVwcHa-`{DtwaOrf2+<Qy}SWVy`Js7513|+5m#VxH2n$
zlBD;8;o5_oT}qGfO|a^i-UR>s2tWYR0@5G=X#r^vfV6-#2tZmu8U!FMAPoYL7LW!3
zNDD}V0Hg(^K>*SM(r9;urTJ|?&-OlLrT~5l+LmKx<ECa-GED(yCZ$v%TgOT%4o{Tz
z`(|DP+`ebSW2ZXxm*+xit=ZOmT(N4J7ST8zHrD-qt=l%&ZKPTQlKuB0o2H#!NbPo;
zznY#_7Kc<*!0me!cbDtoU&OhA(SkSXc29%cYwpy4FY??#nz|-ZO#!KM19{X<6@b*a
hfvTQY004l}@&TgZAp5^b@Z|si002ovPDHLkV1ivC_q_lB

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi/meta.json
new file mode 100644
index 0000000000..71cdeb174d
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.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, recolored by MrGreen06 (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi/equipped-NECK.png
new file mode 100644
index 0000000000000000000000000000000000000000..04be3906512c3f9b6df8b64a70447ee5e3c20240
GIT binary patch
literal 663
zcmV;I0%-k-P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%QAtEWRCt{2n!RqLKoo_K(V`Tr=vE3%3L-_?D#bSLY4ZRn+@|vr_yO_+?$T2D
z0n*ZK5g~2C7GBAPBhlcrNUoxIwixgNF}rhz*kio+lPrw@>)g3BclbF2Fbu;m48t)0
zCbScQ;Y{p2*>?P+`HOyJjma@ssuxDqSX^D41CEc#8jCU++jenHeEG7MM9i&;)M?Xq
ze0XqC#-fUH0zA02cA1Q3dy%dv`pRU;rB0iELA9-dasmLz&aIcN$1~&@y<QJU5hxOD
zrh_*9cd-!oq<Ue78~_mh_=*hQk)<o(OQq9KKtPhFGy3)m^Y|w+<Td?wvFwfEOdyEm
z?@)_ggY7yK#A0quwr!mS5FpF|K#qP{V~g|*BOS$#1e@s~Oz%W<^n=Y*Yvf6Pimb8l
z;37k=EqH9uIx(CHIKEtno^DSf0VF~@5%J}Vpx$eb8PXcyy*=RbvkR}dBb)+U0u;Ce
zPOt<RhG7`SAd|<5QGFv%b8VfzzqvnfB*af*A4RpJCOTckNCI}v08@!D_CnK4g6WyS
zFbu;mj5?(i721ikr3_hR)mU_(KM4l02<=38aDm}WTwR<?>)i3l-n=f=q*r6n*_%L5
zz<T+|gLnMeDXKTGMG)7LUX4X(Zvs65g&&Y12i8k0(p9a!cZ&T1yYzLeajkcO&`yN+
z_5h&1bL3E_X{ldochT(@Z0QsMy>*L7#z>Q6*e}qPP6-&jUJs&Yxo4oSZc+Cs%Z6#c
x4bx5~0QBE5<r3%$mq5=;fMFPhVHoDW<u}hoQfUi3f0Y0L002ovPDHLkV1kCnFhu|W

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..7bde233c847b27302f968af19e973e76f048ddd0
GIT binary patch
literal 331
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|<N|y`T)(|}
zKb0x!e4653rkra`RSZT`8JtfoVZFFn{yc;2PRS<+MS&{0N`m}?8UDjSU8hJGQ1qy$
zi(`mI@7_rVg$^rlxRh!{{`oKeE@{E!z&9&{_o#f1yVAPl+heALZ&RhY_s;)uL}22r
z14s0)1@8EGF~FnX-quIAR1Nx9wHUT~1f?wzl(?Y9EEIoTgVp&#)CXOra5jApR^=aC
zS--L{$#!m+x##k7yTSWi9L9%rT|{mg2fUo+Ilb`3a@J|eu`PF`EI;~66n;N^WT8Y{
zhT+Ap>o=vHQrl3wS$@fj2o}9}&W=YG?zivH@aViBWwU;7&bNqvC&PC7bI!js|241Y
X3r@efpl^qP9%Arx^>bP0l+XkK&H0T(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d36d37d39099b24d8b83aaeff4a51533e4fca63
GIT binary patch
literal 547
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z?|Qm8hE&XX
zJ8Prgp#YJ#|BGHI6i#3j^Sv;mq)4#!$l1H<1rHcYJ{v~(+>uzz$=`U6DU+v<FJVrB
zX`#w-$Bb2m;<xAB4t`q0Dg4F0{{NS0v#a?QXml+?Anw+~sxB@J4YQ}Z-@2>w@MUUG
zd#~+sOSN@E#f5WTY~Oq)cacrzLW3xG$@~`~tL}Wd+1laYl5u6V!&+a9cY;~DSyxsc
zEDy9_vGwKdeILIYp4g~ru+-ws;m@&O=52rQGfzqPeEG%Ob*lRI3%Z4FXZ>aREtJv6
zS?>M(ppl1@)ag!J1_lc|3#MyY2Yw6imK-hhiQqi&Ikx7X@R~)N_17mK@?v=CZq99`
zwuYsk_C{)Da^cGv8-yGRZ=9df$N6pU0+qtDrZ>ME_P4Pq<T^<4I^1e7k!sk&m}$b0
z$$Tk;;S$@DiwsM6Jr*;1NKbHMo?xcX3sN|%mH)u0l?6WvE*(pJ>EAwoW@aB#!*qF;
zyhn4cxUDpPZFl^r7sFG}(`{=u_H8bn<mGF;aAt!_G2{NZ%p7TgLI-}aw4^iTl$EAA
zvTWwKEZJlcm7{;~_8m!4x9N_`#=SQc`XX7jF<g4_^!)1X->Xkt-^@C}O}{?w?qvxG
i)84yO)HU!QtNbbsQ|<m6wj#h-XYh3Ob6Mw<&;$UDPwUSB

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..560e32ea4b7bda61afadb54c5e1d9d526d0b50bc
GIT binary patch
literal 534
zcmV+x0_pvUP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$&`Cr=RCt{2+ObZ;P#6W^Q?+r>IA{p6pb<mD18C5=u{)dSpby~G*I;C0aOuDk
zxanvVLr7N!NSMlM;z+KGC1v2Yp||~8Jzv5^!#z3l64LtvL_|bHL_|bHL=;d;!L>cr
zug#Qed+Pq;3`(g&y`pUC-n34y@iITc?qm-YeBogHX{_A5&=!Ewt!f>g0N-OclN&3e
zOo>_6Z`5W_0np~w7T^vVs8<g$nr>sbZ!BNxT-#Ii>LEr0A9oSgY73~$yNla@2%zmp
z@2NZp=Z>N+pmlx)>;zk&V=Q3W!nyIT&;2*IKq$A-El?E3w!m|#Q<z`=u%+BH{k0n@
zXURS7Hyr1mRNgKA6Rhy>?*JAc9Y7ijkPaY?1xN>w#sZ`RNMixg0i>}2=>XDLfOG(9
zEI>MdG!`HoKw9n#uq-R`xn2_b!_gSR;nIAF8mwb_jl_3=YkQeIIu7O&OiNrqW!^QB
zBi1^Z&nHAqT{L^jDFaS<^|hv6P8q>@zc!oE36WL8=kHk_n!1Aq>b02~O?@EZP$#an
z3Xqr^X!{DUn~#fiA1*)e^wv-OxoZ_5H8-%d?%2$_>umv{xq&p+HL?Y=Qq*|`BBI>-
Y0X6`bM!6=7%m4rY07*qoM6N<$f-$J>=Kufz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi/meta.json
new file mode 100644
index 0000000000..71cdeb174d
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.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, recolored by MrGreen06 (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi/equipped-NECK.png
new file mode 100644
index 0000000000000000000000000000000000000000..83f81988daf77dc5bae3594f3176d4da84a69204
GIT binary patch
literal 657
zcmV;C0&e|@P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%OG!jQRCt{2nz3r*KoEw19nuRJ%;6=)38FMdnvf=i$`ClNzU~Th%{_w11B5(+
zn!G^jH0DYdcg2y$sEG}BwJt28PK^Y6g;^sD>7rd(SsTw+4J(;{b~GcbodF1fAP9mW
zh_`V^p_ok~QFX0ueb@X?-)Dic4<DM|cy;+8oPG~%z~Hk$$Y4mjxUT9%6RLE|`Z@EU
zs^2&OHlJ?noOzJJkalss3#xR=`T&&m8wUUYvehg2lGm==e2SNgZ<dk=4f*}|hgGLv
z_C*C-<z}bf!<Q_=M?OWi`ULK*H$A_(w@#I0_4vhnd>{USUD7Z6(wPIZNhH!Z5ow&%
zz6`s@XMs3-eiUh(h^xzojji(n1QavinvdaR>l#x{wOujh_m;Z~MfvHEx!#jk`jO89
zkuwiApK1#pG_nLtrGFP_m4K=A?*gR&oD3JpnFE_IFz?EveTGVaO5n&#fFKBhAa={`
z)2&f`BVTlNo4)&c_s*Uu9*OOW;zmtux`>egRAqpvKo~pJC<noGCJ+Qc5CqX2*@|*U
zq3~H?^q^F?Ee2@(6HMboxT8?y%)@LF38&vf&OERIQ|`^{QVhD(oJ}He_Wao0fP{oE
z`KAZY25jqESF-^{(m2@)dePQ7tyT`e>G@|1SPx9_B}cY;-Lku;N>keNo1e;m?X|uI
z+)*e_h6@1eX${GHHBF_y)Hc?v-G_OBwkS15%Iw3uKwDa;4b2Q3c*C?+2>^%RFl`-x
rqi>i}2~Y_fc?l2%K@bE%94h|+!AheNe%~x#00000NkvXXu0mjf)ZZ%J

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..71a2bf0d3ef4e15e974881bf5ad5e94b91aaeff0
GIT binary patch
literal 704
zcmV;x0zdtUP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%dPzh<R9J=WmOpDEK^Vp#54AWgJUzjTDGtfPf!L=Js~`yZ0)oYsfm9)dAHl*h
zkkUf%3kZRbD%hkKD}zXgvw|2bv{7NN@ZQa?nVFq6R~+0uAS0_gzh~cnv%tTu(4jXz
z_Xjq8XGaVG@b&w*!22C!fZzlsaf`z&w*de>-q6}Ruz~0Pz!rf4pk_Wf*TQ_LWg`3;
zIDs!N#{htMECT>ouBO_11~MQ6?<*e5V99_Y>b74L0;M3^Y1og2bJWZy=V?W{z4_sM
zKPlvu4DASHI}JPbGq)=;W+=gwCW_P_F#rIY*_#$Ph_q8ct#`(II5x-FG6U__sSxab
z@>0KxNwqHJXhpzX{SPPt_eCYRvKau7M=Y=bx7ZN_w>U)YNZ=s)qWectL2-+NTO5_m
zKnRbdlZd7g$aWg`haZ2-w+4!=Zf}`^cr4>7Hg0j8@g5@Sr1Ji|NFIQ^9RsD{;&P1T
zYKnI26s3L_(Nw}0OlD>BHPE`RIdGC$ZUap*+zr-|(tx}AZ*O+jYNmM3%fQ^?o<nM1
z${J9ed}g_gQ8R(Z!nqU-yr)feI!Yrzl}j5DfL2P43ale#3fxtGXW@epcX0&;YZ(A`
z(=3usI(@!x<WR7$f!y^1qvmdXZM|QwqzBl{-td4TP73*udrs_2=fy-i3AfC^q*@Pc
znSu3ufn#%w^?c#X_fo$ryl=UhI-f8f;^k_FFdt$hX<MyPOhzWvdWekVt`|Zu0bj0W
z=<!A<no2lpAOm4O^sFRzWB_2)On9Eu52$T`dY0CGBP2Ia)aUE@!n0}{kQtIiMh2vp
m5!Fk{r$hrwb>#lnU#(w@cw1pW(h8{n0000<MNUMnLSTY|>^vj@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..c69df6d95c2db8079e056d1fd5e2df88f02f646c
GIT binary patch
literal 549
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z?|Zs9hE&XX
zJL{kqQ=-7}bmw>l&O<CG4;72^%PpFGozK?cg=!T8|5rXchrLbt0S`|`H;I2#Q<D`t
zxXJl~Yob-l=}qnD%l7{)6Zvm{W3s{L@8{2KI>RFfv<3#OTh&E7W_EV0`10q(&F0#u
zGtWv&YhQ0&rZY83cb@qF_bE$UMWlqIo^77;QT<EgDv$R2F*9b)nEC1|S1+6Mzn?!I
zT}(LfHB0q}?mJ^C9!shFUsN3TFcm$PyZT2jRlGj8AW?Ajv+|X9@;@h;Eq}J~`I5Ou
zcr$!w#`V8zHd~PNDI)r+-^EK)vl=Z5Cn>}+x~SY@5-RkuFjR=y6{MRWe7r@N*{@5s
ze?_uxlvW?7I@^<DdwaW*o&I<SOje0+s^%-n5jAj#ZZIR3u+DFoyt1Ie;$>2Vlx*Ft
zCj~)_$Nl*m7pY9XWl{Mmbobna!pvN~o!uLb+1z`Xs%6>RB0kg1`{I8+$MEeOX0u$i
zAH4b7npHQw<4#^_nA@5>!Bc<D+HdReCFvjh{6|(le_yj}n$&j3i_tCS&n0<1?y}st
yBcO6oH;gg!&8O>6eVb-L7@@h03=B8i>KLySu>V>WuzEEpHauPZT-G@yGywp7Sm%@g

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3e6ba1f6d8685d8b72b9c9be58c4f86b0596f4e
GIT binary patch
literal 543
zcmV+)0^t3LP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$*-1n}RCt{2nlVemKp2L<ljaY!lwvJNMO@rF2;yQ_2me9vCv<Xi?9kmhh`W<(
zT?-BsTuQf~1tAs`-Rw}yIn<OaxoexteTjV^=+q?l<jvg?@_j@A00000000000068N
zLiMMVl6LN|q*Kh(<o%P5F0RGRL(i6*5rk0QBIT4P@1D@%c%OdC4(0qI6{e3y<<fvM
z0Pn6T%bR8L-+a0}K2t}TB7&#x^#_tPvs@WK-S3h!nN9ywbAE|a?X;y+%v0U(YL8V0
zP;rOz=}$z|8c8F9NfY*diE|;ZKak%aU()LjWTQ0O6tnOPd+YA;UoL^Lw~nQjKvr00
z2`B@oO`C#V4VqaZ?5*1dHxjo=IodbDtfPAqT>BY-0JsIXK>*wW+#mpM0d5cgw*WT?
zfLnkY1i&r84Fcd6;06J33vhz~xCOXLeE>oT?RUL6#10@3Oj0r!CkbK)Q0=s>d^)an
z+R{C!8NY7q04na#fW~6u6rL^jCqxw=1A?NdjlyZ8G_Ut7-J)EhP?pA`2-n|j7ESAZ
zm-e1+<zLa$$fmGT033Y-t&ybO*7<x~ce_T3_bV+@f4A8;u*$ePR+<4^eFI61Yh(%7
hBCGuh0059$egTvKGmgG)#z_DG002ovPDHLkV1nhA>=^(6

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi/meta.json
new file mode 100644
index 0000000000..41651e2501
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.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, recolored by BackeTako (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi/equipped-NECK.png
new file mode 100644
index 0000000000000000000000000000000000000000..a996e93b2c62b3d658664ed80b7df49e2735671e
GIT binary patch
literal 538
zcmV+#0_FXQP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$)Ja4^RCt{2nlX-oKoo|5CVK=+D=NIg9>G|1k*)9mT5*XjsW%>hBdk+VS$c+@
zEzFRSfbxK0H2hy;UO=4p=JAWjKL8<w5JCuf&iMqBslv3q*R|hA4PE<()S&tvn5n`f
z@qIEkjwzxKcI+g+)zYlNtxYm+?*^=}u458Ejy`b5?#gMmCG>8<6&L907VUO(zpj9<
zzt2ckLO-Gek<Ia}MhPF1gOeCI{HAph8#h}-K#Jp5mV7A9rn?ir)#8av6((1u$yDL(
zyZ#KLVRBWPwm4)wQMb+~)E66FdG7WDGF6xr*0|yV8;^hKpjt#9auW|t_|}|HFh;{j
ze`;PC(M9lkSJaXNQcoqlFjN2)Km{yY0fZ1j$h7Q#_CfOp`A63^>BH_Yb0vaDVpHNy
zG{mG`f;6B_0ihZZ?4d@p389rh2qA=!{xmJ|kk1Ln<QCrv8h!86yEgTlizM8&0RWJz
za?nW-H$YeSe!PpXwE-@<DoxwE1OVc-0l<I;xQ1w(P3@a5Yy64}qGYC9dn-Td6WG^W
z*8!V<ioBybX5C@{%XEyVItw8YIYUi0TSV@ffknDS@9r0lQUE}|kP4szsDOnlfDl3m
cA>>{82luF2ipjUS$N&HU07*qoM6N<$f?GlDsQ>@~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee40d83e54c9b7a2d416cd88be3f0f0401b586dc
GIT binary patch
literal 336
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|v;urWT!FO5
zl4H^5eqEk4|Nn*qcP?N3_U3)yt_M%&t+~F9;r|VWN~Tr4Ovk1%U0!*AgBDOVUrCT(
zFvEXj5bkwb1Sqr1)5S5wqId5kN3p{S94>eJdcN<^V>C2fwC-2eY?aT#KW7Bh#V};;
zeHO~CwERx;gge3?c4W#n%E@ywDqoK)uM~D$6Fs-l;HH(9py7ns4fg93H@&>1n!o7Y
zE!Pm~kSBt<o>zD}1WL`UO>CL_9M>@X(v%d?I>Xm?BKg<5pm~Blj%yD5Fgd0mByhap
zu!4)o!m4QkvH!Kitdwizw(J(YkjlSwd7XWJ;1h1n$5par54XIT8uHlsc0t>}7<s-p
WK}Kz}mgPWSFnGH9xvX<aXaWG#R*hi*

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..43a90e8993819acbadc59d16764f230f651e1906
GIT binary patch
literal 466
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zdpunnLn`LH
zy|vNzaDV{Yga52Ym>3-$PjUrLkyY}#ev?s4Y=Oa<hAEf6$SJxSHLMI$l;n(PXj*J^
z!_DZ)&w1y={`q@NepK_Xc9ZISMkN^dq^Kkyn4;-2Pa%?Pr`6w|`@84&J3p1#Fh||u
znB~0>J>N6e#O~YQwR*!0U#(yuv1fh8G^bZzx2hk=1UmG3I-mRcPLbdV{>k4rL{(qi
zV_ETM-RDA~ox7($n_S}ewxle4e^He125(vUSKk>HRLMJZ|85AI>sP?!)n>xz$aG@)
z#?#dy%RMJB9J}qi{*_5!Jx|o9N}fKZFNPXC2X--L6H8RfJ51Pq=<D>!xAc8XU$f6_
z_!MToBq{ld+XRMbpH*CL9(%l_`?O!*%@uo&XKxn%^PX?R53z;5=T~um{e97^E1&7u
zZQg&ko^KERFZS@8@uuGn4%y0g(wg5~-hM0iK-TnlOT9(s`hIh(C)`(W=*Z~U$B^TH
W?}^c}84AEiV(@hJb6Mw<&;$S^navac

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..d256a771f5b37103ad9a36f0a5d4c9f340805825
GIT binary patch
literal 487
zcmV<D0T}*?P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$p-DtRRCt{2+ObN*P#6W^bE|LA2A53Y;0rkT4#6?Af^Xnd-@(aM5HiNG5Ff$^
zNT#|JLGTH({0=4dR`4cGuKAPpe2}T7IX%5;Oa2QG5fKp)5fKp)QAI?MXAmhMc?P+@
zynu*|>Zo(<deEF*Vg8<Ch7ey^VH(8V${h-40r}%X&QBL8mcY{uOkbh8GG-k$&me$1
zx3hpG+I;#L(WgJ3q%uQ@Bw7LJklVig?@pk8JvTk<+;#79FIT`;Zms~ggI@v80?HsZ
zA3l@yWGnZl`?-_<4l{Jl-^eEaq=v5gPw<z6UjZyYJAgJ8pdCOP3(yXrjRj~2(8dC^
z188Fb+5xn&0PO(USb%l_Z7e`LfHvn{;UV~aPtW&#%FYGY0mpa~weuy=Wct#UU2e5M
z!MDx@BvI-kN2Bvhmv7!*cjp3(F+WG~YNQNeQ_T&1v*&$f5S!a)NOf*scK!|!5!@fW
zZ07Gh&J2?%#ls|&^~|q_4I53SuYFF9+w51W)9P11Yiewtx0n4&LtX(*&s%4-D_~6f
d6^Mui>l>(7GjI<g_r(AJ002ovPDHLkV1j4P)(!vw

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi/meta.json
new file mode 100644
index 0000000000..71cdeb174d
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.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, recolored by MrGreen06 (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi/equipped-NECK.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f7937e2c3377a4c56936aba80ccc57bc01c34df
GIT binary patch
literal 672
zcmV;R0$=@!P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%T1iAfRCt{2nlWqJKorOS5(-_^p_{DLDWaI*txJb|fzqK%CNJ9R50Jqhz(b*H
z+9`|37byJ>fzZtuV{lekgNPO*C^5ba(HTjVTHVQ)v+?^)$4TP<?%jKmeeVGTK@bE%
z5XAqP4ZCbHnX;;Db@RLCU;2UR3)^5ez46W*F~_#xc3cFe&$u)AI6p6HL=&oX%K9E0
zi0WHSZ=55-+idK?fn!^Em5DmGRhU;nl}=e7fUth!2mpX+wMMuMYv<>P@aF5>5VD{l
z?>A$kPQPr62tw|1YzqiJ;}#$AdbP$$w&=mty@9KqkgyCVUw-1De}g%qg8pB&sA4gh
zvNTRu8Yi_cL)8SP&yq`zrE$XU%+Yo%^8y3}BjEA-C;Z8B>`^e(cEw<GZOm3(R^I)=
z=2~j!g&qn_pLuYeLrqffpy4T?EBsX;l>)lLUj;%A`2FJ?JOzMzMJDYrlme6jN1g%%
zK@bG7TSmV|TJ^R3qpMr=_~ZD6EfG8t+ZFkR>R5ChEe@!P09}sIcBoNyg6>El2!bF8
zqB*=2H5+zWVES4QN@dGpfW$AsG)~xT*kv9ZEGARt*cLoEa67JWZC;kV)4AqiGG)o7
zr>;SQ6E4GT4c_gzg=?yM1M;MCQgC{HELs`|Bph&h)-!<ThKX<)B3i8rW7Sk?^6@)~
z(zw)?@rB;@zrn)=JRqyvpF{O=`RQ5D;9>vJzX5OoAlh!si?R>>0&QuPwENI6(3aL=
zLp=irUNCL_-8%GwX=?`@eZiDcfKuSdQ-B}{f*=UuP<aBL<dMczdjzHc0000<MNUMn
GLSTYjm^a=4

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c03f5384c68b6d6754488b107b1b0296f1efdabe
GIT binary patch
literal 370
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|ECYN(T!D0i
zjYX;)YnLWRy()WsSm1)(w8<%P<;v^@iflWh<=&U6FK0?U#Z-0Y^3`u|-cMzUI-jNp
zRI{4j>jF@-a7mC~FvEXzz#wdEyZ|VD!qdeu#G-fWBu61;MGh8QWyz=i=bv4%VQSDB
z&4a<)c28-X^64?tg<IkGB3}GGrrx&d8Jk+&#&w4dg*z`ecQgA~cKGocE#Vxlc`9c;
z4jU>&vazhY8np0Wp<a)+OgfwN5~kv~{sqd7PC6eZCi4XT7D`(`+rU`o;NllE8@;A`
z>{{zQPjE}bOSL0cJ9_1tD&J4<Er02DJfLRr@BLogT*?JC#d1sj?Bulh<K@^M-Shl2
z=RDPu6>D$k>11*+E}ipx&i9yy!at<{`0r(WU@FS}_ucYTpr05#UHx3vIVCg!0OM($
A%m4rY

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb04c9973ce0f1ee72b253afc4aeb7b2c7ba46b1
GIT binary patch
literal 539
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zuX?&ThE&XX
zJIm0IDN&&HzLM%xliS`-HVlqhc?Tpr%5DkqC$2bp$S=D80Ox|+0;Wt~#iXQ?oD?Lr
z!;b9OvHP>Jz`f}?u123LX5P$6V^e4maN<w|6HgX=*uvDw!SLYeDwR6L{(@Zx{$4(j
z-M(mQlJdOif8IaY>iXsVD~-d)wVi50`nMi_ucyQ$=(suTpn=4R=f7Rr4m!-*>h&f1
zQo00Bif!GU$!uS_H2SJ%luOMJ{WQa0oZ(XV!9AA`JlUo5u%vO?d&^AqQs!F=AAEeF
zl*Js<d}ZUeRdcU-hp%Rxbi}i{ij^TCm$BEP(84fbYsuCq1@Ac)b0jXTWs4KP$(nt%
z^Kd8Q(Zc-YkB%(-r<&n8OaI^;X4z_1-VI_2yhIXb4@y5s(b{7*r^HYvR=zIn<ijOQ
z^Ys0dTr<_SdVVs=p6X)=v~d6G-5k=hk87K5n`Augs%zS`r7!BIFE}0DqBAS>KI7)u
zn=>Z9ELy$UWZ~0l`#cW6eD}`ZzGoZS@9f;Ob-(z`+dFuFm3B8w{5+?AQK|5Rr)>(o
zd0V+|9Mh{WzV~E><c8kZf5-Mr({<ob{Cz^a?FIW=N0+|0z}RN+boFyt=akR{05qrP
A1^@s6

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..345d43c8b6aa2fbe58981b1ec1a9073b79739132
GIT binary patch
literal 548
zcmV+<0^9wGP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$-bqA3RCt{2nz2g5P!xvG)sCGkp|xv;4(<vrU7Yg{;#S9k&!FJmPIb@+@C95Q
zv|u2VDx|vA2tt=4NDJ4Yq_#tDn&c)YvHu61n&y1@dv6FihX?=w0000000000fQ>?^
zzLZkZ%h{f+6bs}|W_0<yBd#AF({j^-5XwuWg7U|ECf&R@s7@7nC6`J@SF2nWPzK=K
zUC8Qgl|~;UvX1xFQDzA5Uw7=jq<~ef3}D(e>8Dtr>13wQE(He7+I-u#&A?-o0rWb5
z%b$!PUAa=5WRk3S(=hsp9J?>SzsAzB`?6J@-xTxkS@sUP#(%j5!gz<;0(l|K7ElIY
z8C_xNG)svU?@#ryTS?1goxmr-yc6^!xbZ6h0dNa&g8;Y%xIqBi0^A?~ZUJr(0Ji`)
z2!LCF8w9{DzzqW67T^W}a0_sg`2d6vf$#O=5IX=*FiA<TP7=fpV9>0k^6GfdtjUw3
z1MTOH9YC+s(BZLGozmM=Dzz5)H6J~^rfC|D(^h%W?^n9{x%#1OjrkF#|E`m1+obV%
zUApt8r<R*Sq|VUo_NnxmkCxFDY0V8R*S$Zq*P2&~b@N=O|DNXDK$N;cMA`yea|21#
mjT8Xa+(2IE6#xJrv-|?+S2B|BanI}k0000<MNUMnLSTYV==~!A

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi/meta.json
new file mode 100644
index 0000000000..71cdeb174d
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.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, recolored by MrGreen06 (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi/equipped-NECK.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7be060868585a2d47366de5380b428a96c27aca
GIT binary patch
literal 769
zcmV+c1OEJpP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%yGcYrRCt{2nn7zCK^TT#i<G))3YEC%QbG%55!9QvUG|zwK<Ld={zVR<J+<WE
zZ}1oNPzdDWRT{`45X1-}cq+xnDtf40ODjwd+gVnP$<FG!+4?;vXLi}|ozIzXb>;;K
zf*=TjAc%*#JkPOqv&HVZRw>o)>|ZsD;v1UI{AhUM^~P$s!3y~Vl#Jp8Yd2f$@;t{3
zO=n3d4c-<N;RPO3$td74-5SiE39dopxpA*I4y>;8+3cA}?xvw+6g+*FfY~#FT{!I^
z;4uN9kWb8M0R8~5HHhGO1^__wYK+cpXRcpP$rxB&bZ$F{Kfj0xDe%bk%}tEQxQ~af
z&*FIo0Cwhq1J{7#`0;a$`q@RSjy)Wn2*noW-KST0{pJA8tMQx$-hNxy3*-v`V6Vfh
zs<N!AGDFkXQuJnVuYapQWRp>m8JZqg?U@Tc85P-NR9sKM1!Pr~Rm%;h0A^KnJzCn$
z7PI=pg|EUWB2)vuy#J1*G{L~?!s-tp?Ys<1*W-lOfUwqo=<pg4=K5bXLQ7zK>ob1;
zQn0<%0gwww(t7b-1O69;5^&o82(xEGPRT*(AqavXh)v??^eEK$!EGMg!=gbS?;o#O
ziQtyls&Ef9j6u5zB>{KMfUpt~$`SzPlMwbyAP9mW2*NvjXSh<Tt?y`R0n2z3gntQE
z%ME5|IxFN8Xg6CdDWzfdOz^f}AtKCr69D-3CJ1ec0=7@U?3n;w{5y;P=3Em!oA*Oj
zRasJ+_9jgG1jG=Y0f#5{@iX@d46H8Xl)TV8uxi|1gy~~)f8GRN{{;+9XZt%J002oT
z?eq_<u9Ki3sg!DrZ_xvGQtD@4eZ^f$tfA>_6(S<bWAO`wO4L0A!f%0DqJCbubOJX1
zyfEsXfu(0a)I9@K1D1Wj#@7IXAP9mWh^X=xF|C@w1izls00000NkvXXu0mjfuV7{+

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..79a3e078929a1259e79aabfb47ecd580849976b7
GIT binary patch
literal 364
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|%mREuT!FO5
zl4H^5eqEk4|Nn*qcP?N3_U3)yt_M%&t<g|Zv$M82e?t4u7n3gkopT~Do;q~o!Ht`y
zMn;~^uCYL!LM1_d!3_V=LEOPMJD}__PZ!4!i{7o5P75^~a5w~-o#jzt{P#cIn<H{Y
z`)aZBy~`y<8S8A$#JtX4Z`V`tYU0f^-<p);?c6VX4y?JcN%-PA@hxY*|7D80$E+ki
zvoq!G$LjM-Ux?kAQptZyaAx_T{0p3!-wy3*I_**N#H#t55U+K|T;GOdZ^ojf+Zx;g
zj6QGSdnouS;w8(mi#BHa7|vGP=foW86iYqPdoF%zQ`^LUc6*f09nd%DThw&$vE|YA
xeYfIybJ%1}4U`T&+nn=U=JAZ{Kj!~rI{sg1!d%V>eV~sRJYD@<);T3K0RU2~sM-Jk

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc856f1bee0402fef4dc91979eb26f98be5b5cc5
GIT binary patch
literal 545
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zZ+p5phE&XX
zduyXNQ=km{hx?P&T$zqKOUd$`+}acrBb{5i`M=_<J2{*Fu`Il+$Px2~pW~!sjMQAE
zBS$n<oNIj9)r#)zt$tr8UTgnA=~MOo-}io6+^cp0S_1(KoV+}PyrjNx75%JKVc**n
z^FQwC=C%8-->=>({^wG?x7w{Qe@h)s9<de_Et!7Z?}gTrJB_C|3tMf;OVOIQ^k$9E
z`pLU?)Yk>Bs;vH~vR?lD(W+W=ryu)e-ugRKU0Lq8#&L2#XQX6z5o1>AGTu|Sw{0;J
zi%o6aA-&r6*}{nb`s>a!Z@rxS)bc>Stmv)z42#ZIE;tr<ymuml+^hU4UHX}3^6rcJ
zq?H*<mi>ChAX|Dzf>U98R7XtJ{EV#~F0$rsOdkEeCa!wy_Pd%ved_my8I5-TL|6{o
zWiTg_*j_K+u+25le3!V7xw!q@UlSumO3$&)c-Eub60oa6$(d0_I9E9J=CO}!LS;{-
zE&cua9lNFCqg3%7kuOh$m7dtI>F6?Ldv2uOG$-B#F*+x6AGi5kpV^?0&JptK+BS2E
zV{!l975<&?c}dJcqWY)Wv8!Nu_c2xmhWT|2d=HdXvq|j+au^sqUHx3vIVCg!0NHfu
AEdT%j

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ccd72e1bbcaa14b8ad00cc6fea58429f48f7c08
GIT binary patch
literal 518
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z4|uvbhE&XX
zd&|(9*-(W2gLvVqi%XM4?HvSn-EtJU-uIWQj{V@tx7!Z;Uvd=KRU+D+ch_}}%emKq
z0!unX9tCIz8th!MbKjhQ^##HG&+7YCbf>$s0PTQ)RUcRAK3~sXWRrFJ@?kzt&F1|%
zIkWOsxYt(I-(Fnx#U+|Q_qkJ>*9$wJD(9Ok-d-x1cIop9?T!w;;N4us0!beuJo7cq
zuit$u{mQupN4a3LlPh-KUD9{FA=TQ_YT8Ye#g208zq!8pWq(`o+t%1GLB+G@1zIy-
z`RX4s_iO&-=;(&k-R@aeo|(*DYWI2SIkoTe?=WAvqjrm_<XyhF^^4PU=ci;ZdbZE-
z&hEgvIU6$Tm2>}xwr2dC|G@lz9oqtiJB&LP5=lt%yYKv4v;6sQ+oz{k1DL};s;;^$
zB;ZsN>w4~fO+??~zPE=@RXf<e`h7z1jK%#KRtA&q1&HmuAHKZZYTo)h!R59GZvWi9
z)KTto-D*|)^MC%VVVtY<{Qc`U(giQWjS6Qm#?&&We$loRZCIVZpr>#y*MY0%0axo-
c85$C58BQlmIN>j?y#o~Dp00i_>zopr08jqyC;$Ke

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi/meta.json
new file mode 100644
index 0000000000..71cdeb174d
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.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, recolored by MrGreen06 (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi/equipped-NECK.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd22f8b80098547c9b31954413d6c88541209244
GIT binary patch
literal 663
zcmV;I0%-k-P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%QAtEWRCt{2nz3r!KoEw1g{=%J1i2IkVppm15-#l8kcV*c2C1wxDbAJNAbyEJ
zYNhZ?xUyFqxH*FgL#l;IvA2#+*2P-sbZc?*!NIa8@z0KCgrt7~hG7_nVHoCRk}FNR
z0JZ(MZGPAMPhTgQcMNa39!P0UVkRNyfKD=U$#CQPyl)U)XwzxxOA*6YUvxdNG}Y5s
ziWn{#SdZ)TV<1~}n)(2|^*dJp0GL&Y@_ze#X)4@(iXyKFIuhM|jkf7GWAUML1pqd?
zCy#{R=9^vgTL7lQ^0SH*0AS%I?#uND1$myMG}VTFGnUZ;&;^KY>~CK;y=O5b8KpnT
z#*yYv<32Y)z_S95Z#BfD?J-+ws*mO%)N&Cet1r~N`f9o8b>+QI(n&^A#3)VGTX532
z76?`TW6-MwLY4m*cqQQa`wzGlc>hr0=v_QkT(1*u0d9eREucmUh+!CpVGf9kUl&33
zgS^pgTlD4G<(?z){3Nz3>I)6A=sH0X&{hGV5)tg9Ml%VaD}iAchGCfQI2&3QuvT?X
zYigIV^uhZ{kkXuV0TMH5ouaulO{IwUx=F$%-D&D1Bf9a|_f9}*D(lO``t)_=9QgB4
zwVbs(D9tyLULU_?owwojRT!`)BmrbrrQI}fzuq6P9;=Vznk8+TZmdrIAMJa+3+MuL
ze5(O$?#M8!a$JADq3^VZ=ne|jxy1ku(=mPx8zzS0eGjOkP7x(nn#63ncG;i=0Bn~{
x-Z36r0aJI3xdn#8EimyGU>JsB7=}4m{sMAxgh_%u(0>2`002ovPDHLkV1j*vFAx9#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4efa017c8d03997c5fe6c7f5b42428254daae22d
GIT binary patch
literal 326
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|qyv0HT!Hih
z+3E-T82;a2_^;R_JLiGo#{b8pa^+Wi+PdD36)4SF666=m@E;1ynPy)B3Lf!vaSXBO
z-8$*C&=Ca=mQ<0a|Myq8w_cgnKd0>Djo6mPC0`yhP57*RUS~_$V`gWUb8KvSYgQY4
zyc*C^e6H%zwIhc1rQ$Xx4V8J1H_S6qC|Fx2Vk9%a_1>Y6Cm%F~B%FIKwnbfF1?#<{
z9@SGK$JTTk82Kpr?Mh#8$z+n=^9$*$mVUc9E=m=C^fj3Ox2Q1C(5mf;c<ldGle&zU
zuA6^zT;(g?*k7yBQ4;ZUpZ!5|)k9&yv8|e=iVK$gowxYBs9odz2lcO*w>hw0`MOJ!
Q9q1nhPgg&ebxsLQ01$?Wa{vGU

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3762bbc3b9c328279693965a61a26f09edbbfc9
GIT binary patch
literal 566
zcmV-60?GY}P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$@JU2LRCt{2nz2s8P!xv$n!bP`#>7yl#8+ToU~+fUnHO+!gaHON-T;j85nLHq
zNF3w^bZKs5Vn`euTuF|DDIkGj+jDzR&X;r|{O9kVd*SAu11O53D2k#eilQirqA1E<
z;cy8N5dffc8<Kle#_T=BRnvERQ{pPI6~{^bIxe?~ai@>6dx&uMfp(?JEx)@E5r_zl
zS`}slqGym9ff}{y{IjHw8G+W-*z}~~faUF%C<GJK1B1#7p&pn_TJ^x-^nu757`i#;
z@wW>57U)e0*QM5C8x+%P<*}XE0{{TrcYzZCZvdJZjC1M4z`g|lux<ekoj9zlfFDbj
zYYSx1iNi_&?c$K-e8Hs?hm`;d!DOd&;$S}sN|NRzXyr%nFQEZQ8<0i=kTxKV1|V%f
z8Vx|&fHWF_v;k=}0BHl#XaLd%q|pGR4M?K_NE?u5?*p)ME4+F+$$4SA?&33xzLgc=
z4NNXq#NNPAqn52@W+i}er*A_xwvKalkxR{3mS+O8%mw^*4j`IE$l{rG1uQo*ZFY5{
zAfj1>Xoet-7F%b?cuiU~GKbFH;}e&3EMciNuj{{dt@jc)!Zj9?W{f7Po5nZW-(Wp3
za6iAN!_INZC7Y-&;3xh*TL5|V^0(FX^DC<;it<1B0+^nj;=xBas{jB107*qoM6N<$
Ef=KuH#sB~S

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7b08f9f860195464080cd8c5b079a2b73bd15cd
GIT binary patch
literal 549
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z?|Zs9hE&XX
zJIm1fu!G3){}XE%1vN!3hZL3-7o1qMd$yDLe&^#>FD9H_n;d<lU*WFIE)Kq5oH2(|
zHJh57qcv>WovNGSe5y`*zxjR8cW=@DKgHME_ONp_DIn0HsE0G`RFt;38ScDom-gP!
z&n^Aj+snm~d0_=Ik5vzu)>Zx&(XwoKpQkjhcES8T5mQ$)9b>qX;8R!JQ^EDc`q|we
z(J$8P)D)JyDN1H=T=Jmq-1h&Lx58Mu-R!qHiZE;5JH{Zlp8fP&{s+%`-^>*2cz4%t
zW;PE)x#9&D1J(;0Q^MJHecxF5YQHtpf%5#-?hEuHteO6*luWoGtlh11Px|Ppkoi~C
z5AK@$O=ZV7YX_zWVh`MiB#y;MBtBdIy>i?A;B_($dXdMcuh5of%wOTPGb?|^i$^au
z^emkw5cnz}u7A^+^F}38t}o70{w>wYvSGrkhF!c0{SntL=IXrqJM)mA^7Z@%^N{Xe
z)iYf$D+Jxx`#m%6%a+R<CayLT*{+v)(@fYZ^(*g-*Ku!c{;Z78Tq?IP{^2X>3)k*$
z+LE`fz7eRST9swursRV=^47^7xN077y^hsUpykvj*2=7<n?35TYXIY&!PC{xWt~$(
F695Wm_;COL

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi/meta.json
new file mode 100644
index 0000000000..71cdeb174d
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.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, recolored by MrGreen06 (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi/equipped-NECK.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa14b58bc9b3bad27d735364ddd3758d355b496a
GIT binary patch
literal 763
zcmV<X0tEeuP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%wMj%lRCt{2nn7zCK@`XTc07nQ3!y!T)kJd$2zv1t3iSi@&{K{Dzkr9vQ%)g;
zoI)u50^ZY04}JuZ9!f4Nc&kx^cxWkXiuIsO54)?YUCF-PtfTGw!NNMb%zN|a&CZPP
z0Sv=148t(Y!z7CpdAwhiZqHV=KQ?*;u6FbWB;Fm6eR$&e&9g%p(=tfMvuFw-^(v%o
zG+C@jXFJsiFW7zObAWC0c)u(c+O;T>#R|!O)bpFhWOlm;;6(y}Wi+N`fZxC7?IEzx
zw`DW!Vl$>?Nd0;j0KnL|MSpa^vb_f&RYip4fk#r)X+$4FqW!Rs6ueIXnCgDb7SIFG
z8Un300Aqr|&Bw@fw-z~?PD2^I&HGPf?7k9!F|kDNxcU;B19}5e{xGjqAEU5o3L)jC
z=>yIV<w5C6p5)GDQwU%Fkfs1W1NdUy5B-=6&XIE}%p&0)VMiYTQ~f(3e5<{QkRsqi
z>MhdoEc&Ak(5;2#(^?@3(0I0knD!K7V+ZJl<<fc~2{0(t0WE6o32wr2X@jv>0aYtN
z82DQS6s-Wt`4?9KhG7_nQOIfiRH^;&kB}~`8uZ2Mi#2;f{72}qa1K<(pq(fYz%2q)
z387>P0Dp_1IuaO$VHk!XVCCZVDr8fLm30H_Ac$@9PVgjmE|bNIgcgO~fXpY%)O9+Z
zCFkb-vRs=0%yWj+zQ_XfN1a&?KA&5B7Sl2qeg8@AlEj@5GM}()+jRo*EcRe#iK&nU
zxbD`>?XxjKt8E(X!4zg}+#>#bm+l3D<#f0+O<uU9Z|!}Z1(L;z9F*$j56zKUFebp&
zx6scQdKD6H<`LLx1BI6g&NZ7*FAx-3W@woWs25Pqwr7iiMF6(HW+1Qt+g>veSOBgW
t*z%fzz!AVT16#fdFbu;m48#1l`~l9|NNBmGg;W3l002ovPDHLkV1m!PUN`^%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..bffef995c99cc7f097789d52e56cc779ba11a2af
GIT binary patch
literal 361
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|3<7*YT!A!0
zmb{cvUYLC1F=pl`%*>Zd7#MoB{`W9kKEm+-Ekm(plafQ<+hzuaYL!gYa)k+fF+eQ>
zB|(0{4F6HVfq-sjpxkLs7sn8b-o2L``C1fs90E01b-3>Q-*(ySq(#HJGgo?_*<W06
zY>!RHi@(X=ZC>1owKu*Nb)D(_p3irhrscaHSS8C4R$CnUxzL8;WVXW*C*y{>)m~SM
zdr~=tGUAwpE`0L3AvDwB;yH2Sj@F!)mc0x1MlyfeB6#AS19Q6H6m^9oQD?V2EqKdU
z!d-RGEuggD^E1yE;|b3M7fk-2u|B~m&+<Q0{vK!b{j(TWN)#~Ee6Zpvnx=96y1T@i
rj`v@y?0nR@c>5mgK4%nnasG4W!VlbAOwubhgM!J^)z4*}Q$iB}Sc;ci

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..27aabe00ec4a4a9912dc7821d1c990adc6c007cb
GIT binary patch
literal 620
zcmV-y0+aoTP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%CP_p=RCt{2nz2h;Q543%QynB2mp3SuLe(yXOb>jZlar%Emab{{c4*Rnz**z&
zqTuFYhfdDHh#6m|4$l^8$dV<2;Lvh9h?;^t>wV|G6ZQNc>vz6<xi{x>&jk#_Fbu;m
z48t%C!!QivSwT`l%nSf%e<3c-0qriZe*oI*vQ&wCA$s`NnUpp$*qOjD00RKMD3q2L
zM|=gmUyU&Al=xL)0T;t_6z1EscXH;W`R?@xKK!{yqxxx##R>?L7LH%8U}|O>m;EBv
zGiWt}A{H0weA)kj+8lY=PT~P<bs5{$C17R}=>G<qfwNX;?c0q`uemJf@|G7qMB{P-
z{`ehnIT;I`G{jc`0N^WtQvlsD(MiEe0Hd7%k-knEUIN&SLXqwwrIUu20D`17Ryt{j
zp93^;IR|*@0*?s`K-+*e7J#+^Z7cw71KL;s+6J_-0JIHgV*zLz(8dDLHlU3KAT3Bl
zP8SodwX)*pRv7=9lfEsI4A{1SwgGJ(eE?avgLnYUjJSqeu889rxU!OMX6R)F40a}b
z$fnkzHychGVqJiUP<^|}7sGQDqL3;8T;B!!FS}7l!%m4Q!#)sQ0Y|gbXaq$7ey2Lj
z3}!}<w65L|tkrow{N%Ll<QnSdMZTWpSDJzItB{96)uo%ds3-ZH!0sY$fVl^b8&`i!
z*T0hQ&uCp2-*P9x9A^1G>WT%B$1MNey7-e{VZ$(tr@&ujWB}82;iByT0000<MNUMn
GLSTYIwiI;$

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..98285bd52a340ce9be0da17fd983ec4f82b89328
GIT binary patch
literal 589
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>U}E=laSW-L
z^LEy5KPE?!w*P`$TniJ0dpia7H*PZ8xZyLWj%nEg<{JyP>M!`j5jI6d%<fQCr<z%W
z_OXNw8yb%UIP|sN++kw8!+LW&?{n`J5oP=ST1uXn!_3j7fIx>r7MA1-3C{Bu$vwk-
zUiQJCH1F7Zb}CQPSeI_;?^yHgaQ5yUxv3Y}E-(jtk<(q}%XW+58=IWzHUE$Q{&pSx
zx76+wr_zsW-=}G@I8V)H{?J|dglqGQ^3N6-w}ng29(pGDluPx;U9k_#_J>IyIDXDF
z-~`iM#sKznRw;p(WtH#w8|Gd4;`oI%>(_!;ciu0X(H4H=_LrVpTn9uOsu|`=Xcm3o
z&(CGpd+WYF!=8n#n^Pn{w%v=Cb~r4(EbTeJ@uR;h_m>^pc=|~4AN3h!KL1&k?_*M7
z$YabSg7~uhP_lqsVPRp@lVAUW;~7_S9Vpo+-WtOCpy>vqN&nfm>e43tj!)m}zW(03
zm-Abe<cwYVW-qQ9`8^X>3T+7D^3r@Wop0qs-p~scrH&Uq<Wx9+owqt*!!})|P=_7=
z=RLX85Pv2)^=H$syJ86$uX?<foSU#}UC@R4_1EG<f{K|RmYyy@y7Af6q|nnAf4{3d
zXIr!;Tj`eC2~+b233ojh3(oQ`DUEX!U`b5+$+*&L)x+e3sS|<egTd3)&t;ucLK6V_
COaku!

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi/meta.json
new file mode 100644
index 0000000000..71cdeb174d
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.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, recolored by MrGreen06 (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi/equipped-NECK.png
new file mode 100644
index 0000000000000000000000000000000000000000..149e2826b33dd3356baad148606dea26aab16119
GIT binary patch
literal 689
zcmV;i0#5yjP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%Ye_^wRCt{2+A(X}Koke?zf4;&vOt9_Qne`^f(evDze9(jsnEe&x2_$tWXs3!
zR!YE==#cMF@M0V-HYHe=7l943WU!&v!I6<wtJO)CFUIdT9cSZrdU?+{cLxwc2qA=!
z{~NbEY|!hoU9V-$@7urPTeic!hFab?wz^BE$_?n64$F2}oQ!y!oabFc9=qbC<12;<
z-uTb*zA<ozo3Ub;P!|t)sp(KwGStPx)_fI`pPdyS093ib^|`q#003s;9NxssoDbX~
z<WKJ<t`+3;?d=OGD}H({JaSh6u+FY}KSEHiVHVD@n0N@>8eV<=Sjj`DE#6(=di5HC
zJKTzYu(b?&eHQss7Wvc6FT<)?w!^~PI~Ms<*6J=d<04;x0A~f%e>!0DXg%gEwSBRz
z3u)Hwu=HQwwwl#fp=CR))m;|O_R))5Kvelxp->BmD*q~QCE&|h6N+JO{U$gm)B@B3
zC*A^t5JJd)UH!Nc8vh_08EIJ$ee>bwz$@Y065E&LgNk_QBq0gdRRN+BA*2O>zmp)k
z5(puL5RzYfI5KW`m}NUcH%iMK$#ee_jQlAZw>wNRObmK`rpgT{h6!EMOD%*)`hEbg
z-mz|Vm(^X6h<Oula|W+#`qpc_XY)lw{*)<(iTJWca$IDymTOlS0M0L)Qh0mE0(S`S
z`ES(2Ig;b5c{`58%N&q$CjfZ7gir^*{;ENFV?hCMy#j)>>i@Sozidiz*=zSBd<QUl
zoUc51+EchMP*$M|h&_e-0>aUqfg?XKE!6_R@gJC$PQb|@m{JQ+3!Hch5JCtcgdD3s
X6BfTMZOQ1^00000NkvXXu0mjfj3hhz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..339e0fff20833c138f734c83ecfe5019f585cd3b
GIT binary patch
literal 324
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|qyv0HT!FO5
zl4H^5eqEk4|Nn*qcP?N3_U3)yt_M%&ttmA(*9S^-mIV0)GyI1FbEer>fP#lST^vI!
zdbdt;6k=B7U@0wZ`M=*{v6EKotl*~O@0{Fpo*rji@O}NB%>l1_{dq!drDyy|jBRaQ
z-{vs4_?mEjsO;xeyB~P=NoHEGJ(<GT7`=J%g@-?Mdc^wt+1Qsb72n&oK)KOL=fkvQ
zn?=`D&qPi(FxEM^_{F?Nuc;oht|`7(f3fkBic9v9W9A2IzMVc6dgX;gSH8*rRm*J_
z<tV?l^;jDvRB@xd=~YAT^UqxKR0XevMTt!_X=w=4;a+`S)UCGl|4Q+dLF@`;7q-6v
P`i8;N)z4*}Q$iB}D7K8_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..4dfe376e7abe7e0909aa2c91a581e09d61b908df
GIT binary patch
literal 540
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zuX(yShE&XX
zJ8Q2WQ=mZWc`4nFSrQ8Zk{|oK`yTX8NX}j1^CI_+Z%#-50#i=28y9{sq<K4SaFA{d
znBk$6eKKO9$Ho)y?#T8$_ui&7$8ydc#o5-(0!|!?EfC_<`VU)LTv!+`?A|xA_o^vR
zlcL`FzCB*?TfEL3`TXp^<>^~$r*6tzEC2TK-=~f*adFXgg@S?|9A2$9R%fTx?AhnJ
z{N|(}#s6P#?(qk*GXHK+=X#~C@cD`I)9s3@&wH>Qj)>CS-@D+}1V@7-FPA-EGWQDe
ziZ86~+xhS33OH+bmId)MFzA)L-?+zhAzJcb4P(in0-=U9?u-{L4^<lE-OIrO4!<7V
zU>3N&WtyLaAJYk&pWI7@+kVYnpc;6OWxC9dAHfC;+0567CI0+om~)5AKi)4Zen!?S
zYfHwvtD}^{kKA27YYNxLv^GB`jr3x@6zA6!>_=U)+KhGz3#98m*j~->IJU)NUZ{V=
zox4E4G47cAs;61vy%NjSHkVxMt@a0#_Uft&H=j`{YhG3^xM+cxgV5$bk)^K%_pJvp
qYs5>hGI=CTvtO;J*fPQLCrjaj0PC<@tKEUo&EV<k=d#Wzp$Pz<*5x1o

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..1779017d45e152812dfe77f0438199dbc9fd1067
GIT binary patch
literal 542
zcmV+(0^$9MP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$*hxe|RCt{2n!irMP!xwxjSd7&jFRvtE=Cy)vnKiw_zErz%#6N(8loeE3Ct##
z7+rh<2RjmiiRgkLBZ+k7IuH<z+}d*5)5`BlI&tBC{c%sz+<S-s0000000000005XP
z4BdxHDe6?N)oOH^dRCu~FHeoi!=qnrEEtCN7HLuY<?SqGFV1LXV~alCUMT%)vdRSk
zZ2--i6O~FPsPq0zrCdfIWq=s{>&;qSk<BXC1`shDq@pc~SbaV_A841W!?HCSwqvyc
z<YSqy<xfP#uHtg^lu2(pv;mxN4k(qhsIxSn5}Tg)OnTqijQy7-;KbWe34{f<5=iHE
z3?iZglbByP@m}!QCGgn335FfJH^I4I0SG`^KpF%fEg%g7kQR^z0Z0o-g8-xjq(K1E
z0@5G=X#r^vfV6-#2tZmu8ttxd5cs*L$GuNEa{!ZqVcbNWxdhtfsxNolE?3pj{x19P
z&Ky8Kmf`UD(>&{b_a`W&e!WICYjstK6BXjq$8ueT`1rhE>o(1G8m^uJPR`#siI@$t
zuI^QDc<9N}u;D5IiN1kiSJC0!(|F#sgFWKtS8^4ARNuh2d6}LEt^$zi8}MRYmJ;xb
gu=Xne06<{*1TK&xczG^^`2YX_07*qoM6N<$f)0o3^Z)<=

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi/meta.json
new file mode 100644
index 0000000000..71cdeb174d
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.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, recolored by MrGreen06 (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

From ac04604b8a136a0d42e78f7b552224c1b333e482 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 17 Jan 2025 11:36:10 +0000
Subject: [PATCH 6/6] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index ba4182b533..98cdb20b7c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: PJB3005
-  changes:
-  - message: The emergency shuttle will now wait at the station longer if it couldn't
-      dock at evac.
-    type: Tweak
-  id: 7322
-  time: '2024-09-09T18:10:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31496
 - author: Boaz1111
   changes:
   - message: Pacifists can now use grapple guns.
@@ -3922,3 +3914,10 @@
   id: 7821
   time: '2025-01-16T20:49:47.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/34197
+- author: southbridge-fur
+  changes:
+  - message: Pride-O-Mats now have scarves instead of cloaks
+    type: Tweak
+  id: 7822
+  time: '2025-01-17T11:35:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34448