diff --git a/Content.Client/Options/UI/Tabs/AudioTab.xaml b/Content.Client/Options/UI/Tabs/AudioTab.xaml index 03d21babc1..d3a98ac048 100644 --- a/Content.Client/Options/UI/Tabs/AudioTab.xaml +++ b/Content.Client/Options/UI/Tabs/AudioTab.xaml @@ -17,6 +17,7 @@ + diff --git a/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs b/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs index 56c14acf63..5a1769feab 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._Sunrise.SunriseCCVars; using Content.Shared.CCVar; @@ -13,8 +14,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() { @@ -56,10 +58,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 _aHelpSound = v, true); + _config.OnValueChanged(CCVars.BwoinkSoundEnabled, v => _bwoinkSoundEnabled = v, true); } public void UnloadButton() @@ -135,7 +137,7 @@ public sealed class AHelpUIController: UIController, IOnSystemChanged AdminSoundsEnabled = CVarDef.Create("audio.admin_sounds_enabled", true, CVar.ARCHIVE | CVar.CLIENTONLY); + public static readonly CVarDef BwoinkSoundEnabled = + CVarDef.Create("audio.bwoink_sound_enabled", true, CVar.ARCHIVE | CVar.CLIENTONLY); + public static readonly CVarDef AdminChatSoundPath = CVarDef.Create("audio.admin_chat_sound_path", "/Audio/Items/pop.ogg", 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 diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index bed04aa9ff..98cdb20b7c 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,19 +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 - 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 +3907,17 @@ 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 +- 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 diff --git a/Resources/Locale/en-US/_strings/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/_strings/escape-menu/ui/options-menu.ftl index ddced11d03..c13dbb516f 100644 --- a/Resources/Locale/en-US/_strings/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/en-US/_strings/escape-menu/ui/options-menu.ftl @@ -37,7 +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-tts-enabled = Enable TTS +ui-options-bwoink-sound = Play AHelp Notification Sound ui-options-volume-label = Volume ## Graphics menu 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/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 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 0000000000..5a6cf559b7 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi/equipped-NECK.png differ 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 0000000000..38ca88243f Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi/icon.png differ 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 0000000000..70b5ebe858 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi/inhand-left.png differ 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 0000000000..ec450f26e6 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi/inhand-right.png differ 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 0000000000..c575f6e2d1 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi/equipped-NECK.png differ 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 0000000000..832d1080f7 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi/icon.png differ 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 0000000000..1002bca35f Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi/inhand-left.png differ 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 0000000000..e7e34681b7 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi/inhand-right.png differ 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 0000000000..04be390651 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi/equipped-NECK.png differ 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 0000000000..7bde233c84 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi/icon.png differ 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 0000000000..9d36d37d39 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi/inhand-left.png differ 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 0000000000..560e32ea4b Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi/inhand-right.png differ 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 0000000000..83f81988da Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi/equipped-NECK.png differ 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 0000000000..71a2bf0d3e Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi/icon.png differ 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 0000000000..c69df6d95c Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi/inhand-left.png differ 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 0000000000..a3e6ba1f6d Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi/inhand-right.png differ 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 0000000000..a996e93b2c Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi/equipped-NECK.png differ 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 0000000000..ee40d83e54 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi/icon.png differ 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 0000000000..43a90e8993 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi/inhand-left.png differ 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 0000000000..d256a771f5 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi/inhand-right.png differ 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 0000000000..6f7937e2c3 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi/equipped-NECK.png differ 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 0000000000..c03f5384c6 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi/icon.png differ 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 0000000000..bb04c9973c Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi/inhand-left.png differ 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 0000000000..345d43c8b6 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi/inhand-right.png differ 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 0000000000..e7be060868 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi/equipped-NECK.png differ 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 0000000000..79a3e07892 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi/icon.png differ 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 0000000000..cc856f1bee Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi/inhand-left.png differ 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 0000000000..8ccd72e1bb Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi/inhand-right.png differ 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 0000000000..dd22f8b800 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi/equipped-NECK.png differ 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 0000000000..4efa017c8d Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi/icon.png differ 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 0000000000..b3762bbc3b Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi/inhand-left.png differ 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 0000000000..b7b08f9f86 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi/inhand-right.png differ 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 0000000000..fa14b58bc9 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi/equipped-NECK.png differ 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 0000000000..bffef995c9 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi/icon.png differ 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 0000000000..27aabe00ec Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi/inhand-left.png differ 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 0000000000..98285bd52a Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi/inhand-right.png differ 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 0000000000..149e2826b3 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi/equipped-NECK.png differ 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 0000000000..339e0fff20 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi/icon.png differ 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 0000000000..4dfe376e7a Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi/inhand-left.png differ 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 0000000000..1779017d45 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi/inhand-right.png differ 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 + } + ] +}