Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cataclysm DDA - Plushies! #70554

Merged
merged 13 commits into from
Jan 1, 2024

Conversation

The-Anjelo-Guy
Copy link
Contributor

Added the plushies!!

Summary

Content "Added several new plushies variants for fluff purposes."

Purpose of change

Everyone loves plushies, so I added more variants for them.

Describe the solution

Just added the plushies.

Describe alternatives you've considered

Testing

Additional context

Added the plushies!!
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON astyled astyled PR, label is assigned by github actions labels Dec 31, 2023
data/json/items/toy.json Outdated Show resolved Hide resolved
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Dec 31, 2023
Copy link
Contributor

@TheShadowFerret TheShadowFerret left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plushies variants for fluff purposes

I see what you did there

data/json/items/toy.json Outdated Show resolved Hide resolved
data/json/items/toy.json Outdated Show resolved Hide resolved
data/json/items/toy.json Outdated Show resolved Hide resolved
data/json/items/toy.json Outdated Show resolved Hide resolved
data/json/items/toy.json Outdated Show resolved Hide resolved
data/json/items/toy.json Outdated Show resolved Hide resolved
data/json/items/toy.json Outdated Show resolved Hide resolved
data/json/items/toy.json Outdated Show resolved Hide resolved
data/json/items/toy.json Outdated Show resolved Hide resolved
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Dec 31, 2023
The-Anjelo-Guy and others added 9 commits December 31, 2023 15:08
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
Copy link
Contributor

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • A blueish, large, long-necked elasmosaurus plushie with a cute and friendly expression. It is very soft and huggable.
  • A blueish, soft and friendly plesiosaurus plushie with big floppy flippers, a long neck and a and cute, gentle expression.
  • A cuddling gavial plushie with a soft body and long snout, with a playful expression. It has a chomping action when the tail is pulled, letting people, specially children, playfully recreate the gavial's hunting tactics. Don't worry, it is a complex system of cotton ligaments.
  • A cuddly and big wild turkey plushie with brown fauxfeathers (they are made of cotton!), a prominent, soft beak, and expressive, soulful eyes. It has a special feature of making gobbling sounds when squeezed, almost perfectly mimicking the turkey's unique calls.
  • A cuddly and majestic bald eagle plushie with soft, brown and white cotton fauxfeathers, a hooked, soft beak, and a patriotic expression. It has a pair of special eyes that glow as brightly as the stars and stripes of Old Glory, the perfect partner to fend off your enemies in the Cataclysm.
  • A cuddly and wise-looking snowy owl plushie with fluffy white fauxfeathers (they are made of cotton!), orange eyes, and a cute expression. .It features a special light-up effect, mimicking the way the snowy owl's eyes glow brightly in the dark.
  • A cuddly common loon plushie with soft, black-and-white cotton fauxfeathers and a pleasing expression. Its head can bob and turn to mimic the loon's distinctive courtship calls.
  • A cuddly duck plushie with soft, yellow fauxfeathers (they are made of cotton!), cute orange feet, and a lovable quack. This plushie has special water-repellent properties to make it float in water, just like a real duck!.
  • A cuddly peregrine falcon plushie with soft, brown and white cotton fauxfeathers, a soft hooked beak, and an alert expression. With a speedy and sleek plushie design, this toy plushie is sure to take imaginative people on make-believe high-flying chase scenes!
  • A cuddly plushie of the mighty moose, with soft brown fur, floppy ears, and big antlers. It has a special huggability feature that makes it delightfully squishy, perfect for comforting cuddles.
  • A cute and lovable ladybug plushie with soft, red and black polkadotted wings and big, friendly eyes. This plushie features a special retractable spotted soft wing mechanic sewed directly into the body that gives it the authentic appearance of a ladybug about to fly.
  • A cute and wise-looking eastern screech owl plushie with big, round eyes and soft, tan fauxfeathers (they are made of cotton!). It has a feather-soft and silky texture, making it an excellent sensory object for people, specially children, to play and explore while they navigate the world around them.
  • A earth-brown, huggable and soft iguanodon plushie with a friendly smile and soft, round features.
  • A fierce-looking, but extremely soft carnotaurus plushie with a brightly-colored snout and a pair of round, soft horns.
  • A fluffy and colorful opalbinia plushie with an unconventional and cute design, with its body ending in a single, long and soft 'claw'. It has five eyes on stalks and its plush body is coloured on a mix of light pink and white, with plush purple stripes on its legs, and a big pair of cute, gentle-looking eyes.
  • A fluffy and colorful sanctacaris plushie, the great great grandfather of all arthropods. It has a soft, chubby body, multiple soft legs, and eyes on stalks. Its plush is light blue coloured, with accents of shimmering purple on its legs and details on the body. It has big, round eyes with a cute and friendly expression.
  • A fun and colorful rooster plushie with soft, vibrant fauxfeathers made of cotton, a long rooster tail, and a bold expression.
  • A goose plushie with soft, white fauxfeathers (they are made of cotton!), a cute and soft orange beak, and big, playful eyes. This plushie produces realistic honking sounds when hugged!
  • A grayish, soft and cute baryonix plushie with a big head and small arms, it is holding a fish, probably saving it for later.
  • A jacare (or yacare, kind of a South American crocodile) plushie with soft sandy brown scales, a soft plush belly, and an adorable expression. This plushies has a special scented feature that makes it smell just like a warm and tropical Brazilian jungle.
  • A large plushie of your ancestor, the ichthyostega! It has a long, sturdy, soft body, four soft, fat legs, and a soft fish-like tail. Its body is extremely soft and fluffy, and has bumpy green skin with lighter green stripes as details. It presents a cute expression with big, wise eyes.
  • A large plushie of your ancestor, the tiktaalik! It has a soft, huggable fish-like body, stubby legs, and paddle-like soft fins. Its colour is a mix of blue-gray soft scales pattern on the back and a plush beige belly. It has large eyes and a friendly expression.
  • A large, chubby and huggable tylosaurus plushie with a big head and soft fins.
  • A large, chubby sarcosuchus plushie with a friendly, toothy grin and adorable snout. It resembles a crocodile.
  • A large, soft and colorful reddish orange irritator plushie with a long snout and playful expression.
  • A large, soft, fuzzy and colorful archaeopteryx plushie with bird-like features. His feathers apparently are individually designed and placed.
  • A playful and very soft suchomimus plushie with a funny, toothy grin and floppy, soft arms.
  • A plushie with black fluffy fauxfeathers made of cotton, big curious eyes, and an inquisitive expression.
  • A precious soft and cuddly chicken plushie with soft, warm brown fauxeathers (they are made of cotton!) and a gentle expression.
  • A sleek-looking, soft kronosaurus plushie with white dinosaur smile smooth texturized skin and large, cute eyes.
  • A soft, playful and fuzzy flying squirrel plushie with brown fur and oversized pair of armwings. This plushie features almost undetectable special suction cups on its paws that makes it possible to 'climb' and stick to smooth surfaces, mimicking the cuddly creature's real-life abilities.
  • A squat, chubby, cute and very huggable plateosaurus plushie with a prominent belly and a soft stubby tail.
  • This bright, extremely cute golden lion tamarin plushie features long, soft, and golden-colored fur and a extremely playful demeanor. On the label it says that it is an ambassador of its species, and that the amounts collected in the sales of the plushies were donated to help the conservation of the species. Surely now, without many humans, maybe these animals don't have to worry so much about their habitat being destroyed.
  • This cute and cuddling howler monkeu plushie has soft, brown fur, and produces a sound that mimics the howler monkey's signature hooting noise when hugged properly.
  • This extremely cute black lion tamarin plushie features a soft black fur, bright orange hands and feet along with expressive, friendly eyes. On the label it says that it is an ambassador of its species, and that the amounts collected in the sales of the plushies were donated to help the conservation of the species. Surely now, without many humans, maybe these animals don't have to worry so much about their habitat being destroyed.
  • This loving and fluffy sheep plushie features soft, woolly fur in pink, with cute floppy ears and square-pixeled eyes, for some reason.
  • This mandrill monkey plushie is striking due to the bright colorful features present in its face (****mandrills are known for that, after all). This plushie has a movable jaw that reveals soft plush teeth when opened, giving it a realistic appearance.
  • archaeopteryx plushie
  • archaeopteryx plushies
  • baryonix plushie
  • baryonix plushies
  • black lion tamarin plushie plushie
  • black lion tamarin plushie plushies
  • carnotaurus plushie
  • carnotaurus plushies
  • commom loon plushie
  • commom loon plushies
  • elasmosaurus plushie
  • elasmosaurus plushies
  • gavial plushie
  • gavial plushies
  • golden lion tamarin plushie
  • golden lion tamarin plushies
  • grecko plushie
  • grecko plushies
  • ichthyostega plushie
  • ichthyostega plushies
  • iguanodon plushie
  • iguanodon plushies
  • irritator plushie
  • irritator plushies
  • jacare plushie
  • jacare plushies
  • kronosaurus plushie
  • kronosaurus plushies
  • mandrill monkey plushie
  • mandrill monkey plushies
  • opalbinia plushie
  • opalbinia plushies
  • plateosaurus plushie
  • plateosaurus plushies
  • sanctacaris plushie
  • sanctacaris plushies
  • sarcosuchus plushie
  • sarcosuchus plushies
  • suchomimus plushie
  • suchomimus plushies
  • tiktaalik plushie
  • tiktaalik plushies
  • tylosaurus plushie
  • tylosaurus plushies

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

@Maleclypse Maleclypse merged commit 088e2b5 into CleverRaven:master Jan 1, 2024
23 checks passed
@The-Anjelo-Guy The-Anjelo-Guy deleted the The-Anjelo-Guy-plushies branch January 2, 2024 14:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants