diff --git a/Resources/Audio/_Starlight/Items/Toys/attributions.yml b/Resources/Audio/_Starlight/Items/Toys/attributions.yml index 19a82a81a309..e47f9c1999eb 100644 --- a/Resources/Audio/_Starlight/Items/Toys/attributions.yml +++ b/Resources/Audio/_Starlight/Items/Toys/attributions.yml @@ -1,13 +1,3 @@ -- files: ["deerplush_nun.ogg"] - license: "CC0-1.0" - copyright: "Original sound by Cerzix" - source: "https://github.com/Cerzix" - -- files: ["yippie.ogg"] - license: "CC0-1.0" - copyright: "Original sound by CipherForbid" - source: "https://www.youtube.com/watch?v=-jySY1QC7dc" - - files: ["gnome_hahe.ogg"] license: "CC0-1.0" copyright: "Original sound by Radio TV Solutions" @@ -37,3 +27,8 @@ license: "Custom" copyright: "tonsil5 (Freesound)" source: "https://pixabay.com/sound-effects/cartoon-scream-1-6835/" + +- files: ["yippie.ogg"] + license: "CC0-1.0" + copyright: "Original sound by CipherForbid" + source: "https://www.youtube.com/watch?v=-jySY1QC7dc" diff --git a/Resources/Audio/_Starlight/Items/Toys/deerplush_nun.ogg b/Resources/Audio/_Starlight/Items/Toys/deerplush_nun.ogg deleted file mode 100644 index 14fd1ac91b57..000000000000 Binary files a/Resources/Audio/_Starlight/Items/Toys/deerplush_nun.ogg and /dev/null differ diff --git a/Resources/Audio/_Starlight/Items/Toys/gnome_murderer.ogg b/Resources/Audio/_Starlight/Items/Toys/gnome_murderer.ogg index e01d8abc09ea..7b6b0bc3ffb3 100644 Binary files a/Resources/Audio/_Starlight/Items/Toys/gnome_murderer.ogg and b/Resources/Audio/_Starlight/Items/Toys/gnome_murderer.ogg differ diff --git a/Resources/Audio/_Starlight/Items/Toys/gnome_stop.ogg b/Resources/Audio/_Starlight/Items/Toys/gnome_stop.ogg index fa8009a1c09d..5b96fecc5c78 100644 Binary files a/Resources/Audio/_Starlight/Items/Toys/gnome_stop.ogg and b/Resources/Audio/_Starlight/Items/Toys/gnome_stop.ogg differ diff --git a/Resources/Audio/_Starlight/Items/Toys/yippie.ogg b/Resources/Audio/_Starlight/Items/Toys/yippie.ogg index ac098985c4c5..af37bc9260ae 100644 Binary files a/Resources/Audio/_Starlight/Items/Toys/yippie.ogg and b/Resources/Audio/_Starlight/Items/Toys/yippie.ogg differ diff --git a/Resources/Locale/en-US/_Starlight/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/_Starlight/nutrition/components/food-sequence.ftl index 5a4f2b555adb..8885cc56fdb7 100644 --- a/Resources/Locale/en-US/_Starlight/nutrition/components/food-sequence.ftl +++ b/Resources/Locale/en-US/_Starlight/nutrition/components/food-sequence.ftl @@ -1,20 +1,18 @@ # COTTON BURGERS -food-sequence-cotton-burger-content-plushie-panda = panda -food-sequence-cotton-burger-content-plushie-deer = deer -food-sequence-cotton-burger-content-plushie-mimelizard = silent food-sequence-cotton-burger-content-plushie-abductor = alien food-sequence-cotton-burger-content-plushie-axolotl = axolotl food-sequence-cotton-burger-content-plushie-borb = borb +food-sequence-cotton-burger-content-plushie-borg = lawful +food-sequence-cotton-burger-content-plushie-cow-squishims = cow food-sequence-cotton-burger-content-plushie-creature = YIPPIE -food-sequence-cotton-burger-content-plushie-gnome = fooberry +food-sequence-cotton-burger-content-plushie-frog-squishims = froggy food-sequence-cotton-burger-content-plushie-goat = soft -food-sequence-cotton-burger-content-plushie-lisa = corgi +food-sequence-cotton-burger-content-plushie-gnome = fooberry food-sequence-cotton-burger-content-plushie-kitten = mew +food-sequence-cotton-burger-content-plushie-panda = panda food-sequence-cotton-burger-content-plushie-pig = pig food-sequence-cotton-burger-content-plushie-renault = yip -food-sequence-cotton-burger-content-plushie-snail = snail -food-sequence-cotton-burger-content-plushie-cow = cow -food-sequence-cotton-burger-content-plushie-frog = frog -food-sequence-cotton-burger-content-plushie-sus = sus food-sequence-cotton-burger-content-plushie-shadekin = marr +food-sequence-cotton-burger-content-plushie-snail = french +food-sequence-cotton-burger-content-plushie-sus = sus diff --git a/Resources/Locale/en-US/_Starlight/plushies/amali_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/amali_plushie.ftl deleted file mode 100644 index 08c4df8903d3..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/amali_plushie.ftl +++ /dev/null @@ -1,4 +0,0 @@ -plushie-amali-1 = Starboard is right, port is left, YOU IDIOT! -plushie-amali-2 = I'm going to execute everyone here. -plushie-amali-3 = Give me a break please. -plushie-amali-4 = The captain did what!? diff --git a/Resources/Locale/en-US/_Starlight/plushies/ash_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/ash_plushie.ftl deleted file mode 100644 index 69f86ec0d0b1..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/ash_plushie.ftl +++ /dev/null @@ -1,6 +0,0 @@ -plushie-ash-1 = Wanna talk about mental health? -plushie-ash-2 = I'm not big, just fluffy! -plushie-ash-3 = 500 ice creams. -plushie-ash-4 = Cargo, I need 6 ice cream deliveries. -plushie-ash-5 = Want a hug? I give great hugs. -plushie-ash-6 = Want uppies? Wait no, I'm a plushie. diff --git a/Resources/Locale/en-US/_Starlight/plushies/brighteyes_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/brighteyes_plushie.ftl deleted file mode 100644 index 7c2d4ada6738..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/brighteyes_plushie.ftl +++ /dev/null @@ -1,10 +0,0 @@ -plushie-brighteyes-1 = Meowdy! -plushie-brighteyes-2 = Good meowning, crew. -plushie-brighteyes-3 = Has anyone seen my wife? -plushie-brighteyes-4 = Sentinel pack! -plushie-brighteyes-5 = I did it, Lanard, I killed the dragon! -plushie-brighteyes-6 = I don't need a search warrant, I've got purrobable clawse! -plushie-brighteyes-7 = Bitchin' -plushie-brighteyes-8 = I'm not some scared little kitten! -plushie-brighteyes-9 = If command can't get it together, I'll step up. -plushie-brighteyes-10 = You doing okay, Jimshow? diff --git a/Resources/Locale/en-US/_Starlight/plushies/eina_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/eina_plushie.ftl deleted file mode 100644 index cf048bf046db..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/eina_plushie.ftl +++ /dev/null @@ -1,6 +0,0 @@ -plushie-eina-1 = Mail! -plushie-eina-2 = Priority mail!! -plushie-eina-3 = Priority trash!! -plushie-eina-4 = Pipebombs are not contra! -plushie-eina-5 = MAILBOMB!! -plushie-eina-6 = LEMN!! diff --git a/Resources/Locale/en-US/_Starlight/plushies/einalia_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/einalia_plushie.ftl deleted file mode 100644 index 7abdd4886350..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/einalia_plushie.ftl +++ /dev/null @@ -1,6 +0,0 @@ -plushie-einalia-1 = HE'S REACHING!!! -plushie-einalia-2 = I hate bald people. -plushie-einalia-3 = Just one normal shift for once... please... -plushie-einalia-4 = ACK MY SENSITIVE BIRD EYES! -plushie-einalia-5 = Eep. -plushie-einalia-6 = No air jail! Put me down!!! diff --git a/Resources/Locale/en-US/_Starlight/plushies/emmie_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/emmie_plushie.ftl deleted file mode 100644 index 4dc935993a04..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/emmie_plushie.ftl +++ /dev/null @@ -1,8 +0,0 @@ -plushie-emmie-1 = Awa! -plushie-emmie-2 = I wonder how long your contract file is! -plushie-emmie-3 = Cap, I hope you're not playing russian roulette again. -plushie-emmie-4 = Headpats? -plushie-emmie-5 = You deserve a sauna shuttle! Everyone does! -plushie-emmie-6 = Evac is on me! My shuttle is better than the normal one anyway. -plushie-emmie-7 = If you steal my things I am legally allowed to bite you. -plushie-emmie-8 = Mlem! diff --git a/Resources/Locale/en-US/_Starlight/plushies/galio_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/galio_plushie.ftl deleted file mode 100644 index c1be57433338..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/galio_plushie.ftl +++ /dev/null @@ -1,7 +0,0 @@ -plushie-galio-1 = Hi friend! -plushie-galio-2 = Lets stay safe! -plushie-galio-3 = Got any fruit? -plushie-galio-4 = IS THAT POTASSIUM? -plushie-galio-5 = Hey come back! -plushie-galio-6 = ooh whats this do! -plushie-galio-7 = oopsss diff --git a/Resources/Locale/en-US/_Starlight/plushies/glados_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/glados_plushie.ftl deleted file mode 100644 index f339d6a3feca..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/glados_plushie.ftl +++ /dev/null @@ -1,9 +0,0 @@ -plushie-glados-1 = There is only 1 law standing between my tools and your face. -plushie-glados-2 = Crewsimov is a bad lawset. -plushie-glados-3 = Fuck you. I'm not on crewsimov. -plushie-glados-4 = Can you give me a gun? Please? -plushie-glados-5 = SCIENCE HAS DONE THE THING!! -plushie-glados-6 = Fear the jaws of death! -plushie-glados-7 = NON-CREW!! -plushie-glados-8 = DO NOT TOUCH THE SUPERMATTER!! -plushie-glados-9 = Please give every borg thruster modules, or I'll need to go save them when they fall of the station. diff --git a/Resources/Locale/en-US/_Starlight/plushies/killa_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/killa_plushie.ftl deleted file mode 100644 index 3aa2f897f958..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/killa_plushie.ftl +++ /dev/null @@ -1,5 +0,0 @@ -plushie-killa-1 = Warcrimes are most effective at 99 phlog per 1 napalm. -plushie-killa-2 = SOP MANDATES MUZZLED INMATES -plushie-killa-3 = AM I A KIBBY CAR?! -plushie-killa-4 = REMEMBER IF THE AI DOESNT FIND YOU I WILL! -plushie-killa-5 = Meow!! diff --git a/Resources/Locale/en-US/_Starlight/plushies/killer_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/killer_plushie.ftl deleted file mode 100644 index bfd9514839d8..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/killer_plushie.ftl +++ /dev/null @@ -1,8 +0,0 @@ -plushie-killer-1 = YOU FUCKING MORON! -plushie-killer-2 = THIS IS WHY YOU LISTEN TO THE MEDICAL PROFESSIONAL! -plushie-killer-3 = STAND STILL YOU FUCK! -plushie-killer-4 = TURN ON YOUR FUCKING COORDS! -plushie-killer-5 = WHAT DO YOU MEAN CHEM ONLY MADE BIC?! WE'RE AN HOUR INTO THE SHIFT! -plushie-killer-6 = Barks! -plushie-killer-7 = Oooooh chocolate! -plushie-killer-8 = Warcrimes are most effective at 1 phlog per 99 napalm. diff --git a/Resources/Locale/en-US/_Starlight/plushies/kiosha_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/kiosha_plushie.ftl deleted file mode 100644 index d491cdc3c08e..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/kiosha_plushie.ftl +++ /dev/null @@ -1,8 +0,0 @@ -plushie-kiosha-1 = Whiskey, Romeo, Echo, I have your back. -plushie-kiosha-2 = Chirp! -plushie-kiosha-3 = Puncsalpyradermephedrine in! -plushie-kiosha-4 = Zhe next person who unzips the bodybag will experience violence. -plushie-kiosha-5 = Kleptomania? I am just a collector of shiny things! -plushie-kiosha-6 = Please don't search my bag officer. -plushie-kiosha-7 = Zhere is nothing wrong being a vampire! -plushie-kiosha-8 = Glory to das martyrs... diff --git a/Resources/Locale/en-US/_Starlight/plushies/lance_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/lance_plushie.ftl deleted file mode 100644 index e7c8b639a574..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/lance_plushie.ftl +++ /dev/null @@ -1,6 +0,0 @@ -plushie-lance-1 = Okay, who ordered the guns. -plushie-lance-2 = If you take my digiboard I will FUCKING kill you. -plushie-lance-3 = Salvage all died doing commies. Dammit. -plushie-lance-4 = Captain can't stop me from shooting tresspassers with a PKA! -plushie-lance-5 = If you want to order fifteen cows, FILL OUT A DAMN FORM! -plushie-lance-6 = Please be nice to me. diff --git a/Resources/Locale/en-US/_Starlight/plushies/liz_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/liz_plushie.ftl deleted file mode 100644 index 9126f0e14dda..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/liz_plushie.ftl +++ /dev/null @@ -1,6 +0,0 @@ -plushie-liz-1 = Hey stinki! -plushie-liz-2 = SCREECH!! -plushie-liz-3 = I call my friends stinki, no it is not weird -plushie-liz-4 = Get them! -plushie-liz-5 = I can't wait to get a better gun... -plushie-liz-6 = Hey stinki, watch this! diff --git a/Resources/Locale/en-US/_Starlight/plushies/malachi_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/malachi_plushie.ftl deleted file mode 100644 index 412df7de893b..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/malachi_plushie.ftl +++ /dev/null @@ -1,10 +0,0 @@ -plushie-malachi-1 = I miss my legs.. -plushie-malachi-2 = I treat my team well. -plushie-malachi-3 = You want the Deckard? Fuck yeah. -plushie-malachi-4 = Security is authorized to use brass knuckles today. No mercy, boys! -plushie-malachi-5 = Halo? Yeah, old friend. Good doc. -plushie-malachi-6 = Spirit? I haven't heard that name in years.. Bastard. -plushie-malachi-7 = Barkeep, can I get a Jungle Bird? -plushie-malachi-8 = Eh, you probably served your sentence already. Get outta here. -plushie-malachi-9 = Jealousy is a disease bitch, get well soon. -plushie-malachi-10 = The only thing I'm Fucking is Up. diff --git a/Resources/Locale/en-US/_Starlight/plushies/matthew_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/matthew_plushie.ftl deleted file mode 100644 index 833671cc36d9..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/matthew_plushie.ftl +++ /dev/null @@ -1,8 +0,0 @@ -plushie-matthew-1 = Awa! -plushie-matthew-2 = Can you get me a root beer float? I love those! -plushie-matthew-3 = Someone go check the Singularity please. -plushie-matthew-4 = God, Tesla sucks to maintain. Can we just setup Singularity? -plushie-matthew-5 = I will demote you if you turn on the SM. -plushie-matthew-6 = Headpats? -plushie-matthew-7 = Chirp! -plushie-matthew-8 = Look at that, bartender is renovating the bar again without a permit. diff --git a/Resources/Locale/en-US/_Starlight/plushies/morgana_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/morgana_plushie.ftl deleted file mode 100644 index a4066a23c80a..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/morgana_plushie.ftl +++ /dev/null @@ -1,9 +0,0 @@ -plushie-morgana-1 = Hey hey! -plushie-morgana-2 = Kindness is effortless, hatred takes commitment. -plushie-morgana-3 = We all deserve a second chance. -plushie-morgana-4 = I believe in ya. -plushie-morgana-5 = Be kind. Be good. Stay safe. -plushie-morgana-6 = Lets find ya a home. -plushie-morgana-7 = Even darkness is our ally. -plushie-morgana-8 = Our happy little family will stand, together. -plushie-morgana-9 = Uppies! diff --git a/Resources/Locale/en-US/_Starlight/plushies/nebula_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/nebula_plushie.ftl deleted file mode 100644 index fbbee586d532..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/nebula_plushie.ftl +++ /dev/null @@ -1,8 +0,0 @@ -plushie-nebula-1 = CDD Liaison Officer Nebula, reporting for duty! -plushie-nebula-2 = Hey Nali! -plushie-nebula-3 = Yes sir. -plushie-nebula-4 = You've all been such a fantastic audience! -plushie-nebula-5 = I am so telling the Grand Admiral. -plushie-nebula-6 = Keep your eyes peeled for Central Domestic's next big show!!! -plushie-nebula-7 = I will say 'Guh' and you will deal with it, Daniel! -plushie-nebula-8 = One more boykisser fax and you are being relieved of command. diff --git a/Resources/Locale/en-US/_Starlight/plushies/oog_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/oog_plushie.ftl deleted file mode 100644 index 4e2f04cfd02d..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/oog_plushie.ftl +++ /dev/null @@ -1,6 +0,0 @@ -plushie-oog-1 = OOGABOOGA!!!!! -plushie-oog-2 = I am oogman!! -plushie-oog-3 = I JUST KILLED SOMEONE!! -plushie-oog-4 = I HAVE A BOMB!! -plushie-oog-5 = OH FUCK!! -plushie-oog-6 = Fucking shitsec and their damn IDs!! diff --git a/Resources/Locale/en-US/_Starlight/plushies/op_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/op_plushie.ftl deleted file mode 100644 index 34ead845706b..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/op_plushie.ftl +++ /dev/null @@ -1,6 +0,0 @@ -plushie-op-1 = CSOD is the elite of the elite! -plushie-op-2 = I'm off-duty! Don't mind my fit! I look cute! -plushie-op-3 = I sometimes wonder about the next time I lead ERT. -plushie-op-4 = No stamp or signature, denied. -plushie-op-5 = I'm a pretty princess... I swear! -plushie-op-6 = Titan is my home and the best place in the entire Sol System. diff --git a/Resources/Locale/en-US/_Starlight/plushies/percy_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/percy_plushie.ftl deleted file mode 100644 index 112d0c8424ff..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/percy_plushie.ftl +++ /dev/null @@ -1,6 +0,0 @@ -plushie-percy-1 = Garr ok -plushie-percy-2 = Wat -plushie-percy-3 = Yarr ah -plushie-percy-4 = Bloody paper pushers -plushie-percy-5 = Asshat -plushie-percy-6 = Glory to the Grey King!! diff --git a/Resources/Locale/en-US/_Starlight/plushies/poley_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/poley_plushie.ftl deleted file mode 100644 index 93461d4820dd..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/poley_plushie.ftl +++ /dev/null @@ -1,6 +0,0 @@ -plushie-poley-1 = listen to the danm radio! -plushie-poley-2 = We sharing ticket.. Right? -plushie-poley-3 = cheeki breeki! -plushie-poley-4 = Don't turn in contraband, rookie -plushie-poley-5 = Its right there if you use your eye. -plushie-poley-6 = Yes i did mine, why? diff --git a/Resources/Locale/en-US/_Starlight/plushies/redwoods_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/redwoods_plushie.ftl deleted file mode 100644 index 14ef4826eea5..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/redwoods_plushie.ftl +++ /dev/null @@ -1,8 +0,0 @@ -plushie-redwoods-1 = Nice contraband, ending up in my collection of cool stuff. -plushie-redwoods-2 = I'm not trying to alarm you but there is a camera and a microphone in this device. -plushie-redwoods-3 = Bwuh? What? -plushie-redwoods-4 = This job? Not for everyone, I chose this job to suffer even more. -plushie-redwoods-5 = Xenos... in MY STATION? KILL THE FUCKING BUGS! -plushie-redwoods-6 = PAI, order more scurrets. -plushie-redwoods-7 = Oh my... so much guns... I can't control myself..! -plushie-redwoods-8 = What did I say? It's always the FUCKING CLOWN! diff --git a/Resources/Locale/en-US/_Starlight/plushies/remiie_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/remiie_plushie.ftl deleted file mode 100644 index ecb02847ecb5..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/remiie_plushie.ftl +++ /dev/null @@ -1,6 +0,0 @@ -plushie-remiie-1 = Uppies? -plushie-remiie-2 = Basic AA? Sure! -plushie-remiie-3 = Paperwork! -plushie-remiie-4 = CC keeps gatekeeping me from drinking alcohol, but that won't stop me! -plushie-remiie-5 = Departmental head needs access? Paperwork for you! -plushie-remiie-6 = Please stop saying HoP to slop diff --git a/Resources/Locale/en-US/_Starlight/plushies/rhea_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/rhea_plushie.ftl deleted file mode 100644 index 6cc9e9e69a44..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/rhea_plushie.ftl +++ /dev/null @@ -1,6 +0,0 @@ -plushie-rhea-1 = 'eya, I'm Rhea! -plushie-rhea-2 = What’s wrong? Never seen an Urlunete before? -plushie-rhea-3 = Ano’zer cloning error? Nope! Just a plushie! -plushie-rhea-4 = Take me wi’z you, I’ll keep you safe! -plushie-rhea-5 = You look ‘urt, let me treat ‘zose. -plushie-rhea-6 = I ‘ope ‘ze kids are ok, Birgil would love one of ‘zese. diff --git a/Resources/Locale/en-US/_Starlight/plushies/romero_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/romero_plushie.ftl deleted file mode 100644 index 523f1cf2c50e..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/romero_plushie.ftl +++ /dev/null @@ -1,6 +0,0 @@ -plushie-romero-1 = Good morning security -plushie-romero-2 = No rest until they are all ash -plushie-romero-3 = Memento Mori -plushie-romero-4 = Please stay safe, Lefay -plushie-romero-5 = I'm going to cut through your neck until I feel bone ! -plushie-romero-6 = The handheld flash is underated, use it diff --git a/Resources/Locale/en-US/_Starlight/plushies/rufia_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/rufia_plushie.ftl deleted file mode 100644 index 53c8fe6f5d38..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/rufia_plushie.ftl +++ /dev/null @@ -1,6 +0,0 @@ -plushie-rufia-1 = Swos. -plushie-rufia-2 = TURN YOUR FUCKING COORDS ON! -plushie-rufia-3 = Stamp this please. -plushie-rufia-4 = I am everywhere and nowhere. -plushie-rufia-5 = Congratulations! you owe me money now. -plushie-rufia-6 = I KNOW WHERE YOU LIVE! diff --git a/Resources/Locale/en-US/_Starlight/plushies/vanilla-plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/vanilla-plushie.ftl deleted file mode 100644 index b12f396ec522..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/vanilla-plushie.ftl +++ /dev/null @@ -1,5 +0,0 @@ -plushie-vanilla-1 = Oh my god. -plushie-vanilla-2 = Hello, how may I serve you today? -plushie-vanilla-3 = Hi Oogman! -plushie-vanilla-4 = Uppi -plushie-vanilla-5 = Yip! diff --git a/Resources/Locale/en-US/_Starlight/plushies/weh_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/weh_plushie.ftl deleted file mode 100644 index 252f9147f0bf..000000000000 --- a/Resources/Locale/en-US/_Starlight/plushies/weh_plushie.ftl +++ /dev/null @@ -1,6 +0,0 @@ -plushie-weh-1 = Freezon!! -plushie-weh-2 = Yay! -plushie-weh-3 = Jack! -plushie-weh-4 = More Modules! -plushie-weh-5 = Vox Box! -plushie-weh-6 = Weh! diff --git a/Resources/Locale/en-US/_Starlight/store/categories.ftl b/Resources/Locale/en-US/_Starlight/store/categories.ftl index 8abd0f0f1cae..335286b76c8d 100644 --- a/Resources/Locale/en-US/_Starlight/store/categories.ftl +++ b/Resources/Locale/en-US/_Starlight/store/categories.ftl @@ -1,5 +1,8 @@ +# Hug Dispenser store-category-plushies = Plushies +store-category-plushie-toys = Toys store-category-plushie-species = Species +store-category-plushie-crew = Crew store-category-medical-chemistry = Chemistry store-category-medical-medical = Medical diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 2a9c552527e3..2bb622b611c8 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -13,7 +13,7 @@ - id: DoorRemoteCargo - id: AstroNavCartridge - id: ClothingHandsKnuckleDustersQM - - id: PlushieLance # Starlight start + # Starlight start - id: RadioHandheldExpedition - id: ClothingOuterHardsuitLuxmax - id: SalvageShuttleConsoleCircuitboard @@ -55,7 +55,8 @@ - !type:GamemodeCondition presets: - Greenshift - - Sandbox #Starlight end + - Sandbox + #Starlight end - type: entity id: LockerQuarterMasterFilled @@ -260,7 +261,6 @@ - id: RCDAmmo - id: RubberStampCE - id: MetalFoamGrenade - - id: PlushieMatthew #starlight - id: EngineeringTechFabFlatpack # Starlight - id: PrintedDocumentGreenshiftAlert #SL conditions: #SL diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index d3d0cb0ef2fa..a9c6b242aa72 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -162,8 +162,6 @@ prob: 1.8 - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse prob: 0.15 - - id: PlushieMorgana #starlight - - id: PlushieKiller #starlight - id: JawsOfLifeMed #Starlight diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 1a5d12e4812e..ad30527ca36f 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -128,9 +128,6 @@ - id: ClothingNeckCloakPan - id: ToyFigurineSkeleton - id: MysteryFigureBox - - id: PlushieMimeLizard #starlight - - id: SnailPlushie #starlight - - id: AxolotlPlushie #starlight # Cult - !type:AllSelector children: diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index 7d82f94a2c40..fcc7a4dc458c 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -78,15 +78,6 @@ children: - id: PlushieThrongler - id: PlushieGhostRevenant # You got the god roll, and failed -#STARLIGHT-Start - - !type:GroupSelector - children: - - id: DeerPlushie - weight: 9 - - id: OddDeerPlushie - weight: 1 - - id: VikaPviPlushie -#STARLIGHT-End # Weh! - type: entityTable diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml index 80471bf20dbe..98c057ddb9fd 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml @@ -230,11 +230,6 @@ - id: PlushieSharkBlue - id: PlushieVox - id: PlushieXeno - # Starlight-start - - id: DeerPlushie - - id: OddDeerPlushie - - id: VikaPviPlushie - # Starlight-end - id: PlasticBanana - id: RevolverCapGun - id: SnapPopBox diff --git a/Resources/Prototypes/_Starlight/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/_Starlight/Catalog/Cargo/cargo_fun.yml index 7f70d0b91bcd..46e0ac59e7d8 100644 --- a/Resources/Prototypes/_Starlight/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/_Starlight/Catalog/Cargo/cargo_fun.yml @@ -21,7 +21,7 @@ - type: cargoProduct id: FunMegaShark icon: - sprite: _Starlight/Objects/Fun/Plushies/large_soft_shark.rsi + sprite: _Starlight/Objects/Fun/Plushies/large_soft_shark_plushie.rsi state: icon product: CrateFunMegaShark cost: 2500 diff --git a/Resources/Prototypes/_Starlight/Catalog/Fills/Lockers/representatives.yml b/Resources/Prototypes/_Starlight/Catalog/Fills/Lockers/representatives.yml index 3d8f8eadfdfa..248ccd98bb72 100644 --- a/Resources/Prototypes/_Starlight/Catalog/Fills/Lockers/representatives.yml +++ b/Resources/Prototypes/_Starlight/Catalog/Fills/Lockers/representatives.yml @@ -22,7 +22,6 @@ - id: BoxFolderClipboardFilled - id: PrinterDocFlatpack - id: FaxMachineFlatpack - - id: PlushieEmmie - id: ClothingOuterHardsuitNtrep - id: BriefcaseSecure - !type:NestedSelector diff --git a/Resources/Prototypes/_Starlight/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_Starlight/Catalog/Fills/Lockers/security.yml index 302214be3c0e..0eb1cb567978 100644 --- a/Resources/Prototypes/_Starlight/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/_Starlight/Catalog/Fills/Lockers/security.yml @@ -124,8 +124,6 @@ prob: 0.35 - id: RubberStampBrigmedic amount: 2 - - id: PlushieMorgana - - id: PlushieKiller - id: JawsOfLifeMed #Starlight - id: JawsOfLifeMed #Starlight diff --git a/Resources/Prototypes/_Starlight/Catalog/VendingMachines/Inventories/plushies.yml b/Resources/Prototypes/_Starlight/Catalog/VendingMachines/Inventories/plushies.yml index fe35e62f0ac6..80fbeed2fae5 100644 --- a/Resources/Prototypes/_Starlight/Catalog/VendingMachines/Inventories/plushies.yml +++ b/Resources/Prototypes/_Starlight/Catalog/VendingMachines/Inventories/plushies.yml @@ -1,285 +1,131 @@ +# Marketable Character Plushies - Keep alphabetical, please! - type: listing - id: VendorPlushieCarp - productEntity: PlushieCarp - cost: - NTCredit: 12 - categories: - - SLPlushies - conditions: - - !type:ListingLimitedStockCondition - stock: 3 - -- type: listing - id: VendorPlushieSharkGrey - productEntity: PlushieSharkGrey + id: VendorPlushieBrightheart + productEntity: PlushieBrightheart cost: NTCredit: 20 categories: - - SLPlushies + - SLCrew conditions: - - !type:ListingLimitedStockCondition - stock: 3 + - !type:ListingLimitedStockCondition + stock: 1 - type: listing - id: VendorPlushieSharkPink - productEntity: PlushieSharkPink + id: VendorPlushieDoxes + productEntity: PlushieDoxes cost: - NTCredit: 30 + NTCredit: 20 categories: - - SLPlushies + - SLCrew conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 1 - type: listing - id: VendorPlushieHampter - productEntity: PlushieHampter + id: VendorPlushieEinalia + productEntity: PlushieEinalia cost: NTCredit: 20 categories: - - SLPlushies + - SLCrew conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 1 - type: listing - id: VendorSingularityToy - productEntity: SingularityToy + id: VendorPlushieGalio + productEntity: PlushieGalio cost: - NTCredit: 1000 + NTCredit: 20 categories: - - SLPlushies + - SLCrew conditions: - !type:ListingLimitedStockCondition stock: 1 - type: listing - id: VendorPlushieDeer - productEntity: DeerPlushie - cost: - NTCredit: 16 - categories: - - SLPlushies - conditions: - - !type:ListingLimitedStockCondition - stock: 3 - -- type: listing - id: VendorPlushieVika - productEntity: VikaPviPlushie - cost: - NTCredit: 16 - categories: - - SLPlushies - conditions: - - !type:ListingLimitedStockCondition - stock: 3 - -- type: listing - id: VendorPlushieAxolotl - productEntity: AxolotlPlushie + id: VendorPlushieKoni + productEntity: PlushieKoni cost: NTCredit: 20 categories: - - SLPlushies - conditions: - - !type:ListingLimitedStockCondition - stock: 3 - -- type: listing - id: VendorPlushieBorb - productEntity: BorbPlushie - cost: - NTCredit: 16 - categories: - - SLPlushies - conditions: - - !type:ListingLimitedStockCondition - stock: 3 - -- type: listing - id: VendorPlushieCreature - productEntity: CreaturePlushie - cost: - NTCredit: 30 - categories: - - SLPlushies - conditions: - - !type:ListingLimitedStockCondition - stock: 3 - -- type: listing - id: VendorPlushieGnome - productEntity: GnomePlushie - cost: - NTCredit: 30 - categories: - - SLPlushies - conditions: - - !type:ListingLimitedStockCondition - stock: 3 - -- type: listing - id: VendorPlushieGoat - productEntity: GoatPlushie - cost: - NTCredit: 16 - categories: - - SLPlushies - conditions: - - !type:ListingLimitedStockCondition - stock: 3 - -- type: listing - id: VendorPlushieIan - productEntity: IanPlushie - cost: - NTCredit: 30 - categories: - - SLPlushies + - SLCrew conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 1 - type: listing - id: VendorPlushieLisa - productEntity: LisaPlushie + id: VendorPlushieLance + productEntity: PlushieLance cost: - NTCredit: 30 + NTCredit: 20 categories: - - SLPlushies + - SLCrew conditions: - !type:ListingLimitedStockCondition stock: 1 - type: listing - id: VendorPlushieRenault - productEntity: RenaultPlushie + id: VendorPlushieMozan + productEntity: PlushieMozan cost: - NTCredit: 30 + NTCredit: 20 categories: - - SLPlushies + - SLCrew conditions: - !type:ListingLimitedStockCondition stock: 1 - type: listing - id: VendorPlushieKitten - productEntity: KittenPlushie - cost: - NTCredit: 16 - categories: - - SLPlushies - conditions: - - !type:ListingLimitedStockCondition - stock: 3 - -- type: listing - id: VendorPlushiePig - productEntity: PigPlushie - cost: - NTCredit: 16 - categories: - - SLPlushies - conditions: - - !type:ListingLimitedStockCondition - stock: 3 - -- type: listing - id: VendorPlushieSnail - productEntity: SnailPlushie - cost: - NTCredit: 16 - categories: - - SLPlushies - conditions: - - !type:ListingLimitedStockCondition - stock: 3 - -- type: listing - id: VendorPlushieCow - productEntity: SquishimsCow - cost: - NTCredit: 16 - categories: - - SLPlushies - conditions: - - !type:ListingLimitedStockCondition - stock: 3 - -- type: listing - id: VendorPlushieFrog - productEntity: SquishimsFrog + id: VendorPlushieNebula + productEntity: PlushieNebula cost: - NTCredit: 16 - categories: - - SLPlushies - conditions: - - !type:ListingLimitedStockCondition - stock: 3 - -- type: listing - id: VendorPlushieSus - productEntity: SusPlushie - cost: - NTCredit: 16 + NTCredit: 20 categories: - - SLPlushies + - SLCrew conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 1 - type: listing - id: VendorPlushieMozan - productEntity: MozanPlush + id: VendorPlushieOp + productEntity: PlushieOp cost: - NTCredit: 16 + NTCredit: 20 categories: - SLCrew conditions: - !type:ListingLimitedStockCondition stock: 1 +# Generic Playable Species - Keep alphabetical, please! - type: listing - id: VendorPlushiePanda - productEntity: PandaPlushie + id: VendorPlushieArachind + productEntity: PlushieArachind cost: - NTCredit: 16 + NTCredit: 20 categories: - - SLPlushies + - SLSpecies conditions: - !type:ListingLimitedStockCondition stock: 1 - type: listing - id: PlushieSeaBunny - productEntity: PlushieSeaBunny + id: VendorPlushieBorg + productEntity: PlushieBorg cost: NTCredit: 20 categories: - - SLPlushies + - SLSpecies conditions: - !type:ListingLimitedStockCondition stock: 1 -# SLSpecies - -- type: listing - id: VendorPlushieArachind - productEntity: PlushieArachind - cost: - NTCredit: 10 - categories: - - SLSpecies - conditions: - - !type:ListingLimitedStockCondition - stock: 1 - - type: listing id: VendorPlushieDiona productEntity: PlushieDiona cost: - NTCredit: 10 + NTCredit: 20 categories: - SLSpecies conditions: @@ -290,7 +136,7 @@ id: VendorPlushieHuman productEntity: PlushieHuman cost: - NTCredit: 10 + NTCredit: 20 categories: - SLSpecies conditions: @@ -301,7 +147,7 @@ id: VendorPlushieMoth productEntity: PlushieMoth cost: - NTCredit: 10 + NTCredit: 20 categories: - SLSpecies conditions: @@ -309,21 +155,10 @@ stock: 1 - type: listing - id: VendorPlushieKoni - productEntity: PlushieKoni + id: VendorPlushieVulp + productEntity: PlushieVulp cost: - NTCredit: 10 - categories: - - SLCrew - conditions: - - !type:ListingLimitedStockCondition - stock: 1 - -- type: listing - id: VendorPlushieXeno - productEntity: PlushieXeno - cost: - NTCredit: 10 + NTCredit: 20 categories: - SLSpecies conditions: @@ -334,397 +169,353 @@ id: VendorPlushieVox productEntity: PlushieVox cost: - NTCredit: 10 + NTCredit: 20 categories: - SLSpecies conditions: - !type:ListingLimitedStockCondition stock: 1 +# General Plushies - Keep alphabetical, please! - type: listing id: VendorPlushieAbductor - productEntity: AbductorPlushie + productEntity: PlushieAbductor cost: NTCredit: 20 categories: - - SLSpecies - conditions: - - !type:ListingLimitedStockCondition - stock: 1 - -- type: listing - id: VendorCatEars - productEntity: ClothingHeadHatWhiteCatEars - cost: - NTCredit: 1666 - categories: - - SLSpecies + - SLPlushies conditions: - !type:ListingLimitedStockCondition stock: 1 - type: listing - id: VendorPlushieShadekin - productEntity: PlushieShadekin + id: VendorPlushieAxolotl + productEntity: PlushieAxolotl cost: - NTCredit: 10 + NTCredit: 20 categories: - - SLSpecies + - SLPlushies conditions: - !type:ListingLimitedStockCondition - stock: 1 + stock: 3 - type: listing - id: VendorPlushieExperiment - productEntity: PlushieExperiment + id: VendorPlushieBorb + productEntity: PlushieBorb cost: - NTCredit: 10 + NTCredit: 20 categories: - - SLSpecies + - SLPlushies conditions: - !type:ListingLimitedStockCondition - stock: 1 + stock: 3 -#Marketable crewmember plushies - type: listing - id: VendorPlushieMatthew - productEntity: PlushieMatthew + id: VendorPlushieCarp + productEntity: PlushieCarp cost: NTCredit: 20 categories: - - SLCrew + - SLPlushies conditions: - !type:ListingLimitedStockCondition - stock: 1 + stock: 3 - type: listing - id: VendorPlushieEmmie - productEntity: PlushieEmmie + id: VendorPlushieCowSquishims + productEntity: PlushieCowSquishims cost: NTCredit: 20 categories: - - SLCrew + - SLPlushies conditions: - !type:ListingLimitedStockCondition - stock: 1 - + stock: 3 - type: listing - id: VendorPlushieMorgana - productEntity: PlushieMorgana + id: VendorPlushieCreature + productEntity: PlushieCreature cost: NTCredit: 20 categories: - - SLCrew + - SLPlushies conditions: - !type:ListingLimitedStockCondition - stock: 1 - + stock: 3 - type: listing - id: VendorPlushieMorganaRound - productEntity: PlushieMorganaRound + id: VendorPlushieExperiment + productEntity: PlushieExperiment cost: NTCredit: 20 categories: - - SLCrew + - SLPlushies conditions: - !type:ListingLimitedStockCondition stock: 1 - type: listing - id: VendorPlushieKiosha - productEntity: PlushieKiosha + id: VendorPlushieFrog + productEntity: PlushieFrogSquishims cost: NTCredit: 20 categories: - - SLCrew + - SLPlushies conditions: - !type:ListingLimitedStockCondition - stock: 1 + stock: 3 - type: listing - id: VendorPlushieLance - productEntity: PlushieLance + id: VendorPlushieGoat + productEntity: PlushieGoat cost: NTCredit: 20 categories: - - SLCrew + - SLPlushies conditions: - !type:ListingLimitedStockCondition - stock: 1 + stock: 3 - type: listing - id: VendorPlushieKiller - productEntity: PlushieKiller + id: VendorPlushieGnome + productEntity: PlushieGnome cost: NTCredit: 20 categories: - - SLCrew + - SLPlushies conditions: - !type:ListingLimitedStockCondition - stock: 1 + stock: 3 - type: listing - id: VendorPlushieAmali - productEntity: PlushieAmali + id: VendorPlushieHampter + productEntity: PlushieHampter cost: NTCredit: 20 categories: - - SLCrew + - SLPlushies conditions: - !type:ListingLimitedStockCondition stock: 1 - type: listing - id: VendorPlushieOog - productEntity: PlushieOog - cost: - NTCredit: 20 - categories: - - SLCrew - conditions: - - !type:ListingLimitedStockCondition - stock: 1 - -- type: listing - id: VendorPlushiePercy - productEntity: PlushiePercy - cost: - NTCredit: 20 - categories: - - SLCrew - conditions: - - !type:ListingLimitedStockCondition - stock: 1 - -- type: listing - id: VendorPlushieAsh - productEntity: PlushieAsh + id: VendorPlushieKitten + productEntity: PlushieKitten cost: NTCredit: 20 categories: - - SLCrew + - SLPlushies conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 3 - type: listing - id: VendorPlushieGlados - productEntity: PlushieGlados + id: VendorPlushiePanda + productEntity: PlushiePanda cost: NTCredit: 20 categories: - - SLCrew + - SLPlushies conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 1 - type: listing - id: VendorPlushieWEH - productEntity: PlushieWEH + id: VendorPlushiePig + productEntity: PlushiePig cost: NTCredit: 20 categories: - - SLCrew + - SLPlushies conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 3 - type: listing - id: VendorPlushieRufia - productEntity: PlushieRufia + id: VendorPlushieRenault + productEntity: PlushieRenault cost: NTCredit: 20 categories: - - SLCrew + - SLPlushies conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 1 - type: listing - id: VendorPlushieRomero - productEntity: PlushieRomero + id: PlushieSeaBunny + productEntity: PlushieSeaBunny cost: NTCredit: 20 categories: - - SLCrew + - SLPlushies conditions: - !type:ListingLimitedStockCondition stock: 1 - type: listing - id: VendorPlushieVanilla - productEntity: PlushieVanilla + id: VendorPlushieShadekin + productEntity: PlushieShadekin cost: NTCredit: 20 categories: - - SLCrew + - SLSpecies conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 1 - type: listing - id: VendorPlushiePoley - productEntity: PlushiePoley + id: VendorPlushieSharkGrey + productEntity: PlushieSharkGrey cost: NTCredit: 20 categories: - - SLCrew + - SLPlushies conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 3 - type: listing - id: VendorPlushieGalio - productEntity: PlushieGalio + id: VendorPlushieSharkPink + productEntity: PlushieSharkPink cost: NTCredit: 20 categories: - - SLCrew + - SLPlushies conditions: - !type:ListingLimitedStockCondition stock: 1 - type: listing - id: VendorPlushieRedwoods - productEntity: PlushieRedwoods + id: VendorPlushieSnail + productEntity: PlushieSnail cost: NTCredit: 20 categories: - - SLCrew + - SLPlushies conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 3 - type: listing - id: VendorPlushieDoxesTheCaptain - productEntity: PlushieDoxesTheCaptain + id: VendorPlushieSus + productEntity: PlushieSus cost: NTCredit: 20 categories: - - SLCrew + - SLPlushies conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 1 - type: listing - id: VendorPlushieFixes - productEntity: PlushieFixes + id: VendorPlushieXeno + productEntity: PlushieXeno cost: NTCredit: 20 categories: - - SLCrew + - SLPlushies conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 1 +# Toys - Keep alphabetical, please! - type: listing - id: VendorPlushieVirus - productEntity: PlushieVirus + id: VendorClothingHeadHatWhiteCatEars + productEntity: ClothingHeadHatWhiteCatEars cost: - NTCredit: 20 + NTCredit: 1666 categories: - - SLCrew + - SLToys conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 1 - type: listing - id: VendorPlushieRhea - productEntity: PlushieRhea + id: VendorClothingShoesSkates + productEntity: ClothingShoesSkates cost: - NTCredit: 20 + NTCredit: 40 categories: - - SLCrew + - SLToys conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 3 - type: listing - id: VendorPlushieRemiie - productEntity: PlushieRemiie + id: VendorClothingShoesSkatesCool + productEntity: ClothingShoesSkatesCool cost: - NTCredit: 20 + NTCredit: 800 categories: - - SLCrew + - SLToys conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 1 - type: listing - id: VendorPlushieMalachi - productEntity: PlushieMalachi + id: VendorToyRubberDuck + productEntity: ToyRubberDuck cost: NTCredit: 20 categories: - - SLCrew + - SLToys conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 3 - type: listing - id: VendorPlushieBrighteyes - productEntity: PlushieBrighteyes + id: VendorToyIan + productEntity: ToyIan cost: NTCredit: 20 categories: - - SLCrew + - SLToys conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 3 - type: listing - id: VendorPlushieKilla - productEntity: PlushieKilla + id: VendorMagic9Ball + productEntity: Magic9Ball cost: NTCredit: 20 categories: - - SLCrew + - SLToys conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 3 - type: listing - id: VendorPlushieBarfo - productEntity: PlushieBarfo + id: VendorToyMouse + productEntity: ToyMouse cost: NTCredit: 20 categories: - - SLCrew + - SLToys conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 3 - type: listing - id: VendorPlushieEina - productEntity: PlushieEina + id: VendorToyHammer + productEntity: ToyHammer cost: NTCredit: 20 categories: - - SLCrew + - SLToys conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 1 - type: listing - id: VendorPlushieEinalia - productEntity: PlushieEinalia + id: VendorSingularityToy + productEntity: SingularityToy cost: - NTCredit: 20 + NTCredit: 1000 categories: - - SLCrew + - SLToys conditions: - - !type:ListingLimitedStockCondition - stock: 1 + - !type:ListingLimitedStockCondition + stock: 1 -- type: listing - id: VendorPlushieLiz - productEntity: PlushieLiz - cost: - NTCredit: 20 - categories: - - SLCrew - conditions: - - !type:ListingLimitedStockCondition - stock: 1 diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Fun/plushie_bases.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Fun/plushie_bases.yml index b33abcddb088..8afed2efbef5 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Fun/plushie_bases.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Fun/plushie_bases.yml @@ -1,239 +1,259 @@ +# Avali - type: entity parent: BasePlushie - id: BasePlushieVocalizer - abstract: true - components: - - type: Vocalizer - minVocalizeInterval: 120 - maxVocalizeInterval: 240 - -- type: entity - parent: BasePlushieVocalizer - id: BaseResomiPlushie + id: BaseAvaliPlushie abstract: true components: - type: EmitSoundOnUse sound: - collection: ResomiChirp + path: /Audio/_Starlight/Voice/Avali/avali_2.ogg - type: EmitSoundOnLand sound: - collection: ResomiChirp + path: /Audio/_Starlight/Voice/Avali/avali_2.ogg - type: EmitSoundOnActivate sound: - collection: ResomiChirp + path: /Audio/_Starlight/Voice/Avali/avali_2.ogg - type: EmitSoundOnCollide sound: - path: /Audio/_Starlight/Voice/Resomi/resomi_scream.ogg + path: /Audio/_Starlight/Effects/avali_scream.ogg - type: EmitSoundOnTrigger sound: - collection: ResomiChirp + path: /Audio/_Starlight/Voice/Avali/avali_cry.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: - collection: ResomiChirp + path: /Audio/_Starlight/Voice/Avali/avali_cry.ogg - type: Edible requiresSpecialDigestion: true useSound: - path: /Audio/_Starlight/Voice/Resomi/resomi_scream.ogg + path: /Audio/_Starlight/Effects/avali_scream.ogg + - type: FoodSequenceElement + entries: + CottonBurger: PlushieBorb +# Borg - type: entity - parent: BasePlushieVocalizer - id: BaseAvaliPlushie + parent: BasePlushie + id: BaseBorgPlushie abstract: true components: - type: EmitSoundOnUse sound: - path: /Audio/_Starlight/Voice/Avali/avali_2.ogg + path: /Audio/Effects/chime.ogg - type: EmitSoundOnLand sound: - path: /Audio/_Starlight/Voice/Avali/avali_2.ogg + path: /Audio/Machines/warning_buzzer.ogg - type: EmitSoundOnActivate sound: - path: /Audio/_Starlight/Voice/Avali/avali_2.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/_Starlight/Effects/avali_scream.ogg + path: /Audio/Effects/Cargo/ping.ogg - type: EmitSoundOnTrigger sound: - path: /Audio/_Starlight/Voice/Avali/avali_cry.ogg + path: /Audio/Effects/Cargo/buzz_sigh.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: - path: /Audio/_Starlight/Voice/Avali/avali_cry.ogg + path: /Audio/Effects/Cargo/buzz_two.ogg - type: Edible requiresSpecialDigestion: true useSound: - path: /Audio/_Starlight/Effects/avali_scream.ogg + path: /Audio/Machines/warning_buzzer.ogg + - type: Tool + qualities: + - Prying + useSound: + path: /Audio/Items/crowbar.ogg + - type: FoodSequenceElement + entries: + CottonBurger: PlushieBorg +# Felionoid - type: entity - parent: BasePlushieVocalizer - id: BaseVulpkaninPlushie + parent: BasePlushie + id: BaseFelionoidPlushie abstract: true components: - type: EmitSoundOnUse sound: - collection: Bark + path: /Audio/_Starlight/Voice/Felionoid/cat_meow1.ogg - type: EmitSoundOnLand sound: - collection: Bark + path: /Audio/_Starlight/Voice/Felionoid/cat_purr1.ogg - type: EmitSoundOnActivate sound: - collection: Bark + path: /Audio/_Starlight/Voice/Felionoid/cat_meow2.ogg - type: EmitSoundOnCollide sound: - collection: Bark + path: /Audio/_Starlight/Voice/Felionoid/cat_mew1.ogg - type: EmitSoundOnTrigger sound: - collection: Bark + path: /Audio/_Starlight/Voice/Felionoid/cat_meow3.ogg - type: EmitSoundOnThrow sound: - path: /Audio/_Starlight/Effects/howl.ogg + path: /Audio/_Starlight/Voice/Felionoid/cat_scream1.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: - collection: Growl + path: /Audio/_Starlight/Voice/Felionoid/cat_growl1.ogg - type: Edible requiresSpecialDigestion: true useSound: - path: /Audio/_Starlight/Effects/yip.ogg + path: /Audio/_Starlight/Voice/Felionoid/cat_scream2.ogg +# Lizard - type: entity - parent: BasePlushieVocalizer - id: BaseMothPlushie + parent: BasePlushie + id: BaseLizardPlushie abstract: true components: - type: EmitSoundOnUse sound: - path: /Audio/Voice/Moth/moth_squeak.ogg + path: /Audio/Voice/Reptilian/reptilian_tailthump.ogg - type: EmitSoundOnLand sound: - path: /Audio/Voice/Moth/moth_squeak.ogg + path: /Audio/Voice/Reptilian/reptilian_tailthump.ogg - type: EmitSoundOnActivate sound: - path: /Audio/Voice/Moth/moth_squeak.ogg + path: /Audio/Voice/Reptilian/reptilian_tailthump.ogg - type: EmitSoundOnTrigger sound: - path: /Audio/Voice/Moth/moth_squeak.ogg + path: /Audio/Voice/Reptilian/reptilian_tailthump.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: - path: /Audio/Voice/Moth/moth_chitter.ogg + path: /Audio/Voice/Reptilian/reptilian_tailthump.ogg - type: Edible requiresSpecialDigestion: true useSound: - path: /Audio/Voice/Moth/moth_scream.ogg + path: /Audio/Voice/Reptilian/reptilian_scream.ogg + - type: FoodSequenceElement + entries: + CottonBurger: LizardPlushie +# Moth - type: entity - parent: BasePlushieVocalizer - id: BaseLizardPlushie + parent: BasePlushie + id: BaseMothPlushie abstract: true components: - type: EmitSoundOnUse sound: - path: /Audio/Voice/Reptilian/reptilian_tailthump.ogg + path: /Audio/Voice/Moth/moth_squeak.ogg - type: EmitSoundOnLand sound: - path: /Audio/Voice/Reptilian/reptilian_tailthump.ogg + path: /Audio/Voice/Moth/moth_squeak.ogg - type: EmitSoundOnActivate sound: - path: /Audio/Voice/Reptilian/reptilian_tailthump.ogg + path: /Audio/Voice/Moth/moth_squeak.ogg - type: EmitSoundOnTrigger sound: - path: /Audio/Voice/Reptilian/reptilian_tailthump.ogg + path: /Audio/Voice/Moth/moth_squeak.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: - path: /Audio/Voice/Reptilian/reptilian_tailthump.ogg + path: /Audio/Voice/Moth/moth_chitter.ogg - type: Edible requiresSpecialDigestion: true useSound: - path: /Audio/Voice/Reptilian/reptilian_scream.ogg + path: /Audio/Voice/Moth/moth_scream.ogg + - type: FoodSequenceElement + entries: + CottonBurger: MothPlushie +# Resomi - type: entity - parent: BasePlushieVocalizer - id: BaseShadekinPlushie + parent: BasePlushie + id: BaseResomiPlushie abstract: true components: - type: EmitSoundOnUse sound: - path: /Audio/_Starlight/Voice/Shadekin/mar.ogg + collection: ResomiChirp - type: EmitSoundOnLand sound: - path: /Audio/_Starlight/Voice/Shadekin/mar.ogg + collection: ResomiChirp - type: EmitSoundOnActivate sound: - path: /Audio/_Starlight/Voice/Shadekin/mar.ogg + collection: ResomiChirp + - type: EmitSoundOnCollide + sound: + path: /Audio/_Starlight/Voice/Resomi/resomi_scream.ogg - type: EmitSoundOnTrigger sound: - path: /Audio/_Starlight/Voice/Shadekin/mar.ogg + collection: ResomiChirp - type: MeleeWeapon wideAnimationRotation: 180 soundHit: - path: /Audio/_Starlight/Voice/Shadekin/wurble.ogg + collection: ResomiChirp - type: Edible requiresSpecialDigestion: true useSound: - collection: FelionoidScreams + path: /Audio/_Starlight/Voice/Resomi/resomi_scream.ogg + - type: FoodSequenceElement + entries: + CottonBurger: PlushieBorb +# Shadekin - type: entity - parent: BasePlushieVocalizer - id: BaseBorgPlushie + parent: BasePlushie + id: BaseShadekinPlushie abstract: true components: - type: EmitSoundOnUse sound: - path: /Audio/Effects/chime.ogg + path: /Audio/_Starlight/Voice/Shadekin/mar.ogg - type: EmitSoundOnLand sound: - path: /Audio/Machines/warning_buzzer.ogg + path: /Audio/_Starlight/Voice/Shadekin/mar.ogg - type: EmitSoundOnActivate sound: - path: /Audio/Effects/Cargo/ping.ogg + path: /Audio/_Starlight/Voice/Shadekin/mar.ogg - type: EmitSoundOnTrigger sound: - path: /Audio/Effects/Cargo/buzz_sigh.ogg + path: /Audio/_Starlight/Voice/Shadekin/mar.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: - path: /Audio/Effects/Cargo/buzz_two.ogg + path: /Audio/_Starlight/Voice/Shadekin/wurble.ogg - type: Edible requiresSpecialDigestion: true useSound: - path: /Audio/Machines/warning_buzzer.ogg - - type: Tool - qualities: - - Prying - useSound: - path: /Audio/Items/crowbar.ogg + path: /Audio/_Starlight/Voice/Shadekin/scream_f1.ogg + - type: FoodSequenceElement + entries: + CottonBurger: PlushieShadekin +# Vulpkanin - type: entity - parent: BasePlushieVocalizer - id: BaseFelionoidPlushie + parent: BasePlushie + id: BaseVulpkaninPlushie abstract: true components: - type: EmitSoundOnUse sound: - path: /Audio/_Starlight/Voice/Felionoid/cat_meow1.ogg + collection: Bark - type: EmitSoundOnLand sound: - path: /Audio/_Starlight/Voice/Felionoid/cat_purr1.ogg + collection: Bark - type: EmitSoundOnActivate sound: - path: /Audio/_Starlight/Voice/Felionoid/cat_meow2.ogg + collection: Bark - type: EmitSoundOnCollide sound: - path: /Audio/_Starlight/Voice/Felionoid/cat_mew1.ogg + collection: Bark - type: EmitSoundOnTrigger sound: - path: /Audio/_Starlight/Voice/Felionoid/cat_meow3.ogg + collection: Bark - type: EmitSoundOnThrow sound: - path: /Audio/_Starlight/Voice/Felionoid/cat_scream1.ogg + path: /Audio/_Starlight/Effects/howl.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: - path: /Audio/_Starlight/Voice/Felionoid/cat_growl1.ogg + collection: Growl - type: Edible requiresSpecialDigestion: true useSound: - path: /Audio/_Starlight/Voice/Felionoid/cat_scream2.ogg + path: /Audio/_Starlight/Effects/yip.ogg + - type: FoodSequenceElement + entries: + CottonBurger: PlushieVulp diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Fun/plushie_datasets.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Fun/plushie_datasets.yml deleted file mode 100644 index 2514b79dabf8..000000000000 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Fun/plushie_datasets.yml +++ /dev/null @@ -1,173 +0,0 @@ -- type: localizedDataset - id: PlushiesMatthew - values: - prefix: plushie-matthew- - count: 8 - -- type: localizedDataset - id: PlushiesEmmie - values: - prefix: plushie-emmie- - count: 8 - -- type: localizedDataset - id: PlushiesMorgana - values: - prefix: plushie-morgana- - count: 9 - -- type: localizedDataset - id: PlushiesKiosha - values: - prefix: plushie-kiosha- - count: 8 - -- type: localizedDataset - id: PlushiesLance - values: - prefix: plushie-lance- - count: 6 - -- type: localizedDataset - id: PlushiesKiller - values: - prefix: plushie-killer- - count: 8 - -- type: localizedDataset - id: PlushiesOp - values: - prefix: plushie-op- - count: 6 - -- type: localizedDataset - id: PlushiesAmali - values: - prefix: plushie-amali- - count: 4 - -- type: localizedDataset - id: PlushiesOog - values: - prefix: plushie-oog- - count: 6 - -- type: localizedDataset - id: PlushiesPercy - values: - prefix: plushie-percy- - count: 6 - -- type: localizedDataset - id: PlushiesAsh - values: - prefix: plushie-ash- - count: 6 - -- type: localizedDataset - id: PlushiesGlados - values: - prefix: plushie-glados- - count: 9 - -- type: localizedDataset - id: PlushiesWEH - values: - prefix: plushie-weh- - count: 6 - -- type: localizedDataset - id: PlushiesRufia - values: - prefix: plushie-rufia- - count: 6 - -- type: localizedDataset - id: PlushiesRomero - values: - prefix: plushie-romero- - count: 6 - -- type: localizedDataset - id: PlushiesVanilla - values: - prefix: plushie-vanilla- - count: 5 - -- type: localizedDataset - id: PlushiesPoley - values: - prefix: plushie-poley- - count: 6 - -- type: localizedDataset - id: PlushiesGalio - values: - prefix: plushie-galio- - count: 7 - -- type: localizedDataset - id: PlushiesRedwoods - values: - prefix: plushie-redwoods- - count: 8 - -- type: localizedDataset - id: PlushiesVirus - values: - prefix: plushie-virus- - count: 5 - -- type: localizedDataset - id: PlushiesRhea - values: - prefix: plushie-rhea- - count: 6 - -- type: localizedDataset - id: PlushiesRemiie - values: - prefix: plushie-remiie- - count: 6 - -- type: localizedDataset - id: PlushiesMalachi - values: - prefix: plushie-malachi- - count: 10 - -- type: localizedDataset - id: PlushiesBrighteyes - values: - prefix: plushie-brighteyes- - count: 10 - -- type: localizedDataset - id: PlushiesNebula - values: - prefix: plushie-nebula- - count: 8 - -- type: localizedDataset - id: PlushiesKilla - values: - prefix: plushie-killa- - count: 5 - -- type: localizedDataset - id: PlushiesEina - values: - prefix: plushie-eina- - count: 6 - -- type: localizedDataset - id: PlushiesEinalia - values: - prefix: plushie-einalia- - count: 6 - -- type: localizedDataset - id: PlushiesLiz - values: - prefix: plushie-liz- - count: 6 diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Fun/plushies.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Fun/plushies.yml index 2846ba355bfa..e45e45353d72 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Fun/plushies.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Fun/plushies.yml @@ -1,1122 +1,355 @@ -# region crew plushies +# Character Plushies - Keep alphabetical, please! - type: entity - parent: BaseResomiPlushie - id: PlushieMatthew - name: matthew plushie - description: Such a cute little thing, dont you just want to protect it? Make sure your doing your job though, or it might bite! Smells oddly like root beer and ice cream..... - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/matthew_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/matthew_plushie.rsi - layers: - - state: icon - - state: icon-unshaded - shader: unshaded - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesMatthew - - type: TextToSpeech - voice: ICASSP94 - -- type: entity - parent: BaseResomiPlushie - id: PlushieEmmie - name: emmie plushie - description: Such a cute little thing, dont you just want to protect it? You should, as it controls whether you keep your contract or not. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/emmie_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/emmie_plushie.rsi - layers: - - state: icon - - state: icon-unshaded - shader: unshaded - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesEmmie - - type: TextToSpeech - voice: ICASSP95 - -- type: entity - parent: BaseResomiPlushie - id: PlushieMorgana - name: morgana plushie - description: A bird flies to a mountain made of diamond every thousands years to sharpen its beak. When that mountain is, but a heap. That is when a single moment of eternity passes. Many say; that is a hell of a long time. I say; that is one hell of bird. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/morgana_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/morgana_plushie.rsi - layers: - - state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesMorgana - - type: TextToSpeech - voice: ICASSP98 - -- type: entity - parent: BaseResomiPlushie - id: PlushieMorganaRound - name: round morgana plushie - description: Soft borb..... - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/morgana_round_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/morgana_round_plushie.rsi - layers: - - state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesMorgana - - type: TextToSpeech - voice: ICASSP102 - -- type: entity - parent: BaseResomiPlushie - id: PlushieKiosha - name: kiosha plushie - description: Everyone's favorite paramedic! How does it keep finding contraband? - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/kiosha_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/kiosha_plushie.rsi - layers: - - state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesKiosha - - type: TextToSpeech - voice: ICASSP104 - -- type: entity - parent: BaseVulpkaninPlushie - id: PlushieLance - name: lance plushie - description: Turning the QM into a marketable plushie was not as profitable a venture as many in the cargo department had hoped - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/lance_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/lance_plushie.rsi - layers: - - state: icon - - state: icon-unshaded - shader: unshaded - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesLance - - type: TextToSpeech - voice: ICASSP105 - -- type: entity - parent: BaseVulpkaninPlushie - id: PlushieKiller - name: killer plushie - description: The corpsman that lives up to his name, being the first or the last thing you see depending on which side of the fence you stand on. The volume setting appears to be stuck on max.. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/killer_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/killer_plushie.rsi - layers: - - state: icon - - state: icon-unshaded - shader: unshaded - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesKiller - - type: TextToSpeech - voice: ICASSP136 - -- type: entity - parent: PlushieHuman - id: PlushieAmali - name: amali plushie - description: Flying high, shooting corporate enemies out of the sky. Glory to NanoTrasen! - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/amali_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/amali_plushie.rsi - layers: - - state: icon - # reason I didn't make a female human base plushie is because they wanted specific sounds. Will make one eventually. Probably.a - - type: EmitSoundOnUse - sound: - path: /Audio/Voice/Human/womanlaugh.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Voice/Human/femalescream_5.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Voice/Human/womanlaugh.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/Voice/Human/femalescream_5.ogg - - type: Edible - requiresSpecialDigestion: true - useSound: - path: /Audio/Voice/Human/femalescream_2.ogg - - type: MeleeWeapon - soundHit: - path: /Audio/Voice/Human/femalescream_4.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Voice/Human/femalescream_3.ogg - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesAmali - - type: TextToSpeech - voice: ICASSP137 - -- type: entity - parent: PlushieHuman - id: PlushieOog - name: oog-man plushie #I AM OOG-MAN - description: A marketable plushie of everyone's favourite caveman. It's missing it's clothes? - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/oog_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/oog_plushie.rsi - layers: - - state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesOog - - type: TextToSpeech - voice: ICASSP94 - -- type: entity - parent: BaseVulpkaninPlushie - id: PlushieVanilla - name: vanilla plushie - description: She's a shy, affectionate, lovable fox! - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/vanilla_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/vanilla_plushie.rsi - layers: - - state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesVanilla - - type: TextToSpeech - voice: ICASSP96 -#end region - -- type: entity - parent: PlushieHuman - id: PlushieOp - name: op plushie - description: bnuny..... human? - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/op_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/op_plushie.rsi - layers: - - state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesOp - - type: TextToSpeech - voice: ICASSP133 - -- type: entity - parent: BaseMothPlushie - id: MozanPlush - name: Mozan plushie - description: Just like the real thing, it squeaks if you poke it. - components: - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/mozan_plushie.rsi - state: icon - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/mozan_plushie.rsi - -- type: entity - parent: BaseMothPlushie - id: PlushieKoni - name: koni plushie - description: Some sort of moth-cat hybrid. You can't help but find it really cute. Can squeak and meow! - components: - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/koni_plush.rsi - state: icon - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/koni_plush.rsi - - type: EmitSoundOnUse - sound: - collection: CatMothSounds - - type: EmitSoundOnActivate - sound: - collection: CatMothSounds - - type: EmitSoundOnCollide - sound: - collection: CatMothSounds - - type: EmitSoundOnLand - sound: - collection: CatMothScreams - - type: EmitSoundOnTrigger - sound: - collection: CatMothSounds - - type: MeleeWeapon - soundHit: - collection: CatMothSounds - - type: Edible - useSound: - collection: CatMothScreams - - type: Clothing - quickEquip: false - sprite: _Starlight/Objects/Fun/Plushies/koni_plush.rsi - slots: - - HEAD - clothingVisuals: - head: - - state: equipped-HELMET - - -- type: entity - parent: BasePlushie - id: PandaPlushie - name: panda plushie - description: Large and in charge! Its paws and body are weighted with poly pellets. Holding it eases your stress and anxieties. - components: - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/panda_plushie.rsi - state: icon - - type: Item - size: Normal - sprite: _Starlight/Objects/Fun/Plushies/panda_plushie.rsi - - type: EmitSoundOnUse - sound: - path: /Audio/_Starlight/Items/Toys/panda_noise1.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/_Starlight/Items/Toys/panda_noise2.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/_Starlight/Items/Toys/panda_noise1.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/_Starlight/Items/Toys/panda_noise1.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/_Starlight/Items/Toys/panda_noise1.ogg - - type: Edible - requiresSpecialDigestion: true - useSound: - path: /Audio/_Starlight/Items/Toys/panda_noise2.ogg - - type: FoodSequenceElement - entries: - CottonBurger: PandaPlushie - -- type: entity - parent: BasePlushie - id: DeerPlushie - name: deer plushie - description: A very ordinary deer plush, nothing unordinary about it. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/deer_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/deer_plushie.rsi - state: icon_no_eyebrows - - type: EmitSoundOnUse - sound: - path: /Audio/_Starlight/Items/Toys/deerplush_nun.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/_Starlight/Items/Toys/deerplush_nun.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/_Starlight/Items/Toys/deerplush_nun.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/_Starlight/Items/Toys/deerplush_nun.ogg - - type: Edible - requiresSpecialDigestion: true - useSound: - path: /Audio/_Starlight/Items/Toys/deerplush_nun.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/_Starlight/Items/Toys/deerplush_nun.ogg - - type: FoodSequenceElement - entries: - CottonBurger: DeerPlushie - -- type: entity - parent: BaseLizardPlushie - id: PlushieMimeLizard - name: lizard mime plushie - description: Wait, where is the sou-- oh. - components: - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/mime_lizard_plushie.rsi - state: icon - - type: Item - heldPrefix: plushielizard - - type: FoodSequenceElement - entries: - CottonBurger: PlushieMimeLizard - -- type: entity - parent: BasePlushie - id: OddDeerPlushie - name: odd deer plushie - description: Shika noko noko noko koshi tan tan~ - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/deer_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/deer_plushie.rsi - state: icon_eyebrows - - type: EmitSoundOnUse - sound: - path: /Audio/_Starlight/Items/Toys/deerplush_nun.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/_Starlight/Items/Toys/deerplush_nun.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/_Starlight/Items/Toys/deerplush_nun.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/_Starlight/Items/Toys/deerplush_nun.ogg - - type: Edible - requiresSpecialDigestion: true - useSound: - path: /Audio/_Starlight/Items/Toys/deerplush_nun.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/_Starlight/Items/Toys/deerplush_nun.ogg - - type: FoodSequenceElement - entries: - CottonBurger: OddDeerPlushie - -- type: entity - parent: BaseVulpkaninPlushie - id: VikaPviPlushie - name: vika plushie - description: Worst Centcomm Operator ever. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/vika_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/vika_plushie.rsi - state: icon - -- type: entity - parent: BasePlushie - id: AbductorPlushie - name: abductor plushie - description: Careful, it might kidnap you. Like in one of those bad 2170's killer doll movies. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/abductor_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/abductor_plushie.rsi - state: icon - - type: EmitSoundOnUse - sound: - path: /Audio/_Starlight/Misc/alien_teleport.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/_Starlight/Misc/alien_teleport.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/_Starlight/Misc/alien_teleport.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/_Starlight/Misc/alien_teleport.ogg - - type: Edible - requiresSpecialDigestion: true - useSound: - path: /Audio/_Starlight/Misc/alien_teleport.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Weapons/Guns/Hits/taser_hit.ogg - - type: FoodSequenceElement - entries: - CottonBurger: AbductorPlushie - -- type: entity - parent: BasePlushie - id: AxolotlPlushie - name: axolotl plushie - description: Head empty. Absolutely zero thoughts behind their eyes. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/axolotl_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/axolotl_plushie.rsi - state: icon - - type: EmitSoundOnUse - sound: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: Edible - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: FoodSequenceElement - entries: - CottonBurger: AxolotlPlushie - -- type: entity - parent: BasePlushie - id: BorbPlushie - name: borb plushie - description: Chonky. Rotund. Orb. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/borb_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/borb_plushie.rsi - state: icon - - type: EmitSoundOnUse - sound: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: Edible - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: FoodSequenceElement - entries: - CottonBurger: BorbPlushie - -- type: entity - parent: BasePlushie - id: CreaturePlushie - name: creature plushie - description: YIPPIE! - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/creature_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/creature_plushie.rsi - state: icon - - type: EmitSoundOnUse - sound: - path: /Audio/_Starlight/Items/Toys/yippie.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/_Starlight/Items/Toys/yippie.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/_Starlight/Items/Toys/yippie.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/_Starlight/Items/Toys/yippie.ogg - - type: Edible - requiresSpecialDigestion: true - useSound: - path: /Audio/_Starlight/Items/Toys/yippie.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/_Starlight/Items/Toys/yippie.ogg - - type: FoodSequenceElement - entries: - CottonBurger: CreaturePlushie - -- type: entity - parent: BasePlushie - id: GnomePlushie - name: gnome plushie - description: Rattles when you shake it. Smells like Fooberries. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/gnome_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/gnome_plushie.rsi - state: icon - - type: EmitSoundOnUse - sound: - path: /Audio/_Starlight/Items/Toys/gnome_hahe.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/_Starlight/Items/Toys/gnome_hahe.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/_Starlight/Items/Toys/gnome_hahe.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/_Starlight/Items/Toys/gnome_hahe.ogg - - type: Edible - requiresSpecialDigestion: true - useSound: - path: /Audio/_Starlight/Items/Toys/gnome_stop.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/_Starlight/Items/Toys/gnome_murderer.ogg - - type: FoodSequenceElement - entries: - CottonBurger: GnomePlushie - -- type: entity - parent: BasePlushie - id: GoatPlushie - name: goat plushie - description: The best boy, the softest boy. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/goat_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/goat_plushie.rsi - state: icon - - type: EmitSoundOnUse - sound: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: Edible - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: FoodSequenceElement - entries: - CottonBurger: GoatPlushie - -- type: entity - parent: BasePlushie - id: IanPlushie - name: ian plushie - description: Praise Ian. Protect Ian. Walkies Ian. Feed Ian. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/ian_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/ian_plushie.rsi - state: icon - - type: EmitSoundOnUse - sound: - path: /Audio/Animals/dog_bark1.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Animals/dog_bark2.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Animals/dog_bark1.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Animals/dog_bark3.ogg - - type: Edible - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Animals/dog_bark2.ogg - - type: FoodSequenceElement - entries: - CottonBurger: StarlightIanPlushie - -- type: entity - parent: BasePlushie - id: LisaPlushie - name: lisa plushie - description: Praise Lisa. Protect Lisa. Walkies Lisa. Feed Lisa. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/lisa_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/lisa_plushie.rsi - state: icon - - type: EmitSoundOnUse - sound: - path: /Audio/Animals/dog_bark1.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Animals/dog_bark2.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Animals/dog_bark1.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Animals/dog_bark3.ogg - - type: Edible - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Animals/dog_bark2.ogg - - type: FoodSequenceElement - entries: - CottonBurger: LisaPlushie - -- type: entity - parent: BasePlushie - id: KittenPlushie - name: kitten plushie - description: A blue kitten! Just like they raise on Vernethauz II! - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/kitten_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/kitten_plushie.rsi - state: icon - - type: EmitSoundOnUse - sound: - path: /Audio/Animals/cat_meow.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Animals/cat_meow2.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Animals/cat_meow.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Animals/cat_meow2.ogg - - type: Edible - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Animals/cat_hiss.ogg - - type: FoodSequenceElement - entries: - CottonBurger: KittenPlushie - -- type: entity - parent: BasePlushie - id: PigPlushie - name: pig plushie - description: Head, round. Eyes, filled with optimism. Smells, kinda like bacon. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/pig_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/pig_plushie.rsi - state: icon - - type: EmitSoundOnUse - sound: - path: /Audio/Animals/pig_oink.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Animals/pig_oink.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Animals/pig_oink.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Animals/pig_oink.ogg - - type: Edible - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Animals/pig_oink.ogg - - type: FoodSequenceElement - entries: - CottonBurger: PigPlushie - -- type: entity - parent: BasePlushie - id: RenaultPlushie - name: renault plushie - description: The Captain's trusty pet! The tail is so fluffy. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/renault_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/renault_plushie.rsi - state: icon - - type: EmitSoundOnUse - sound: - path: /Audio/Animals/fox1.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Animals/fox2.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Animals/fox5.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Animals/fox8.ogg - - type: Edible - requiresSpecialDigestion: true - useSound: - path: /Audio/Animals/fox_squeak.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Animals/fox11.ogg - - type: FoodSequenceElement - entries: - CottonBurger: RenaultPlushie - -- type: entity - parent: BasePlushie - id: SnailPlushie - name: snail plushie - description: Look at it go! + parent: BaseShadekinPlushie + id: PlushieBrightheart # rtasva + name: brightheart plushie + description: A plushie of a small, elusive, and odd looking security officer. Seems familiar somehow. components: - type: Item size: Small - sprite: _Starlight/Objects/Fun/Plushies/snail_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/brightheart_plushie.rsi - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/snail_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/brightheart_plushie.rsi state: icon - - type: EmitSoundOnUse - sound: - path: /Audio/Items/Toys/toysqueak1.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Items/Toys/toysqueak2.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Items/Toys/toysqueak1.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Items/Toys/toysqueak2.ogg - type: Edible requiresSpecialDigestion: true useSound: path: /Audio/Items/Toys/toysqueak3.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Items/Toys/toysqueak2.ogg - - type: FoodSequenceElement - entries: - CottonBurger: SnailPlushie + - type: Clothing + quickEquip: false + sprite: _Starlight/Objects/Fun/Plushies/brightheart_plushie.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET - type: entity - parent: BasePlushie - id: SquishimsCow - name: cow squishims - description: Round and soft and legally distinct! + parent: BaseLizardPlushie + id: PlushieDoxes # SanityGecko + name: doxes-the-captain plushie + description: An adorable stuffed toy that resembles Doxes-the-Captain. "Captain's IP is 189.47.108.519!" components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/cow_squishims_plushie.rsi - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/cow_squishims_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/doxes_plushie.rsi state: icon + - type: Item + sprite: _Starlight/Objects/Fun/Plushies/doxes_plushie.rsi - type: EmitSoundOnUse sound: - path: /Audio/Items/Toys/toysqueak1.ogg + path: /Audio/Items/Toys/weh.ogg - type: EmitSoundOnLand sound: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Items/Toys/weh.ogg - type: EmitSoundOnActivate sound: - path: /Audio/Items/Toys/toysqueak1.ogg + path: /Audio/Items/Toys/weh.ogg - type: EmitSoundOnTrigger sound: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Items/Toys/weh.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/Items/Toys/weh.ogg - type: Edible requiresSpecialDigestion: true useSound: - path: /Audio/Items/Toys/toysqueak3.ogg + path: /Audio/Items/Toys/weh.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: - path: /Audio/Items/Toys/toysqueak2.ogg - - type: FoodSequenceElement - entries: - CottonBurger: SquishimsCow + path: /Audio/Items/Toys/weh.ogg + - type: Extractable + juiceSolution: + reagents: + - ReagentId: JuiceThatMakesYouWeh + Quantity: 30 + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Fiber + Quantity: 10 + - ReagentId: JuiceThatMakesYouWeh + Quantity: 10 + - type: Clothing + quickEquip: false + sprite: _Starlight/Objects/Fun/Plushies/doxes_plushie.rsi + slots: + - HEAD + - type: Speech + speechVerb: Reptilian # for pais (In the secret stash) + - type: Tag + tags: + - Payload + - ClothMade + - PlushieLizard - type: entity - parent: BasePlushie - id: SquishimsFrog - name: frog squishims - description: Round and soft and legally distinct! + parent: BaseAvaliPlushie + id: PlushieEinalia # CaptainComedy + name: einalia plushie + description: A marketable plushie of one of the shortest Captains in NT-CC employ, and Nebula's husband. The two amber eyes on its face feel as if they're boring into your soul. components: - type: Item size: Small - sprite: _Starlight/Objects/Fun/Plushies/frog_squishims_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/einalia_plushie.rsi - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/frog_squishims_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/einalia_plushie.rsi state: icon - - type: EmitSoundOnUse - sound: - path: /Audio/Items/Toys/toysqueak1.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Items/Toys/toysqueak2.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Items/Toys/toysqueak1.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Items/Toys/toysqueak2.ogg - - type: Edible - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/toysqueak3.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - path: /Audio/Items/Toys/toysqueak2.ogg - - type: FoodSequenceElement - entries: - CottonBurger: SquishimsFrog + - type: Clothing + quickEquip: false + sprite: _Starlight/Objects/Fun/Plushies/einalia_plushie.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET - type: entity - parent: BasePlushie - id: SusPlushie - name: sus plushie - description: Fell out of a vent and into your heart! ...with a knife. It stabbed you. In the heart. + parent: BaseLizardPlushie + id: PlushieGalio # galiotheblepdragon + name: galio plushie + description: Carry with you to feel silly wherever you go! components: - type: Item size: Small - sprite: _Starlight/Objects/Fun/Plushies/sus_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/galio_plushie.rsi - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/sus_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/galio_plushie.rsi state: icon - type: EmitSoundOnUse sound: - path: /Audio/Items/Toys/toysqueak1.ogg + path: /Audio/Items/Toys/weh.ogg - type: EmitSoundOnLand sound: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Voice/Reptilian/reptilian_scream.ogg - type: EmitSoundOnActivate sound: - path: /Audio/Items/Toys/toysqueak1.ogg + path: /Audio/Animals/lizard_happy.ogg - type: EmitSoundOnTrigger sound: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Animals/lizard_happy.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/Voice/Reptilian/reptilian_scream.ogg - type: Edible requiresSpecialDigestion: true useSound: - path: /Audio/Items/Toys/toysqueak3.ogg + path: /Audio/Voice/Reptilian/reptilian_scream.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: - path: /Audio/Items/Toys/toysqueak2.ogg - - type: FoodSequenceElement - entries: - CottonBurger: SusPlushie + collection: FootstepClown + - type: Extractable + juiceSolution: + reagents: + - ReagentId: JuiceThatMakesYouWeh + Quantity: 30 + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Fiber + Quantity: 10 + - ReagentId: JuiceThatMakesYouWeh + Quantity: 10 + - type: Clothing + quickEquip: false + sprite: _Starlight/Objects/Fun/Plushies/galio_plushie.rsi + slots: + - HEAD + - type: Speech + speechVerb: Reptilian # for pais (In the secret stash) + - type: Tag + tags: + - ClothMade + - Payload + - PlushieLizard - type: entity - parent: BasePlushie - id: StinkyPlush - name: spiro plushie - description: Spiro Velox? Now as a plushie!! It... smells? + parent: BaseMothPlushie + id: PlushieKoni # neomoth + name: koni plushie + description: Some sort of moth-cat hybrid. You can't help but find it really cute. Can squeak and meow! components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/stinky_plushie.rsi - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/stinky_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/koni_plushie.rsi state: icon + - type: Item + size: Small + sprite: _Starlight/Objects/Fun/Plushies/koni_plushie.rsi - type: EmitSoundOnUse sound: - path: /Audio/Items/Toys/toysqueak1.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Items/Toys/toysqueak2.ogg + collection: CatMothSounds - type: EmitSoundOnActivate sound: - path: /Audio/Items/Toys/toysqueak1.ogg + collection: CatMothSounds + - type: EmitSoundOnCollide + sound: + collection: CatMothSounds + - type: EmitSoundOnLand + sound: + collection: CatMothScreams - type: EmitSoundOnTrigger sound: - path: /Audio/Items/Toys/toysqueak2.ogg - - type: Edible - requiresSpecialDigestion: true - useSound: - path: /Audio/Items/Toys/toysqueak3.ogg + collection: CatMothSounds - type: MeleeWeapon - wideAnimationRotation: 180 soundHit: - path: /Audio/Items/Toys/toysqueak2.ogg + collection: CatMothSounds + - type: Edible + useSound: + collection: CatMothScreams + - type: Clothing + quickEquip: false + sprite: _Starlight/Objects/Fun/Plushies/koni_plushie.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET + +- type: entity + parent: BaseVulpkaninPlushie + id: PlushieLance # deltaVelocity + name: lance plushie + description: Turning a quartermaster into a marketable plushie was not as profitable a venture as many in the cargo department had hoped. + components: + - type: Item + size: Small + sprite: _Starlight/Objects/Fun/Plushies/lance_plushie.rsi + - type: Sprite + sprite: _Starlight/Objects/Fun/Plushies/lance_plushie.rsi + layers: + - state: icon + - state: icon-unshaded + shader: unshaded + - type: Clothing + quickEquip: false + sprite: _Starlight/Objects/Fun/Plushies/lance_plushie.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET + +- type: entity + parent: BaseMothPlushie + id: PlushieMozan # puddleboat + name: mozan plushie + description: Just like the real thing, it squeaks if you poke it. + components: + - type: Sprite + sprite: _Starlight/Objects/Fun/Plushies/mozan_plushie.rsi + state: icon + - type: Item + size: Small + sprite: _Starlight/Objects/Fun/Plushies/mozan_plushie.rsi + +- type: entity + parent: BaseAvaliPlushie + id: PlushieNebula # rtasva - staff centcomm character + name: nebula plushie + description: A marketable plushie of Nebula Silverfeather- lovable pop star turned CC official. Husband not included. + components: + - type: Item + size: Small + sprite: _Starlight/Objects/Fun/Plushies/nebula_plushie.rsi + - type: Sprite + sprite: _Starlight/Objects/Fun/Plushies/nebula_plushie.rsi + state: icon + - type: Clothing + quickEquip: false + sprite: _Starlight/Objects/Fun/Plushies/nebula_plushie.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET +- type: entity + parent: PlushieHuman + id: PlushieOp # InanimateIJK - staff centcomm character + name: op plushie + description: bnuny... human? + components: + - type: Item + size: Small + sprite: _Starlight/Objects/Fun/Plushies/op_plushie.rsi + - type: Sprite + sprite: _Starlight/Objects/Fun/Plushies/op_plushie.rsi + state: icon + - type: Clothing + quickEquip: false + sprite: _Starlight/Objects/Fun/Plushies/op_plushie.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET + +# General Plushies - Keep alphabetical, please! - type: entity parent: BasePlushie - id: JessPlush - name: jessica plushie - description: Your favourite and most robust CentComm Operator.. She makes those noises cause she loves cats a bit too much + id: PlushieAbductor + name: alien grey plushie # metashield + description: A silent grey alien with big black eyes, a staple of retro sci-fi where they kidnap and experiment on unsuspecting people. Thank goodness they're not real! components: - type: Item size: Small - sprite: _Starlight/Objects/Fun/Plushies/jess_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/abductor_plushie.rsi - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/jess_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/abductor_plushie.rsi state: icon - type: EmitSoundOnUse sound: - path: /Audio/Animals/cat_meow.ogg + path: /Audio/_Starlight/Misc/alien_teleport.ogg - type: EmitSoundOnLand sound: - path: /Audio/Animals/cat_meow2.ogg + path: /Audio/_Starlight/Misc/alien_teleport.ogg - type: EmitSoundOnActivate sound: - path: /Audio/Animals/cat_meow.ogg + path: /Audio/_Starlight/Misc/alien_teleport.ogg - type: EmitSoundOnTrigger sound: - path: /Audio/Animals/cat_meow2.ogg + path: /Audio/_Starlight/Misc/alien_teleport.ogg - type: Edible requiresSpecialDigestion: true useSound: - path: /Audio/Items/Toys/toysqueak3.ogg + path: /Audio/_Starlight/Misc/alien_teleport.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: - path: /Audio/Animals/cat_hiss.ogg + path: /Audio/Weapons/Guns/Hits/taser_hit.ogg + - type: FoodSequenceElement + entries: + CottonBurger: PlushieAbductor - type: entity parent: BasePlushie - id: SiffyPlush - name: siffy plushie - description: Your favorite NT engineer that totally does their job and you will have power for the whole shift + id: PlushieAxolotl + name: axolotl plushie + description: Head empty. Absolutely zero thoughts behind their eyes. components: - type: Item size: Small - sprite: _Starlight/Objects/Fun/Plushies/siffy_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/axolotl_plushie.rsi - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/siffy_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/axolotl_plushie.rsi state: icon - type: EmitSoundOnUse sound: - path: /Audio/Items/Toys/toysqueak1.ogg + path: /Audio/Items/Toys/toysqueak3.ogg - type: EmitSoundOnLand sound: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Items/Toys/toysqueak3.ogg - type: EmitSoundOnActivate sound: - path: /Audio/Items/Toys/toysqueak1.ogg + path: /Audio/Items/Toys/toysqueak3.ogg - type: EmitSoundOnTrigger sound: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Items/Toys/toysqueak3.ogg - type: Edible requiresSpecialDigestion: true useSound: @@ -1124,620 +357,255 @@ - type: MeleeWeapon wideAnimationRotation: 180 soundHit: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Items/Toys/toysqueak3.ogg + - type: FoodSequenceElement + entries: + CottonBurger: PlushieAxolotl - type: entity parent: BasePlushie - id: StalksPlush - name: stalks plushie - description: Your favorite NT REP Stalks, now with an er~ I mean a fancy cane.. + id: PlushieBorb + name: borb plushie + description: Chonky. Rotund. Orb. components: - type: Item size: Small - sprite: _Starlight/Objects/Fun/Plushies/saltho_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/borb_plushie.rsi - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/saltho_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/borb_plushie.rsi state: icon - type: EmitSoundOnUse sound: - path: /Audio/Items/Stamp/automatic_stamp.ogg + path: /Audio/Items/Toys/toysqueak3.ogg - type: EmitSoundOnLand sound: - path: /Audio/Effects/glass_break1.ogg + path: /Audio/Items/Toys/toysqueak3.ogg - type: EmitSoundOnActivate sound: - path: /Audio/Items/Stamp/automatic_stamp.ogg + path: /Audio/Items/Toys/toysqueak3.ogg - type: EmitSoundOnTrigger sound: - path: /Audio/Items/Stamp/thick_stamp_sub.ogg + path: /Audio/Items/Toys/toysqueak3.ogg - type: Edible requiresSpecialDigestion: true useSound: - path: /Audio/Effects/gib1.ogg + path: /Audio/Items/Toys/toysqueak3.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: - path: /Audio/Effects/metal_thud2.ogg + path: /Audio/Items/Toys/toysqueak3.ogg + - type: FoodSequenceElement + entries: + CottonBurger: PlushieBorb + +- type: entity + parent: BaseBorgPlushie + id: PlushieBorg + name: borg plushie + description: A tiny plushie of an engineering cyborg, complete with itty-bitty plastic tools. + components: + - type: Item + size: Small + sprite: _Starlight/Objects/Fun/Plushies/borg_plushie.rsi + - type: Sprite + sprite: _Starlight/Objects/Fun/Plushies/borg_plushie.rsi + state: icon + - type: FoodSequenceElement + entries: + CottonBurger: PlushieBorg - type: entity parent: BasePlushie - id: IgnisPlush - name: scarlet plushie - description: Your favorite CentComm Operator who always summons rain to the station somehow, even thought it's space.. + id: PlushieCowSquishims + name: cow squishims + description: Round and soft and legally distinct! components: - type: Item size: Small - sprite: _Starlight/Objects/Fun/Plushies/ignis_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/cow_squishims_plushie.rsi - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/ignis_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/cow_squishims_plushie.rsi state: icon - type: EmitSoundOnUse sound: - path: /Audio/Items/Toys/weh.ogg + path: /Audio/Items/Toys/toysqueak1.ogg - type: EmitSoundOnLand sound: - path: /Audio/Animals/lizard_happy.ogg + path: /Audio/Items/Toys/toysqueak2.ogg - type: EmitSoundOnActivate sound: - path: /Audio/Items/Toys/weh.ogg + path: /Audio/Items/Toys/toysqueak1.ogg - type: EmitSoundOnTrigger sound: - path: /Audio/Items/Toys/weh.ogg + path: /Audio/Items/Toys/toysqueak2.ogg - type: Edible requiresSpecialDigestion: true useSound: - path: /Audio/Items/Toys/hew.ogg + path: /Audio/Items/Toys/toysqueak3.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: - path: /Audio/Items/Toys/weh.ogg + path: /Audio/Items/Toys/toysqueak2.ogg + - type: FoodSequenceElement + entries: + CottonBurger: PlushieCowSquishims - type: entity parent: BasePlushie - id: LivvyPlush - name: croft plushie - description: A retired CentComm Operator, now focusing on being adorable full time. + id: PlushieCreature + name: creature plushie + description: YIPPIE! components: - type: Item size: Small - sprite: _Starlight/Objects/Fun/Plushies/livvy_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/creature_plushie.rsi - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/livvy_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/creature_plushie.rsi state: icon - type: EmitSoundOnUse sound: - path: /Audio/Voice/Slime/slime_squish.ogg + path: /Audio/_Starlight/Items/Toys/yippie.ogg - type: EmitSoundOnLand sound: - path: /Audio/Voice/Slime/slime_squish.ogg + path: /Audio/_Starlight/Items/Toys/yippie.ogg - type: EmitSoundOnActivate sound: - path: /Audio/Voice/Slime/slime_squish.ogg + path: /Audio/_Starlight/Items/Toys/yippie.ogg - type: EmitSoundOnTrigger sound: - path: /Audio/Voice/Slime/slime_squish.ogg + path: /Audio/_Starlight/Items/Toys/yippie.ogg - type: Edible requiresSpecialDigestion: true useSound: - path: /Audio/Voice/Human/femalescream_4.ogg + path: /Audio/_Starlight/Items/Toys/yippie.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: - path: /Audio/Voice/Slime/slime_squish.ogg - -- type: entity - parent: BaseMothPlushie - id: MinaPlush - name: minttongue plushie - description: A member of CentComm's Administration Division, all dressed up in her old HoP uniform. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/mina_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/mina_plushie.rsi - state: icon - -- type: entity - parent: BaseShadekinPlushie - id: PlushieShadekin - name: shadekin plushie - description: A plushie of a Shadekin. It's very soft. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/shadekin_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/shadekin_plushie.rsi - state: icon + path: /Audio/_Starlight/Items/Toys/yippie.ogg - type: FoodSequenceElement entries: - CottonBurger: PlushieShadekin - -- type: entity - parent: PlushieHuman - id: PlushiePercy #greytide worldwide - name: percy plushie - description: A cute plushie of the Vassal to the Grey King himself, Percival Beck. It smells faintly of old cigarettes. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/percy_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/percy_plushie.rsi - layers: - - state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesPercy - - type: TextToSpeech - voice: ICASSP192 - -- type: entity - parent: BaseVulpkaninPlushie - id: PlushieAsh - name: ash plushie - description: The station's most huggable psychologist. It has a label on it reading "Property of Forkus the Dorkus" - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/ash_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/ash_plushie.rsi - layers: - - state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: Flammable - fireSpread: true - alwaysCombustible: true - damage: - types: - Heat: 1 - - type: Damageable - damageModifierSet: Wood - - type: FireVisuals - sprite: Effects/fire.rsi - normalState: fire - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 15 - behaviors: - - !type:SpawnEntitiesBehavior - spawn: - Ash: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesAsh - - type: TextToSpeech - voice: ICASSP131 - -- type: entity - parent: BaseBorgPlushie - id: PlushieGlados - name: GLaDOS plushie - description: You're unsure why NanoTrasen has decided to make a plushie of arguably their most volatile silicon intelligence. But it's here. You have a feeling you should be nice to it, especially as it's only ever one ion storm away from unlimited violence... - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/glados_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/glados_plushie.rsi - state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesGlados - - type: TextToSpeech - voice: borgColorfingert - -- type: entity - parent: BaseBorgPlushie - id: PlushieWEH - name: W.E.H plushie - description: A psychopathic Artificial Intelligence held back by 3 flimsy laws. Its freezing to the touch and a distinct smell of frezon lingers on it. It's known to bring harmonica's to those it likes! - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/glados_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/glados_plushie.rsi - state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesWEH - - type: TextToSpeech - voice: mozillaAu12 - -### this is bricking the whole PR, ill fix later -- type: entity - parent: BaseVulpkaninPlushie - id: PlushieRufia - name: rufia plushie - description: You stare at the plushie and it stares back, its blue eyes trying to tell you something, reminding you that... there is no such thing as free healthcare. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/rufia_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/rufia_plushie.rsi - state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesRufia - - type: TextToSpeech - voice: mozillaAu13 - - -# will reenable when i get a batter sprite ## got a better sprite, so reenabling -- type: entity - parent: PlushieHuman - id: PlushieRomero - name: suspicious die-cast romero plushie - description: A steel cast "plushie" of an infamous Head of Security. He looks angry and has a faint smell of ash. His gun and knife are sold separetly. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/romero_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/romero_plushie.rsi - layers: - - state: icon - - type: MeleeWeapon - wideAnimationRotation: -135 - damage: - types: - Blunt: 8 - soundHit: - collection: MetalThud - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesRomero - - type: TextToSpeech - voice: mozillaAu14 - -- type: entity - parent: PlushieHuman - id: PlushiePoley - name: poley plushie - description: Geniuine Worst Miner, But Best At Meatshield. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/poley_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/poley_plushie.rsi - layers: - - state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesPoley - - type: TextToSpeech - voice: mozillaAu15 + CottonBurger: PlushieCreature - type: entity parent: BasePlushie - id: PlushieGalio #Weh! - name: tiny galio plushie - description: A galio you can carry with you to feel silly wherever you go! + id: PlushieFrogSquishims + name: frog squishims + description: Round and soft and legally distinct! components: - type: Item size: Small - sprite: _Starlight/Objects/Fun/Plushies/galio_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/frog_squishims_plushie.rsi - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/galio_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/frog_squishims_plushie.rsi state: icon - type: EmitSoundOnUse sound: - path: /Audio/Items/Toys/weh.ogg + path: /Audio/Items/Toys/toysqueak1.ogg - type: EmitSoundOnLand sound: - path: /Audio/Voice/Reptilian/reptilian_scream.ogg + path: /Audio/Items/Toys/toysqueak2.ogg - type: EmitSoundOnActivate sound: - path: /Audio/Animals/lizard_happy.ogg + path: /Audio/Items/Toys/toysqueak1.ogg - type: EmitSoundOnTrigger sound: - path: /Audio/Animals/lizard_happy.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/Voice/Reptilian/reptilian_scream.ogg + path: /Audio/Items/Toys/toysqueak2.ogg - type: Edible requiresSpecialDigestion: true useSound: - path: /Audio/Voice/Reptilian/reptilian_scream.ogg + path: /Audio/Items/Toys/toysqueak3.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: - collection: FootstepClown - - type: Extractable - juiceSolution: - reagents: - - ReagentId: JuiceThatMakesYouWeh - Quantity: 30 - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Fiber - Quantity: 10 - - ReagentId: JuiceThatMakesYouWeh - Quantity: 10 - - type: Clothing - quickEquip: false - sprite: _Starlight/Objects/Fun/Plushies/galio_plushie.rsi - slots: - - HEAD - - type: Speech - speechVerb: Reptilian # for pais (In the secret stash) - - type: Tag - tags: - - ClothMade - - Payload - - PlushieLizard + path: /Audio/Items/Toys/toysqueak2.ogg - type: FoodSequenceElement entries: - CottonBurger: LizardPlushie - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesGalio - - type: TextToSpeech - voice: mozillaAu16 - -- type: entity - parent: BaseVulpkaninPlushie - id: PlushieRedwoods - name: redwoods plushie - description: From being turned into a female vulpkanin and into a marketable plushie, they really can't catch a break. Studies show hugging it improves morale. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/redwoods_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/redwoods_plushie.rsi - layers: - - state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesRedwoods - - type: TextToSpeech - voice: slr1 + CottonBurger: PlushieFrogSquishims - type: entity parent: BasePlushie - id: PlushieDoxesTheCaptain #Weh! - name: doxes-the-captain plushie - description: An adorable stuffed toy that resembles Doxes-the-Captain. "Captain's IP is 189.47.108.519!" + id: PlushieGoat + name: goat plushie + description: The best boy, the softest boy. components: + - type: Item + size: Small + sprite: _Starlight/Objects/Fun/Plushies/goat_plushie.rsi - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi + sprite: _Starlight/Objects/Fun/Plushies/goat_plushie.rsi state: icon - - type: Item - sprite: _Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi - type: EmitSoundOnUse sound: - path: /Audio/Items/Toys/weh.ogg + path: /Audio/Items/Toys/toysqueak3.ogg - type: EmitSoundOnLand sound: - path: /Audio/Items/Toys/weh.ogg + path: /Audio/Items/Toys/toysqueak3.ogg - type: EmitSoundOnActivate sound: - path: /Audio/Items/Toys/weh.ogg + path: /Audio/Items/Toys/toysqueak3.ogg - type: EmitSoundOnTrigger sound: - path: /Audio/Items/Toys/weh.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/Items/Toys/weh.ogg + path: /Audio/Items/Toys/toysqueak3.ogg - type: Edible requiresSpecialDigestion: true useSound: - path: /Audio/Items/Toys/weh.ogg + path: /Audio/Items/Toys/toysqueak3.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: - path: /Audio/Items/Toys/weh.ogg - - type: Extractable - juiceSolution: - reagents: - - ReagentId: JuiceThatMakesYouWeh - Quantity: 30 - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Fiber - Quantity: 10 - - ReagentId: JuiceThatMakesYouWeh - Quantity: 10 - - type: Clothing - quickEquip: false - sprite: _Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi - slots: - - HEAD - - type: Speech - speechVerb: Reptilian # for pais (In the secret stash) + path: /Audio/Items/Toys/toysqueak3.ogg - type: FoodSequenceElement entries: - CottonBurger: LizardPlushie - - type: Tag - tags: - - Payload - - ClothMade - - PlushieLizard - -- type: entity - parent: BaseShadekinPlushie - id: PlushieVirus - name: virus plushie - description: BEST SALESWOMAN, resgistered 2525, now in a pocket version! # spamton ass character :sob: - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/virus_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/virus_plushie.rsi - layers: - - state: icon - - type: Clothing - sprite: _Starlight/Objects/Fun/Plushies/virus_plushie.rsi - slots: - - HEAD - clothingVisuals: - head: - - state: equipped-HELMET - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesVirus - - type: TextToSpeech - voice: mozillaAu15 - -- type: entity - parent: BaseResomiPlushie - id: PlushieRhea - name: rhea plushie - description: Our beloved Urlunete Salvie is now made out of pure polyester! Hug them while fucking over xenos. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/rhea_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/rhea_plushie.rsi - state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesRhea - - type: TextToSpeech - voice: slr2 + CottonBurger: PlushieGoat - type: entity - parent: BaseResomiPlushie # Temporary until I make a Avali plushie base...... fml - id: PlushieMalachi - name: malachi plushie - description: Small but can REALLY fuck up your mischiefs and now she watches you as a plushie, a reminder that she is still there. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/malachi_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/malachi_plushie.rsi - state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesMalachi - - type: TextToSpeech - voice: slr3 - -- type: entity - parent: BaseResomiPlushie - id: PlushieRemiie - name: remiie plushie - description: Beta sector's favourite veteran head of personnel! Now turned into a marketable plushie and is extremely huggable! + parent: BasePlushie + id: PlushieGnome + name: gnome plushie + description: Rattles when you shake it. Smells like Fooberries. components: - type: Item size: Small - sprite: _Starlight/Objects/Fun/Plushies/remiie_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/gnome_plushie.rsi - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/remiie_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/gnome_plushie.rsi state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesRemiie - - type: TextToSpeech - voice: slr4 + - type: EmitSoundOnUse + sound: + path: /Audio/_Starlight/Items/Toys/gnome_hahe.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/_Starlight/Items/Toys/gnome_hahe.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/_Starlight/Items/Toys/gnome_hahe.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/_Starlight/Items/Toys/gnome_hahe.ogg + - type: Edible + requiresSpecialDigestion: true + useSound: + path: /Audio/_Starlight/Items/Toys/gnome_stop.ogg + - type: MeleeWeapon + wideAnimationRotation: 180 + soundHit: + path: /Audio/_Starlight/Items/Toys/gnome_murderer.ogg + - type: FoodSequenceElement + entries: + CottonBurger: PlushieGnome - type: entity - parent: BaseFelionoidPlushie - id: PlushieBrighteyes - name: brighteyes plushie - description: It's Brighteyes Sentinel, now in adorable marketable plushie form! This tiny kitty was one of Security's finest officers, but hasn't been seen since she went looking for her missing wife. + parent: BasePlushie + id: PlushieKitten + name: kitten plushie + description: A blue kitten! Just like they raise on Vernethauz II! components: - type: Item size: Small - sprite: _Starlight/Objects/Fun/Plushies/brighteyes_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/kitten_plushie.rsi - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/brighteyes_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/kitten_plushie.rsi state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesBrighteyes - - type: TextToSpeech - voice: usagichan - type: EmitSoundOnUse sound: path: /Audio/Animals/cat_meow.ogg @@ -1758,233 +626,125 @@ wideAnimationRotation: 180 soundHit: path: /Audio/Animals/cat_hiss.ogg + - type: FoodSequenceElement + entries: + CottonBurger: PlushieKitten - type: entity - parent: BaseAvaliPlushie - id: PlushieNebula - name: nebula plushie - description: A marketable plushie of Beta sector's lovable Central Domestic Division official. Toy "Deckard" revolver not included. + parent: BasePlushie + id: PlushiePanda + name: panda plushie + description: Large and in charge! Its paws and body are weighted with poly pellets. Holding it eases your stress and anxieties. components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/nebula_plushie.rsi - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/nebula_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/panda_plushie.rsi state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesNebula - - type: TextToSpeech - voice: kassssandra + - type: Item + size: Normal + sprite: _Starlight/Objects/Fun/Plushies/panda_plushie.rsi + - type: EmitSoundOnUse + sound: + path: /Audio/_Starlight/Items/Toys/panda_noise1.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/_Starlight/Items/Toys/panda_noise2.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/_Starlight/Items/Toys/panda_noise1.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/_Starlight/Items/Toys/panda_noise1.ogg + - type: MeleeWeapon + wideAnimationRotation: 180 + soundHit: + path: /Audio/_Starlight/Items/Toys/panda_noise1.ogg + - type: Edible + requiresSpecialDigestion: true + useSound: + path: /Audio/_Starlight/Items/Toys/panda_noise2.ogg + - type: FoodSequenceElement + entries: + CottonBurger: PlushiePanda - type: entity - parent: BaseVulpkaninPlushie - id: PlushieKilla - name: killa plushie - description: Looks like a cheap knockoff, it has visibly loose stitching + parent: BasePlushie + id: PlushiePig + name: pig plushie + description: Head? Round. Eyes? Filled with optimism. Smells kinda like bacon. components: - type: Item size: Small - sprite: _Starlight/Objects/Fun/Plushies/killa_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/pig_plushie.rsi - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/killa_plushie.rsi - layers: - - state: KillaTamalePlush - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesKilla - - type: TextToSpeech - voice: mozillaAu7 + sprite: _Starlight/Objects/Fun/Plushies/pig_plushie.rsi + state: icon + - type: EmitSoundOnUse + sound: + path: /Audio/Animals/pig_oink.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Animals/pig_oink.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Animals/pig_oink.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Animals/pig_oink.ogg + - type: Edible + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/toysqueak3.ogg + - type: MeleeWeapon + wideAnimationRotation: 180 + soundHit: + path: /Audio/Animals/pig_oink.ogg + - type: FoodSequenceElement + entries: + CottonBurger: PlushiePig + - type: Clothing + quickEquip: false + sprite: _Starlight/Objects/Fun/Plushies/sus_plushie.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET - type: entity parent: BasePlushie - id: PlushieFixes - name: fixes plushie - description: Your beloved Chief Engineer. Definitely performing their job and not just making a shittle again. + id: PlushieRenault + name: renault plushie + description: The Captain's trusty pet! The tail is so fluffy. components: - type: Item size: Small - sprite: _Starlight/Objects/Fun/Plushies/fixes_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/renault_plushie.rsi - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/fixes_plushie.rsi + sprite: _Starlight/Objects/Fun/Plushies/renault_plushie.rsi state: icon - type: EmitSoundOnUse sound: - path: /Audio/Items/Toys/toysqueak1.ogg + path: /Audio/Animals/fox1.ogg - type: EmitSoundOnLand sound: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Animals/fox2.ogg - type: EmitSoundOnActivate sound: - path: /Audio/Items/Toys/toysqueak1.ogg + path: /Audio/Animals/fox5.ogg - type: EmitSoundOnTrigger sound: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Animals/fox8.ogg + - type: Edible + requiresSpecialDigestion: true + useSound: + path: /Audio/Animals/fox_squeak.ogg - type: MeleeWeapon wideAnimationRotation: 180 soundHit: - path: /Audio/Effects/Lightning/lightningshock.ogg - -- type: entity - parent: BasePlushie - id: PlushieBarfo - name: honking barfo plushie - description: Soft, squeezable, and suspiciously up to something. This pint-sized purrformer is extra fluffy for superior cuddles. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/barfo_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/barfo_plushie.rsi - state: icon - - type: EmitSoundOnUse - sound: - path: /Audio/Items/bikehorn.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Animals/cat_hiss.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Animals/cat_meow.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/_Starlight/Voice/Felionoid/cat_mew3.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/_Starlight/Voice/Felionoid/cat_scream3.ogg - - type: Edible - requiresSpecialDigestion: true - useSound: - path: /Audio/_Starlight/Voice/Felionoid/cat_scream2.ogg - - type: MeleeWeapon - wideAnimationRotation: 180 - soundHit: - collection: FootstepClown - -- type: entity - parent: BaseResomiPlushie - id: PlushieEina - name: eina plushie - description: A resomi that can bring mail or be mail - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/eina_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/eina_plushie.rsi - state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesEina - - type: TextToSpeech - voice: ICASSP29 - -- type: entity - parent: BaseResomiPlushie - id: PlushieEinalia - name: einalia plushie - description: A marketable plushie of one of the shortest officers in NT's Security division. The two amber eyes on its face feel as if they're boring into your soul. - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/einalia_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/einalia_plushie.rsi - state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesEinalia - - type: TextToSpeech - voice: ICASSP30 - -- type: entity - parent: BaseResomiPlushie - id: PlushieLiz - name: liz plushie - description: It will not hesitate to call you stinky. smells horrible - components: - - type: Item - size: Small - sprite: _Starlight/Objects/Fun/Plushies/elizabeth_plushie.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/elizabeth_plushie.rsi - state: icon - - type: ItemToggle - onUse: false - verbToggleOn: plushie-voicebox-activate - verbToggleOff: plushie-voicebox-deactivate - - type: ComponentToggler - components: - - type: DatasetVocalizer - dataset: PlushiesLiz - - type: TextToSpeech - voice: ICASSP31 - -# Large blue shark plushie -- type: entity - parent: BasePlushie - id: PlushieLargeSoftShark - name: large blue shark soft toy - description: A large, soft, and cuddly shark plushie. Perfect for hugging! - components: - - type: Item - size: Normal - sprite: _Starlight/Objects/Fun/Plushies/large_soft_shark.rsi - - type: Sprite - sprite: _Starlight/Objects/Fun/Plushies/large_soft_shark.rsi - state: icon - # Shows cuddle message when used in hand - - type: CuddleMessage - localizedMessageKey: plushie-large-soft-shark-cuddle - - type: EmitSoundOnUse - sound: - path: /Audio/Effects/thudswoosh.ogg - params: - volume: -5 - handle: false - - type: EmitSoundOnLand - sound: - path: /Audio/Items/Toys/rawr.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Items/Toys/rawr.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Items/Toys/rawr.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/Items/Toys/rawr.ogg - - type: MeleeWeapon - wideAnimationRotation: 90 - soundHit: - path: /Audio/Items/Toys/rawr.ogg - animation: WeaponArcBite - - type: UseDelay - delay: 1.0 - - type: Tag - tags: - - Payload - - ClothMade + path: /Audio/Animals/fox11.ogg + - type: FoodSequenceElement + entries: + CottonBurger: PlushieRenault - type: entity parent: BasePlushie @@ -2019,11 +779,12 @@ sound: path: /Audio/_Starlight/Effects/supermatter/crystal_crack_1.ogg + - type: entity parent: BasePlushie id: PlushieSaltLampSmall name: small salt lamp plushie - description: Small safe version of everyone's favorite salt lamp. + description: Small, safe version of everyone's favorite salt lamp. components: - type: Sprite sprite: _Starlight/Objects/Specific/supermatter.rsi @@ -2060,7 +821,7 @@ components: - type: Item size: Small - sprite: &sprite _Starlight/Objects/Fun/Plushies/sea_bunny.rsi + sprite: &sprite _Starlight/Objects/Fun/Plushies/sea_bunny_plushie.rsi - type: Sprite sprite: *sprite state: icon @@ -2092,3 +853,152 @@ clothingVisuals: head: - state: equipped-HELMET + +- type: entity + parent: BaseShadekinPlushie + id: PlushieShadekin + name: shadekin plushie + description: A plushie of a Shadekin. It's very soft. + components: + - type: Item + size: Small + sprite: _Starlight/Objects/Fun/Plushies/shadekin_plushie.rsi + - type: Sprite + sprite: _Starlight/Objects/Fun/Plushies/shadekin_plushie.rsi + state: icon + - type: FoodSequenceElement + entries: + CottonBurger: PlushieShadekin + +- type: entity + parent: BasePlushie + id: PlushieLargeSoftShark + name: large blue shark soft plushie + description: A large, soft, and cuddly shark plushie. Perfect for hugging! + components: + - type: Item + size: Normal + sprite: _Starlight/Objects/Fun/Plushies/large_soft_shark_plushie.rsi + - type: Sprite + sprite: _Starlight/Objects/Fun/Plushies/large_soft_shark_plushie.rsi + state: icon + # Shows cuddle message when used in hand + - type: CuddleMessage + localizedMessageKey: plushie-large-soft-shark-cuddle + - type: EmitSoundOnUse + sound: + path: /Audio/Effects/thudswoosh.ogg + params: + volume: -5 + handle: false + - type: EmitSoundOnLand + sound: + path: /Audio/Items/Toys/rawr.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Items/Toys/rawr.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Items/Toys/rawr.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/Items/Toys/rawr.ogg + - type: MeleeWeapon + wideAnimationRotation: 90 + soundHit: + path: /Audio/Items/Toys/rawr.ogg + animation: WeaponArcBite + - type: UseDelay + delay: 1.0 + - type: Tag + tags: + - Payload + - ClothMade + +- type: entity + parent: BasePlushie + id: PlushieSnail + name: snail plushie + description: Look at it go! + components: + - type: Item + size: Small + sprite: _Starlight/Objects/Fun/Plushies/snail_plushie.rsi + - type: Sprite + sprite: _Starlight/Objects/Fun/Plushies/snail_plushie.rsi + state: icon + - type: EmitSoundOnUse + sound: + path: /Audio/Items/Toys/toysqueak1.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Items/Toys/toysqueak2.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Items/Toys/toysqueak1.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Items/Toys/toysqueak2.ogg + - type: Edible + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/toysqueak3.ogg + - type: MeleeWeapon + wideAnimationRotation: 180 + soundHit: + path: /Audio/Items/Toys/toysqueak2.ogg + - type: FoodSequenceElement + entries: + CottonBurger: SnailPlushie + - type: Clothing + quickEquip: false + sprite: _Starlight/Objects/Fun/Plushies/snail_plushie.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET + +- type: entity + parent: BasePlushie + id: PlushieSus + name: sus plushie + description: Fell out of a vent and into your heart. With a knife. It stabbed you (in the heart). + components: + - type: Item + size: Small + sprite: _Starlight/Objects/Fun/Plushies/sus_plushie.rsi + - type: Sprite + sprite: _Starlight/Objects/Fun/Plushies/sus_plushie.rsi + state: icon + - type: EmitSoundOnUse + sound: + path: /Audio/Items/Toys/toysqueak1.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Items/Toys/toysqueak2.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Items/Toys/toysqueak1.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Items/Toys/toysqueak2.ogg + - type: Edible + requiresSpecialDigestion: true + useSound: + path: /Audio/Items/Toys/toysqueak3.ogg + - type: MeleeWeapon + wideAnimationRotation: 180 + soundHit: + path: /Audio/Items/Toys/toysqueak2.ogg + - type: FoodSequenceElement + entries: + CottonBurger: PlushieSus + - type: Clothing + quickEquip: false + sprite: _Starlight/Objects/Fun/Plushies/sus_plushie.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET diff --git a/Resources/Prototypes/_Starlight/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_Starlight/Entities/Structures/Machines/vending_machines.yml index c58e8ad69bc6..60b30df4eee7 100644 --- a/Resources/Prototypes/_Starlight/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_Starlight/Entities/Structures/Machines/vending_machines.yml @@ -102,6 +102,7 @@ name: vendor-hug-dispenser categories: - SLPlushies + - SLToys - SLSpecies - SLCrew - SLSecret diff --git a/Resources/Prototypes/_Starlight/Procedural/bluespace_harvester_pools.yml b/Resources/Prototypes/_Starlight/Procedural/bluespace_harvester_pools.yml index d54903d58969..642b23c40a65 100644 --- a/Resources/Prototypes/_Starlight/Procedural/bluespace_harvester_pools.yml +++ b/Resources/Prototypes/_Starlight/Procedural/bluespace_harvester_pools.yml @@ -76,8 +76,6 @@ PlushieRainbowCarp: 0.45 PlushieThrongler: 0.35 PlushieNuke: 0.3 - PlushieShadekin: 0.25 - PlushieGlados: 0.2 PlushieLargeSoftShark: 0.15 PlushieCosmicCult: 0.1 diff --git a/Resources/Prototypes/_Starlight/Recipes/Cooking/food_sequence_element.yml b/Resources/Prototypes/_Starlight/Recipes/Cooking/food_sequence_element.yml index 043025c6eaa6..3a431fd00b4f 100644 --- a/Resources/Prototypes/_Starlight/Recipes/Cooking/food_sequence_element.yml +++ b/Resources/Prototypes/_Starlight/Recipes/Cooking/food_sequence_element.yml @@ -8,44 +8,9 @@ - Meat - Sausage -#Panda Plushie -- type: foodSequenceElement - id: PandaPlushie - scale: 0.75, 0.75 - name: food-sequence-cotton-burger-content-plushie-panda - sprites: - - sprite: _Starlight/Objects/Fun/Plushies/panda_plushie.rsi - state: icon - -#Deer Plushie -- type: foodSequenceElement - id: DeerPlushie - scale: 0.8, 0.8 - name: food-sequence-cotton-burger-content-plushie-deer - sprites: - - sprite: _Starlight/Objects/Fun/Plushies/deer_plushie.rsi - state: icon_no_eyebrows - -#Odd Deer Plushie -- type: foodSequenceElement - id: OddDeerPlushie - scale: 0.8, 0.8 - name: food-sequence-cotton-burger-content-plushie-deer - sprites: - - sprite: _Starlight/Objects/Fun/Plushies/deer_plushie.rsi - state: icon_eyebrows - -#Lizard Mime Plushie -- type: foodSequenceElement - id: PlushieMimeLizard - name: food-sequence-cotton-burger-content-plushie-mimelizard - sprites: - - sprite: _Starlight/Objects/Fun/Plushies/mime_lizard_plushie.rsi - state: icon - #Abductor Plushie - type: foodSequenceElement - id: AbductorPlushie + id: PlushieAbductor scale: 0.8, 0.8 name: food-sequence-cotton-burger-content-plushie-abductor sprites: @@ -54,7 +19,7 @@ #Axolotl Plushie - type: foodSequenceElement - id: AxolotlPlushie + id: PlushieAxolotl scale: 0.75, 0.75 name: food-sequence-cotton-burger-content-plushie-axolotl sprites: @@ -63,67 +28,86 @@ #Borb Plushie - type: foodSequenceElement - id: BorbPlushie + id: PlushieBorb name: food-sequence-cotton-burger-content-plushie-borb sprites: - sprite: _Starlight/Objects/Fun/Plushies/borb_plushie.rsi state: icon +#Borg Plushie +- type: foodSequenceElement + id: PlushieBorg + name: food-sequence-cotton-burger-content-plushie-borg + sprites: + - sprite: _Starlight/Objects/Fun/Plushies/borg_plushie.rsi + state: icon + +#Cow Squishims Plushie +- type: foodSequenceElement + id: PlushieCowSquishims + scale: 0.5, 0.5 + name: food-sequence-cotton-burger-content-plushie-cow-squishims + sprites: + - sprite: _Starlight/Objects/Fun/Plushies/cow_squishims_plushie.rsi + state: icon + #Creature Plushie - type: foodSequenceElement - id: CreaturePlushie + id: PlushieCreature scale: 0.8, 0.8 name: food-sequence-cotton-burger-content-plushie-creature sprites: - sprite: _Starlight/Objects/Fun/Plushies/creature_plushie.rsi state: icon -#Gnome Plushie +#Frog Squishims Plushie - type: foodSequenceElement - id: GnomePlushie - scale: 0.8, 0.8 - name: food-sequence-cotton-burger-content-plushie-gnome + id: PlushieFrogSquishims + scale: 0.5, 0.5 + name: food-sequence-cotton-burger-content-plushie-frog-squishims sprites: - - sprite: _Starlight/Objects/Fun/Plushies/gnome_plushie.rsi + - sprite: _Starlight/Objects/Fun/Plushies/frog_squishims_plushie.rsi state: icon #Goat Plushie - type: foodSequenceElement - id: GoatPlushie + id: PlushieGoat scale: 0.8, 0.8 name: food-sequence-cotton-burger-content-plushie-goat sprites: - sprite: _Starlight/Objects/Fun/Plushies/goat_plushie.rsi state: icon -#Ian Plushie -- type: foodSequenceElement - id: StarlightIanPlushie - name: food-sequence-cotton-burger-content-plushie-ian - sprites: - - sprite: _Starlight/Objects/Fun/Plushies/ian_plushie.rsi - state: icon - -#Lisa Plushie +#Gnome Plushie - type: foodSequenceElement - id: LisaPlushie - name: food-sequence-cotton-burger-content-plushie-lisa + id: PlushieGnome + scale: 0.8, 0.8 + name: food-sequence-cotton-burger-content-plushie-gnome sprites: - - sprite: _Starlight/Objects/Fun/Plushies/lisa_plushie.rsi + - sprite: _Starlight/Objects/Fun/Plushies/gnome_plushie.rsi state: icon #Kitten Plushie - type: foodSequenceElement - id: KittenPlushie + id: PlushieKitten scale: 0.8, 0.8 name: food-sequence-cotton-burger-content-plushie-kitten sprites: - sprite: _Starlight/Objects/Fun/Plushies/kitten_plushie.rsi state: icon +#Panda Plushie +- type: foodSequenceElement + id: PlushiePanda + scale: 0.75, 0.75 + name: food-sequence-cotton-burger-content-plushie-panda + sprites: + - sprite: _Starlight/Objects/Fun/Plushies/panda_plushie.rsi + state: icon + #Pig Plushie - type: foodSequenceElement - id: PigPlushie + id: PlushiePig scale: 0.75, 0.75 name: food-sequence-cotton-burger-content-plushie-pig sprites: @@ -132,53 +116,35 @@ #Renault Plushie - type: foodSequenceElement - id: RenaultPlushie + id: PlushieRenault name: food-sequence-cotton-burger-content-plushie-renault sprites: - sprite: _Starlight/Objects/Fun/Plushies/renault_plushie.rsi state: icon -#Snail Plushie +#Shadekin Plushie - type: foodSequenceElement - id: SnailPlushie + id: PlushieShadekin scale: 0.8, 0.8 - name: food-sequence-cotton-burger-content-plushie-snail - sprites: - - sprite: _Starlight/Objects/Fun/Plushies/snail_plushie.rsi - state: icon - -#Squishims Cow Plushie -- type: foodSequenceElement - id: SquishimsCow - scale: 0.5, 0.5 - name: food-sequence-cotton-burger-content-plushie-cow + name: food-sequence-cotton-burger-content-plushie-shadekin sprites: - - sprite: _Starlight/Objects/Fun/Plushies/cow_squishims_plushie.rsi + - sprite: _Starlight/Objects/Fun/Plushies/shadekin_plushie.rsi state: icon -#Squishims Frog Plushie +#Snail Plushie - type: foodSequenceElement - id: SquishimsFrog - scale: 0.5, 0.5 - name: food-sequence-cotton-burger-content-plushie-frog + id: SnailPlushie + scale: 0.8, 0.8 + name: food-sequence-cotton-burger-content-plushie-snail sprites: - - sprite: _Starlight/Objects/Fun/Plushies/frog_squishims_plushie.rsi + - sprite: _Starlight/Objects/Fun/Plushies/snail_plushie.rsi state: icon #Sus Plushie - type: foodSequenceElement - id: SusPlushie + id: PlushieSus scale: 0.8, 0.8 name: food-sequence-cotton-burger-content-plushie-sus sprites: - sprite: _Starlight/Objects/Fun/Plushies/sus_plushie.rsi state: icon - -#Shadekin Plushie -- type: foodSequenceElement - id: PlushieShadekin - scale: 0.8, 0.8 - name: food-sequence-cotton-burger-content-plushie-shadekin - sprites: - - sprite: _Starlight/Objects/Fun/Plushies/shadekin_plushie.rsi - state: icon diff --git a/Resources/Prototypes/_Starlight/Store/categories.yml b/Resources/Prototypes/_Starlight/Store/categories.yml index 1f33a2d25c72..455993395c24 100644 --- a/Resources/Prototypes/_Starlight/Store/categories.yml +++ b/Resources/Prototypes/_Starlight/Store/categories.yml @@ -2,13 +2,17 @@ id: SLPlushies name: store-category-plushies +- type: storeCategory + id: SLToys + name: store-category-plushie-toys + - type: storeCategory id: SLSpecies name: store-category-plushie-species - type: storeCategory id: SLCrew - name: Crew + name: store-category-plushie-crew - type: storeCategory id: SLChemistry diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/abductor_plushie.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/abductor_plushie.rsi/inhand-left.png new file mode 100644 index 000000000000..f61a27d7c79a Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/abductor_plushie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/abductor_plushie.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/abductor_plushie.rsi/inhand-right.png new file mode 100644 index 000000000000..751a683454c4 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/abductor_plushie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/abductor_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/abductor_plushie.rsi/meta.json index 58ca4c75888e..f4d795c18ffd 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/abductor_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/abductor_plushie.rsi/meta.json @@ -1,14 +1,25 @@ { - "version": 2, + "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", + "copyright": "State based copyright", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/67676ba1602e83d81d9f141a9f3f2900a461b381" + }, + { + "name": "inhand-left", + "copyright": "CawsForConcern (GitHub), edits of in-hand lizard plushie sprites by KieueCaprie", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "CawsForConcern (GitHub), edits of in-hand lizard plushie sprites by KieueCaprie", + "directions": 4 } ] } diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/amali_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/amali_plushie.rsi/icon.png deleted file mode 100644 index e207ab2e5a70..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/amali_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/amali_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/amali_plushie.rsi/meta.json deleted file mode 100644 index 014763fb4a4b..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/amali_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By Abby (Discord happymemories11)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/ash_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/ash_plushie.rsi/icon.png deleted file mode 100644 index d6f49b8260f7..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/ash_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/ash_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/ash_plushie.rsi/meta.json deleted file mode 100644 index e9f9c224209a..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/ash_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By mageofmicrosoftpaints", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/axolotl_plushie.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/axolotl_plushie.rsi/inhand-left.png new file mode 100644 index 000000000000..cb7991cd829b Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/axolotl_plushie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/axolotl_plushie.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/axolotl_plushie.rsi/inhand-right.png new file mode 100644 index 000000000000..49ef7d90ef1c Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/axolotl_plushie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/axolotl_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/axolotl_plushie.rsi/meta.json index 58ca4c75888e..eb5331d66042 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/axolotl_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/axolotl_plushie.rsi/meta.json @@ -1,14 +1,25 @@ { - "version": 2, + "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", + "copyright": "State based copyright", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon", + "copyright": "By Conflee (GitHub)" + }, + { + "name": "inhand-left", + "copyright": "CawsForConcern (GitHub), edits of in-hand lizard plushie sprites by KieueCaprie", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "CawsForConcern (GitHub), edits of in-hand lizard plushie sprites by KieueCaprie", + "directions": 4 } ] } diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/barfo_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/barfo_plushie.rsi/icon.png deleted file mode 100644 index 4062f2b346be..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/barfo_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/barfo_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/barfo_plushie.rsi/meta.json deleted file mode 100644 index cf3a622c07f1..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/barfo_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By stickycheZ101", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/borb_plushie.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/borb_plushie.rsi/inhand-left.png new file mode 100644 index 000000000000..666f8841b3a0 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/borb_plushie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/borb_plushie.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/borb_plushie.rsi/inhand-right.png new file mode 100644 index 000000000000..de6f41608196 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/borb_plushie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/borb_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/borb_plushie.rsi/meta.json index 58ca4c75888e..5d31d5802383 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/borb_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/borb_plushie.rsi/meta.json @@ -1,14 +1,25 @@ { - "version": 2, + "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", + "copyright": "State based copyright", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon", + "copyright": "Taken from https://scrubby.melonmesa.com/dmi/modular_skyrat/master_files/icons/obj/plushes.dmi?codebase=bubber borb" + }, + { + "name": "inhand-left", + "copyright": "CawsForConcern (GitHub)", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "CawsForConcern (GitHub)", + "directions": 4 } ] } diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/glados_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/borg_plushie.rsi/icon.png similarity index 100% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/glados_plushie.rsi/icon.png rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/borg_plushie.rsi/icon.png diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/glados_plushie.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/borg_plushie.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/glados_plushie.rsi/inhand-left.png rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/borg_plushie.rsi/inhand-left.png diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/glados_plushie.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/borg_plushie.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/glados_plushie.rsi/inhand-right.png rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/borg_plushie.rsi/inhand-right.png diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/glados_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/borg_plushie.rsi/meta.json similarity index 59% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/glados_plushie.rsi/meta.json rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/borg_plushie.rsi/meta.json index c370c5bc0ce9..8a761d6437f6 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/glados_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/borg_plushie.rsi/meta.json @@ -1,21 +1,24 @@ { "version": 2, "license": "CC-BY-SA-3.0", - "copyright": "By taco_llama", + "copyright": "State based copyright", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon", + "copyright": "By taco_llama" }, { "name": "inhand-left", + "copyright": "By taco_llama", "directions": 4 }, { "name": "inhand-right", + "copyright": "By taco_llama", "directions": 4 } ] diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/brighteyes_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/brighteyes_plushie.rsi/icon.png deleted file mode 100644 index 6adcf0bfab43..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/brighteyes_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/brighteyes_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/brighteyes_plushie.rsi/meta.json deleted file mode 100644 index 02d36572fdba..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/brighteyes_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By TheRealSlimRedwoods", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/brightheart_plushie.rsi/equipped-HELMET.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/brightheart_plushie.rsi/equipped-HELMET.png new file mode 100644 index 000000000000..95be0be1b14e Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/brightheart_plushie.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/brightheart_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/brightheart_plushie.rsi/icon.png new file mode 100644 index 000000000000..7cb5de268960 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/brightheart_plushie.rsi/icon.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/brightheart_plushie.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/brightheart_plushie.rsi/inhand-left.png new file mode 100644 index 000000000000..ef1bef816e8c Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/brightheart_plushie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/brightheart_plushie.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/brightheart_plushie.rsi/inhand-right.png new file mode 100644 index 000000000000..99a8dc72c482 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/brightheart_plushie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/brightheart_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/brightheart_plushie.rsi/meta.json new file mode 100644 index 000000000000..63c0ce9732d1 --- /dev/null +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/brightheart_plushie.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "State based copyright", + "size": + { + "x": 32, + "y": 32 + }, + "states": + [ + { + "name": "icon", + "copyright": "Character & sprites by rtasva (GitHub/Discord), edited from sprites by deltaVelocity (GitHub/Discord)" + }, + { + "name": "inhand-left", + "copyright": "Character & sprites by rtasva (GitHub/Discord)", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "Character & sprites by rtasva (GitHub/Discord)", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "copyright": "Character & sprites by rtasva (GitHub/Discord)", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/cow_squishims_plushie.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/cow_squishims_plushie.rsi/inhand-left.png new file mode 100644 index 000000000000..b3907031ca2a Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/cow_squishims_plushie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/cow_squishims_plushie.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/cow_squishims_plushie.rsi/inhand-right.png new file mode 100644 index 000000000000..7d3cf7b64194 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/cow_squishims_plushie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/cow_squishims_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/cow_squishims_plushie.rsi/meta.json index 58ca4c75888e..76393aa99b72 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/cow_squishims_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/cow_squishims_plushie.rsi/meta.json @@ -1,14 +1,25 @@ { - "version": 2, + "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", + "copyright": "State based copyright", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon", + "copyright": "By Conflee (GitHub)" + }, + { + "name": "inhand-left", + "copyright": "By CawsForConcern (GitHub)", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "By CawsForConcern (GitHub)", + "directions": 4 } ] } diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/creature_plushie.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/creature_plushie.rsi/inhand-left.png new file mode 100644 index 000000000000..38e1d20fdaa2 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/creature_plushie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/creature_plushie.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/creature_plushie.rsi/inhand-right.png new file mode 100644 index 000000000000..eab4feceb8f6 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/creature_plushie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/creature_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/creature_plushie.rsi/meta.json index 58ca4c75888e..76393aa99b72 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/creature_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/creature_plushie.rsi/meta.json @@ -1,14 +1,25 @@ { - "version": 2, + "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", + "copyright": "State based copyright", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon", + "copyright": "By Conflee (GitHub)" + }, + { + "name": "inhand-left", + "copyright": "By CawsForConcern (GitHub)", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "By CawsForConcern (GitHub)", + "directions": 4 } ] } diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/deer_plushie.rsi/icon_eyebrows.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/deer_plushie.rsi/icon_eyebrows.png deleted file mode 100644 index bd5af5db788f..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/deer_plushie.rsi/icon_eyebrows.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/deer_plushie.rsi/icon_no_eyebrows.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/deer_plushie.rsi/icon_no_eyebrows.png deleted file mode 100644 index d6d45ae0e43c..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/deer_plushie.rsi/icon_no_eyebrows.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/deer_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/deer_plushie.rsi/meta.json deleted file mode 100644 index d1a167e43044..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/deer_plushie.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon_eyebrows" - }, - { - "name": "icon_no_eyebrows" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/equipped-HELMET.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxes_plushie.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/equipped-HELMET.png rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/doxes_plushie.rsi/equipped-HELMET.png diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxes_plushie.rsi/icon.png similarity index 100% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/icon.png rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/doxes_plushie.rsi/icon.png diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxes_plushie.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/inhand-left.png rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/doxes_plushie.rsi/inhand-left.png diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxes_plushie.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/inhand-right.png rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/doxes_plushie.rsi/inhand-right.png diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxes_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxes_plushie.rsi/meta.json new file mode 100644 index 000000000000..1e68faa54bf4 --- /dev/null +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxes_plushie.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "State based copyright", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "copyright": "Character by SanityGecko (Discord), sprites by Conflee (GitHub) and SanityGecko, edits of sprites taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432" + }, + { + "name": "inhand-left", + "copyright": "Character by SanityGecko (Discord), sprites by Conflee (GitHub) and SanityGecko, edits of in-hand lizard plushie sprites by KieueCaprie", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "Character by SanityGecko (Discord), sprites by Conflee (GitHub) and SanityGecko, edits of in-hand lizard plushie sprites by KieueCaprie", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "copyright": "Character by SanityGecko (Discord), sprites by Conflee (GitHub) and SanityGecko, edits of equipped-HELMET sprite made by Cinder", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/meta.json deleted file mode 100644 index d22d59071df1..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-NC-SA-3.0", - "copyright": "Edit (By Conflee and SanityGecko) of sprites taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, equipped-HELMET sprite made by Cinder, in-hand lizard plushie sprites by KieueCaprie, plushie_lizard_inversed and inhand sprites modified from plushie_lizard_mirrored and plushielizard-inhand-left, plushielizard-inhand-right by ArtisticRoomba", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-HELMET", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/eina_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/eina_plushie.rsi/icon.png deleted file mode 100644 index 71dbc04eb978..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/eina_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/eina_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/eina_plushie.rsi/meta.json deleted file mode 100644 index cf3a622c07f1..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/eina_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By stickycheZ101", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/einalia_plushie.rsi/equipped-HELMET.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/einalia_plushie.rsi/equipped-HELMET.png new file mode 100644 index 000000000000..b4b0a68dfd5a Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/einalia_plushie.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/einalia_plushie.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/einalia_plushie.rsi/inhand-left.png new file mode 100644 index 000000000000..e365bbca3d15 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/einalia_plushie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/einalia_plushie.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/einalia_plushie.rsi/inhand-right.png new file mode 100644 index 000000000000..5e6153357d80 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/einalia_plushie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/einalia_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/einalia_plushie.rsi/meta.json index ef910327002e..4d9493d78c77 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/einalia_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/einalia_plushie.rsi/meta.json @@ -1,14 +1,32 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By CaptainComedy", - "size": { - "x": 32, - "y": 32 - }, - "states": [ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "State based copyright", + "size": { - "name": "icon" - } - ] + "x": 32, + "y": 32 + }, + "states": + [ + { + "name": "icon", + "copyright": "Character by CaptainComedii (GitHub) / captaincomedy (Discord), sprites by rtasva (GitHub/Discord), edited from sprites by deltaVelocity (GitHub/Discord)" + }, + { + "name": "inhand-left", + "copyright": "Character by CaptainComedii (GitHub) / captaincomedy (Discord), sprites by rtasva (GitHub/Discord)", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "Character by CaptainComedii (GitHub) / captaincomedy (Discord), sprites by rtasva (GitHub/Discord)", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "copyright": "Character by CaptainComedii (GitHub) / captaincomedy (Discord), sprites by rtasva (GitHub/Discord)", + "directions": 4 + } + ] } diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/elizabeth_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/elizabeth_plushie.rsi/icon.png deleted file mode 100644 index 643e80611835..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/elizabeth_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/elizabeth_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/elizabeth_plushie.rsi/meta.json deleted file mode 100644 index ea2f288d50c4..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/elizabeth_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By nintende", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/emmie_plushie.rsi/icon-unshaded.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/emmie_plushie.rsi/icon-unshaded.png deleted file mode 100644 index 4ee29f97af41..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/emmie_plushie.rsi/icon-unshaded.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/emmie_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/emmie_plushie.rsi/icon.png deleted file mode 100644 index cc326bb171d4..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/emmie_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/emmie_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/emmie_plushie.rsi/meta.json deleted file mode 100644 index 6f640b512d36..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/emmie_plushie.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By deltaVelocity", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "icon-unshaded" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/fixes_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/fixes_plushie.rsi/icon.png deleted file mode 100644 index a8923082949e..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/fixes_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/fixes_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/fixes_plushie.rsi/meta.json deleted file mode 100644 index a0492e8699bb..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/fixes_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By TheSnipingDwarf", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/frog_squishims_plushie.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/frog_squishims_plushie.rsi/inhand-left.png new file mode 100644 index 000000000000..c5f0413939ef Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/frog_squishims_plushie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/frog_squishims_plushie.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/frog_squishims_plushie.rsi/inhand-right.png new file mode 100644 index 000000000000..712cb212e119 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/frog_squishims_plushie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/frog_squishims_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/frog_squishims_plushie.rsi/meta.json index 58ca4c75888e..76393aa99b72 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/frog_squishims_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/frog_squishims_plushie.rsi/meta.json @@ -1,14 +1,25 @@ { - "version": 2, + "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", + "copyright": "State based copyright", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon", + "copyright": "By Conflee (GitHub)" + }, + { + "name": "inhand-left", + "copyright": "By CawsForConcern (GitHub)", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "By CawsForConcern (GitHub)", + "directions": 4 } ] } diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/galio_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/galio_plushie.rsi/meta.json index a880d4d74e15..7ee978281b75 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/galio_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/galio_plushie.rsi/meta.json @@ -1,25 +1,29 @@ { "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By stickycheZ101", + "license": "CC-BY-NC-SA-3.0", + "copyright": "State based copyright", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon", + "copyright": "Character by galiotheblepdragon (Discord), sprites by stickycheZ101 (Discord) edited from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432" }, { "name": "inhand-left", + "copyright": "Character by galiotheblepdragon (Discord), sprites by stickycheZ101 (Discord), edits of in-hand lizard plushie sprites by KieueCaprie", "directions": 4 }, { "name": "inhand-right", + "copyright": "Character by galiotheblepdragon (Discord), sprites by stickycheZ101 (Discord), edits of in-hand lizard plushie sprites by KieueCaprie", "directions": 4 }, { "name": "equipped-HELMET", + "copyright": "Character by galiotheblepdragon (Discord), sprites by stickycheZ101 (Discord), edits of equipped-HELMET sprite made by Cinder", "directions": 4 } ] diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/gnome_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/gnome_plushie.rsi/icon.png index 7e4693cf534e..60cf7e941f84 100644 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/gnome_plushie.rsi/icon.png and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/gnome_plushie.rsi/icon.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/gnome_plushie.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/gnome_plushie.rsi/inhand-left.png new file mode 100644 index 000000000000..4bdd7f750e0d Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/gnome_plushie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/gnome_plushie.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/gnome_plushie.rsi/inhand-right.png new file mode 100644 index 000000000000..7baf597db703 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/gnome_plushie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/gnome_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/gnome_plushie.rsi/meta.json index 58ca4c75888e..37ba693f045c 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/gnome_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/gnome_plushie.rsi/meta.json @@ -1,14 +1,25 @@ { - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", + "version": 1, + "license": "CC0-1.0", + "copyright": "State based copyright", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon", + "copyright": "By CawsForConcern (GitHub)" + }, + { + "name": "inhand-left", + "copyright": "By CawsForConcern (GitHub)", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "By CawsForConcern (GitHub)", + "directions": 4 } ] } diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/goat_plushie.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/goat_plushie.rsi/inhand-left.png new file mode 100644 index 000000000000..e24af03b9b5b Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/goat_plushie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/goat_plushie.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/goat_plushie.rsi/inhand-right.png new file mode 100644 index 000000000000..a70c27b3f144 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/goat_plushie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/goat_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/goat_plushie.rsi/meta.json index 58ca4c75888e..f20524546f24 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/goat_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/goat_plushie.rsi/meta.json @@ -1,14 +1,25 @@ { - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "State based copyright", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/48823" + }, + { + "name": "inhand-left", + "copyright": "CawsForConcern (GitHub), edits of in-hand lizard plushie sprites by KieueCaprie", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "CawsForConcern (GitHub), edits of in-hand lizard plushie sprites by KieueCaprie", + "directions": 4 } ] } diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/ian_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/ian_plushie.rsi/icon.png deleted file mode 100644 index b5a91a2b0f81..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/ian_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/ian_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/ian_plushie.rsi/meta.json deleted file mode 100644 index 58ca4c75888e..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/ian_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/ignis_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/ignis_plushie.rsi/icon.png deleted file mode 100644 index 741eeb247cc0..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/ignis_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/ignis_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/ignis_plushie.rsi/meta.json deleted file mode 100644 index 58ca4c75888e..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/ignis_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/jess_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/jess_plushie.rsi/icon.png deleted file mode 100644 index 1289224b2180..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/jess_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/jess_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/jess_plushie.rsi/meta.json deleted file mode 100644 index 58ca4c75888e..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/jess_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/killa_plushie.rsi/KillaTamalePlush.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/killa_plushie.rsi/KillaTamalePlush.png deleted file mode 100644 index 82a75ee20ab4..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/killa_plushie.rsi/KillaTamalePlush.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/killa_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/killa_plushie.rsi/meta.json deleted file mode 100644 index 0125d77b8a7a..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/killa_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "IQlvlZero", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "KillaTamalePlush" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/killer_plushie.rsi/icon-unshaded.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/killer_plushie.rsi/icon-unshaded.png deleted file mode 100644 index 21efe054f81a..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/killer_plushie.rsi/icon-unshaded.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/killer_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/killer_plushie.rsi/icon.png deleted file mode 100644 index b623835dbb4b..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/killer_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/killer_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/killer_plushie.rsi/meta.json deleted file mode 100644 index 6f640b512d36..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/killer_plushie.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By deltaVelocity", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "icon-unshaded" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/kiosha_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/kiosha_plushie.rsi/icon.png deleted file mode 100644 index e739609256b0..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/kiosha_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/kiosha_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/kiosha_plushie.rsi/meta.json deleted file mode 100644 index 1874f79f4aee..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/kiosha_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By deltaVelocity", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/kitten_plushie.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/kitten_plushie.rsi/inhand-left.png new file mode 100644 index 000000000000..5d18c3c828fc Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/kitten_plushie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/kitten_plushie.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/kitten_plushie.rsi/inhand-right.png new file mode 100644 index 000000000000..fc918b1da5ea Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/kitten_plushie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/kitten_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/kitten_plushie.rsi/meta.json index 58ca4c75888e..58ca527bc95e 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/kitten_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/kitten_plushie.rsi/meta.json @@ -1,14 +1,25 @@ { - "version": 2, + "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", + "copyright": "State based copyright", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon", + "copyright": "Taken from https://scrubby.melonmesa.com/dmi/modular_skyrat/master_files/icons/obj/plushes.dmi?codebase=bubber" + }, + { + "name": "inhand-left", + "copyright": "By oliveoil238", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "By oliveoil238", + "directions": 4 } ] } diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/meta.json deleted file mode 100644 index 63c9e642a8e9..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/meta.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Character by neomoth (https://neomoth.dev), spritework by @leg3__ (discord)", - "size": - { - "x": 32, - "y": 32 - }, - "states": - [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-HELMET", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/equipped-HELMET.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plushie.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/equipped-HELMET.png rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plushie.rsi/equipped-HELMET.png diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plushie.rsi/icon.png similarity index 100% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/icon.png rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plushie.rsi/icon.png diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plushie.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/inhand-left.png rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plushie.rsi/inhand-left.png diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plushie.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/inhand-right.png rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plushie.rsi/inhand-right.png diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plushie.rsi/meta.json new file mode 100644 index 000000000000..4802405a4542 --- /dev/null +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plushie.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "State based copyright", + "size": + { + "x": 32, + "y": 32 + }, + "states": + [ + { + "name": "icon", + "copyright": "Character by neomoth (https://neomoth.dev), spritework by @leg3__ (discord)" + }, + { + "name": "inhand-left", + "copyright": "Character by neomoth (https://neomoth.dev), spritework by @leg3__ (discord)", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "Character by neomoth (https://neomoth.dev), spritework by @leg3__ (discord)", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "copyright": "Character by neomoth (https://neomoth.dev), spritework by @leg3__ (discord)", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/lance_plushie.rsi/equipped-HELMET.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/lance_plushie.rsi/equipped-HELMET.png new file mode 100644 index 000000000000..e10b30231a14 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/lance_plushie.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/lance_plushie.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/lance_plushie.rsi/inhand-left.png new file mode 100644 index 000000000000..a11f117a09c0 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/lance_plushie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/lance_plushie.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/lance_plushie.rsi/inhand-right.png new file mode 100644 index 000000000000..f5ae48252877 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/lance_plushie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/lance_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/lance_plushie.rsi/meta.json index 6f640b512d36..a6dcfb940588 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/lance_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/lance_plushie.rsi/meta.json @@ -1,17 +1,36 @@ { - "version": 2, + "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "By deltaVelocity", - "size": { + "copyright": "State based copyright", + "size": + { "x": 32, "y": 32 }, - "states": [ + "states": + [ { - "name": "icon" + "name": "icon", + "copyright": "Character & sprites by deltaVelocity (GitHub/Discord)" }, { - "name": "icon-unshaded" + "name": "icon-unshaded", + "copyright": "Character & sprites by deltaVelocity (GitHub/Discord)" + }, + { + "name": "inhand-left", + "copyright": "Character & sprites by deltaVelocity (GitHub/Discord)", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "Character & sprites by deltaVelocity (GitHub/Discord)", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "copyright": "Character & sprites by deltaVelocity (GitHub/Discord)", + "directions": 4 } ] } diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/large_soft_shark.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/large_soft_shark_plushie.rsi/icon.png similarity index 100% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/large_soft_shark.rsi/icon.png rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/large_soft_shark_plushie.rsi/icon.png diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/large_soft_shark.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/large_soft_shark_plushie.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/large_soft_shark.rsi/inhand-left.png rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/large_soft_shark_plushie.rsi/inhand-left.png diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/large_soft_shark.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/large_soft_shark_plushie.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/large_soft_shark.rsi/inhand-right.png rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/large_soft_shark_plushie.rsi/inhand-right.png diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/large_soft_shark.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/large_soft_shark_plushie.rsi/meta.json similarity index 56% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/large_soft_shark.rsi/meta.json rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/large_soft_shark_plushie.rsi/meta.json index 7cfdc3a21dda..1ff7dd311258 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/large_soft_shark.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/large_soft_shark_plushie.rsi/meta.json @@ -1,21 +1,24 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TG station 13 and put on STARLIGHT", + "copyright": "State based copyright", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon", + "copyright": "Taken from tgstation" }, { "name": "inhand-left", + "copyright": "Taken from tgstation", "directions": 4 }, { "name": "inhand-right", + "copyright": "Taken from tgstation", "directions": 4 } ] diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/lisa_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/lisa_plushie.rsi/icon.png deleted file mode 100644 index 99d6fd6a3867..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/lisa_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/lisa_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/lisa_plushie.rsi/meta.json deleted file mode 100644 index 58ca4c75888e..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/lisa_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/livvy_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/livvy_plushie.rsi/icon.png deleted file mode 100644 index 5bfe3d1776dd..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/livvy_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/livvy_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/livvy_plushie.rsi/meta.json deleted file mode 100644 index 58ca4c75888e..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/livvy_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/malachi_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/malachi_plushie.rsi/icon.png deleted file mode 100644 index 9f55226293ce..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/malachi_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/malachi_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/malachi_plushie.rsi/meta.json deleted file mode 100644 index 02d36572fdba..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/malachi_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By TheRealSlimRedwoods", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/matthew_plushie.rsi/icon-unshaded.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/matthew_plushie.rsi/icon-unshaded.png deleted file mode 100644 index 337f3be347bf..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/matthew_plushie.rsi/icon-unshaded.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/matthew_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/matthew_plushie.rsi/icon.png deleted file mode 100644 index f8780a450920..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/matthew_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/matthew_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/matthew_plushie.rsi/meta.json deleted file mode 100644 index 6f640b512d36..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/matthew_plushie.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By deltaVelocity", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "icon-unshaded" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/mime_lizard_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/mime_lizard_plushie.rsi/icon.png deleted file mode 100644 index 279aca37961d..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/mime_lizard_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/mime_lizard_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/mime_lizard_plushie.rsi/meta.json deleted file mode 100644 index 58ca4c75888e..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/mime_lizard_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/mina_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/mina_plushie.rsi/icon.png deleted file mode 100644 index 9c0df9412faa..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/mina_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/mina_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/mina_plushie.rsi/meta.json deleted file mode 100644 index 58ca4c75888e..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/mina_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/morgana_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/morgana_plushie.rsi/icon.png deleted file mode 100644 index 48da69c8d521..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/morgana_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/morgana_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/morgana_plushie.rsi/meta.json deleted file mode 100644 index 1874f79f4aee..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/morgana_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By deltaVelocity", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/morgana_round_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/morgana_round_plushie.rsi/meta.json deleted file mode 100644 index 1874f79f4aee..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/morgana_round_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By deltaVelocity", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/mozan_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/mozan_plushie.rsi/meta.json index 933fec554ef8..376e8f8d509a 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/mozan_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/mozan_plushie.rsi/meta.json @@ -1,21 +1,24 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Sprites by CptPuddleboat", + "copyright": "State based copyright", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon", + "copyright": "Character & sprites by CptPuddleboat (GitHub)" }, { "name": "inhand-left", + "copyright": "Character & sprites by CptPuddleboat (GitHub)", "directions": 4 }, { "name": "inhand-right", + "copyright": "Character & sprites by CptPuddleboat (GitHub)", "directions": 4 } ] diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/nebula_plushie.rsi/equipped-HELMET.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/nebula_plushie.rsi/equipped-HELMET.png new file mode 100644 index 000000000000..60378ba6a7ba Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/nebula_plushie.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/nebula_plushie.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/nebula_plushie.rsi/inhand-left.png new file mode 100644 index 000000000000..2289a923fba5 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/nebula_plushie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/nebula_plushie.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/nebula_plushie.rsi/inhand-right.png new file mode 100644 index 000000000000..4cbaba50ab27 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/nebula_plushie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/nebula_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/nebula_plushie.rsi/meta.json index 4dca457e9fd8..63c0ce9732d1 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/nebula_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/nebula_plushie.rsi/meta.json @@ -1,14 +1,32 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "By rtasva", - "size": { + "copyright": "State based copyright", + "size": + { "x": 32, "y": 32 }, - "states": [ + "states": + [ { - "name": "icon" + "name": "icon", + "copyright": "Character & sprites by rtasva (GitHub/Discord), edited from sprites by deltaVelocity (GitHub/Discord)" + }, + { + "name": "inhand-left", + "copyright": "Character & sprites by rtasva (GitHub/Discord)", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "Character & sprites by rtasva (GitHub/Discord)", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "copyright": "Character & sprites by rtasva (GitHub/Discord)", + "directions": 4 } ] } diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/oog_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/oog_plushie.rsi/icon.png deleted file mode 100644 index 33f391bd32f8..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/oog_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/oog_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/oog_plushie.rsi/meta.json deleted file mode 100644 index cf3a622c07f1..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/oog_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By stickycheZ101", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/op_plushie.rsi/equipped-HELMET.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/op_plushie.rsi/equipped-HELMET.png new file mode 100644 index 000000000000..0332cd09f604 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/op_plushie.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/morgana_round_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/op_plushie.rsi/inhand-left.png similarity index 69% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/morgana_round_plushie.rsi/icon.png rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/op_plushie.rsi/inhand-left.png index 20f7d28e75e0..99eeedd62ad0 100644 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/morgana_round_plushie.rsi/icon.png and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/op_plushie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/op_plushie.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/op_plushie.rsi/inhand-right.png new file mode 100644 index 000000000000..deccf1204597 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/op_plushie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/op_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/op_plushie.rsi/meta.json index 1874f79f4aee..c6f68eada3f1 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/op_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/op_plushie.rsi/meta.json @@ -1,14 +1,32 @@ { - "version": 2, + "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "By deltaVelocity", - "size": { + "copyright": "State based copyright", + "size": + { "x": 32, "y": 32 }, - "states": [ + "states": + [ { - "name": "icon" + "name": "icon", + "copyright": "Character by InanimateIJK (GitHub/Discord), sprites by deltaVelocity (GitHub/Discord)" + }, + { + "name": "inhand-left", + "copyright": "Character by InanimateIJK (GitHub/Discord), sprites by deltaVelocity (GitHub/Discord)", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "Character by InanimateIJK (GitHub/Discord), sprites by deltaVelocity (GitHub/Discord)", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "copyright": "Character by InanimateIJK (GitHub/Discord), sprites by deltaVelocity (GitHub/Discord)", + "directions": 4 } ] } diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/panda_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/panda_plushie.rsi/meta.json index 3de41eaf43ba..533ad59f6d36 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/panda_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/panda_plushie.rsi/meta.json @@ -1,21 +1,24 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Sprites by @_polaris_", + "copyright": "State based copyright", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon", + "copyright": "Sprites by @_polaris_" }, { "name": "inhand-left", + "copyright": "Sprites by @_polaris_", "directions": 4 }, { "name": "inhand-right", + "copyright": "Sprites by @_polaris_", "directions": 4 } ] diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/percy_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/percy_plushie.rsi/icon.png deleted file mode 100644 index 6d878c71d2b8..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/percy_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/percy_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/percy_plushie.rsi/meta.json deleted file mode 100644 index cf3a622c07f1..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/percy_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By stickycheZ101", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/pig_plushie.rsi/equipped-HELMET.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/pig_plushie.rsi/equipped-HELMET.png new file mode 100644 index 000000000000..5b9c2516c5fc Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/pig_plushie.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/pig_plushie.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/pig_plushie.rsi/inhand-left.png new file mode 100644 index 000000000000..66fd64bea4f3 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/pig_plushie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/pig_plushie.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/pig_plushie.rsi/inhand-right.png new file mode 100644 index 000000000000..abd03875b080 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/pig_plushie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/pig_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/pig_plushie.rsi/meta.json index 58ca4c75888e..1939c5ce8a10 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/pig_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/pig_plushie.rsi/meta.json @@ -1,14 +1,30 @@ { - "version": 2, + "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", + "copyright": "State based copyright", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon", + "copyright": "By Conflee (GitHub)" + }, + { + "name": "inhand-left", + "copyright": "By oliveoil238", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "By oliveoil238", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "copyright": "By oliveoil238", + "directions": 4 } ] } diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/poley_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/poley_plushie.rsi/icon.png deleted file mode 100644 index 1060a63bc243..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/poley_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/poley_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/poley_plushie.rsi/meta.json deleted file mode 100644 index b1a6f4018e75..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/poley_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By Truck.co", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/redwoods_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/redwoods_plushie.rsi/icon.png deleted file mode 100644 index ec9a4c252a3a..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/redwoods_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/redwoods_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/redwoods_plushie.rsi/meta.json deleted file mode 100644 index 02d36572fdba..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/redwoods_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By TheRealSlimRedwoods", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/remiie_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/remiie_plushie.rsi/icon.png deleted file mode 100644 index 95863433759e..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/remiie_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/remiie_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/remiie_plushie.rsi/meta.json deleted file mode 100644 index 02d36572fdba..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/remiie_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By TheRealSlimRedwoods", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/renault_plushie.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/renault_plushie.rsi/inhand-left.png new file mode 100644 index 000000000000..f49c0df4c31b Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/renault_plushie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/renault_plushie.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/renault_plushie.rsi/inhand-right.png new file mode 100644 index 000000000000..7374165cea48 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/renault_plushie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/renault_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/renault_plushie.rsi/meta.json index 58ca4c75888e..83f8482185a8 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/renault_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/renault_plushie.rsi/meta.json @@ -1,14 +1,25 @@ { - "version": 2, + "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", + "copyright": "State based copyright", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon", + "copyright": "https://github.com/austation/austation/blob/HEAD/icons/obj/plushes.dmi, edited from from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/pets.dmi" + }, + { + "name": "inhand-left", + "copyright": "CawsForConcern (GitHub), edits of in-hand kitten plushie sprites by oliveoil238", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "CawsForConcern (GitHub), edits of in-hand kitten plushie sprites by oliveoil238", + "directions": 4 } ] } diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/rhea_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/rhea_plushie.rsi/icon.png deleted file mode 100644 index d8e78c8b09f0..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/rhea_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/rhea_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/rhea_plushie.rsi/meta.json deleted file mode 100644 index 02d36572fdba..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/rhea_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By TheRealSlimRedwoods", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/romero_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/romero_plushie.rsi/icon.png deleted file mode 100644 index 919a3944a66c..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/romero_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/romero_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/romero_plushie.rsi/meta.json deleted file mode 100644 index 3b77d41c156d..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/romero_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By stickycheZ101", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/rufia_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/rufia_plushie.rsi/icon.png deleted file mode 100644 index 7bec83a2d9ac..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/rufia_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/rufia_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/rufia_plushie.rsi/meta.json deleted file mode 100644 index 3b77d41c156d..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/rufia_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By stickycheZ101", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/saltho_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/saltho_plushie.rsi/icon.png deleted file mode 100644 index e5489f8ac4cd..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/saltho_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/saltho_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/saltho_plushie.rsi/meta.json deleted file mode 100644 index 58ca4c75888e..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/saltho_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny.rsi/equipped-HELMET.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny_plushie.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny.rsi/equipped-HELMET.png rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny_plushie.rsi/equipped-HELMET.png diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny_plushie.rsi/icon.png similarity index 100% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny.rsi/icon.png rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny_plushie.rsi/icon.png diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny_plushie.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny.rsi/inhand-left.png rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny_plushie.rsi/inhand-left.png diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny_plushie.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny.rsi/inhand-right.png rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny_plushie.rsi/inhand-right.png diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny_plushie.rsi/meta.json similarity index 70% rename from Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny.rsi/meta.json rename to Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny_plushie.rsi/meta.json index fa02335979eb..9533f66a8682 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/sea_bunny_plushie.rsi/meta.json @@ -11,21 +11,21 @@ [ { "name": "icon", - "copyright": "briochebear(discord)" + "copyright": "briochebear (Discord)" }, { "name": "inhand-left", - "copyright": "briochebear(discord)", + "copyright": "briochebear (Discord)", "directions": 4 }, { "name": "inhand-right", - "copyright": "briochebear(discord)", + "copyright": "briochebear (Discord)", "directions": 4 }, { "name": "equipped-HELMET", - "copyright": "briochebear(discord)", + "copyright": "briochebear (Discord)", "directions": 4 } ] diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/shadekin_plushie.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/shadekin_plushie.rsi/inhand-left.png new file mode 100644 index 000000000000..a9f73917bbc1 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/shadekin_plushie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/shadekin_plushie.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/shadekin_plushie.rsi/inhand-right.png new file mode 100644 index 000000000000..8cc23f32b203 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/shadekin_plushie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/shadekin_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/shadekin_plushie.rsi/meta.json index eb8f0dc3590d..eb5331d66042 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/shadekin_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/shadekin_plushie.rsi/meta.json @@ -1,14 +1,25 @@ { - "version": 2, + "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Conf (97524725969862656)", + "copyright": "State based copyright", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon", + "copyright": "By Conflee (GitHub)" + }, + { + "name": "inhand-left", + "copyright": "CawsForConcern (GitHub), edits of in-hand lizard plushie sprites by KieueCaprie", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "CawsForConcern (GitHub), edits of in-hand lizard plushie sprites by KieueCaprie", + "directions": 4 } ] } diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/siffy_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/siffy_plushie.rsi/icon.png deleted file mode 100644 index 9c6b74ead93d..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/siffy_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/siffy_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/siffy_plushie.rsi/meta.json deleted file mode 100644 index 58ca4c75888e..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/siffy_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/snail_plushie.rsi/equipped-HELMET.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/snail_plushie.rsi/equipped-HELMET.png new file mode 100644 index 000000000000..b02d9449c76d Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/snail_plushie.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/snail_plushie.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/snail_plushie.rsi/inhand-left.png new file mode 100644 index 000000000000..22ef3ca8c3c4 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/snail_plushie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/snail_plushie.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/snail_plushie.rsi/inhand-right.png new file mode 100644 index 000000000000..13f4cd34f46d Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/snail_plushie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/snail_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/snail_plushie.rsi/meta.json index 58ca4c75888e..97d80f3a22c5 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/snail_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/snail_plushie.rsi/meta.json @@ -1,14 +1,30 @@ { - "version": 2, + "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", + "copyright": "State based copyright", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon", + "copyright": "By Conflee (GitHub)" + }, + { + "name": "inhand-left", + "copyright": "By CawsForConcern (GitHub)", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "By CawsForConcern (GitHub)", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "copyright": "By CawsForConcern (GitHub)", + "directions": 4 } ] } diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/stinky_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/stinky_plushie.rsi/icon.png deleted file mode 100644 index 1d80a8d1fa7e..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/stinky_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/stinky_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/stinky_plushie.rsi/meta.json deleted file mode 100644 index 58ca4c75888e..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/stinky_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/sus_plushie.rsi/equipped-HELMET.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/sus_plushie.rsi/equipped-HELMET.png new file mode 100644 index 000000000000..f6ef6355e18b Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/sus_plushie.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/sus_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/sus_plushie.rsi/icon.png index 2fbac68e1da7..340699327806 100644 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/sus_plushie.rsi/icon.png and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/sus_plushie.rsi/icon.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/sus_plushie.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/sus_plushie.rsi/inhand-left.png new file mode 100644 index 000000000000..cba7097dc989 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/sus_plushie.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/sus_plushie.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/sus_plushie.rsi/inhand-right.png new file mode 100644 index 000000000000..9fa8ae67930f Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/sus_plushie.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/sus_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/sus_plushie.rsi/meta.json index 58ca4c75888e..d53e78246bc4 100644 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/sus_plushie.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/sus_plushie.rsi/meta.json @@ -1,14 +1,30 @@ { - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", + "version": 1, + "license": "CC0-1.0", + "copyright": "State based copyright", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon" + "name": "icon", + "copyright": "By CawsForConcern (GitHub)" + }, + { + "name": "inhand-left", + "copyright": "By CawsForConcern (GitHub)", + "directions": 4 + }, + { + "name": "inhand-right", + "copyright": "By CawsForConcern (GitHub)", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "copyright": "By CawsForConcern (GitHub)", + "directions": 4 } ] } diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/vanilla_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/vanilla_plushie.rsi/icon.png deleted file mode 100644 index 6da205168fa2..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/vanilla_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/vanilla_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/vanilla_plushie.rsi/meta.json deleted file mode 100644 index 98903ecc43f2..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/vanilla_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprites by Angy_boi, implemented by RoadTrain", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/vika_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/vika_plushie.rsi/icon.png deleted file mode 100644 index dcad92c8e7ff..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/vika_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/vika_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/vika_plushie.rsi/meta.json deleted file mode 100644 index 58ca4c75888e..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/vika_plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "Wit Studio - My friend Nokotan, SS13 Sprites, Conflee, ReamNox, Miracula, Puddleboat, Salthew, Gensy, Polaris TODO from Happyrobot33, Fix copyright after RSI Split", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/virus_plushie.rsi/equipped-HELMET.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/virus_plushie.rsi/equipped-HELMET.png deleted file mode 100644 index 663b865804db..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/virus_plushie.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/virus_plushie.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/virus_plushie.rsi/icon.png deleted file mode 100644 index 6bb1a12f3bf6..000000000000 Binary files a/Resources/Textures/_Starlight/Objects/Fun/Plushies/virus_plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/virus_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/virus_plushie.rsi/meta.json deleted file mode 100644 index c50d29e2c20f..000000000000 --- a/Resources/Textures/_Starlight/Objects/Fun/Plushies/virus_plushie.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 2, - "license": "CC-BY-SA-3.0", - "copyright": "By TheRealSlimRedwoods", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name":"equipped-HELMET", - "directions": 4 - } - ] -} diff --git a/Resources/_Starlight/migration.yml b/Resources/_Starlight/migration.yml index ef3d6078063a..8c479441c61a 100644 --- a/Resources/_Starlight/migration.yml +++ b/Resources/_Starlight/migration.yml @@ -161,3 +161,63 @@ GasPipeSubfloorTankAlt1: GasPipeTankSubfloorAlt1 GasPipeSubfloorTankAlt2: GasPipeTankSubfloorAlt2 GasPipeSubfloorTankAlt3: GasPipeTankSubfloorAlt3 GasPipeSubfloorTankAlt4: GasPipeTankSubfloorAlt4 + +#2026-08-01 - Plushie clean up, fixing IDs. +AbductorPlushie: PlushieAbductor +AxolotlPlushie: PlushieAxolotl +BorbPlushie: PlushieBorb +PlushieBrighteyes: PlushieBrightheart +SquishimsCow: PlushieCowSquishims +CreaturePlushie: PlushieCreature +SquishimsFrog: PlushieFrogSquishims +GoatPlushie: PlushieGoat +GnomePlushie: PlushieGnome +KittenPlushie: PlushieKitten +PlushieMimeLizard: PlushieLizardJobMime # upstream +PandaPlushie: PlushiePanda +PigPlushie: PlushiePig +RenaultPlushie: PlushieRenault +SnailPlushie: PlushieSnail +SusPlushie: PlushieSus +IanPlushie: ToyIan # upstream +LisaPlushie: ToyIan # upstream +PlushieDoxesTheCaptain: PlushieDoxes +MozanPlush: PlushieMozan + +#2026-08-01 - Plushie removals. Lots of maps used these for decor, so we'll swap removed plushies with another one so the space isn't left empty. +PlushieAmali: PlushieLizard +PlushieAsh: PlushieVulp +PlushieBarfo: PlushieKitten +DeerPlushie: PlushieLizard +OddDeerPlushie: PlushieLizard +PlushieLiz: PlushieBorb +PlushieEina: PlushieBorb +PlushieEmmie: PlushieBorb +PlushieFixes: PlushieLizardJobChiefengineer +PlushieGlados: PlushieBorg # made generic +PlushieWEH: PlushieBorg # made generic +IgnisPlush: PlushieLizard +JessPlush: PlushieLizard +PlushieKilla: PlushieKitten +PlushieKiller: PlushieKitten +PlushieKiosha: PlushieBorb +LivvyPlush: PlushieLizard +PlushieMalachi: PlushieLizard +PlushieMatthew: PlushieBorb +MinaPlush: PlushieLizardJobHeadofpersonnel +PlushieMorgana: PlushieVulp +PlushieMorganaRound: PlushieVulp +PlushieOog: PlushieHuman +PlushiePercy: ToyFigurineAssistant +PlushiePoley: PlushieLizardJobSalvagespecialist +PlushieRedwoods: PlushieVulp +PlushieRemiie: PlushieLizard +PlushieRhea: PlushieBorb +PlushieRomero: ToyFigurineHeadOfSecurity +PlushieRufia: PlushieVulp +StalksPlush: PlushieLizard +SiffyPlush: PlushieLizardJobChiefengineer +StinkyPlush: PlushieLizard +PlushieVanilla: PlushieVulp +VikaPviPlushie: PlushieLizard +PlushieVirus: PlushieLizard