Skip to content

Commit 6ba256f

Browse files
committed
Merge branch 'master' into change
Conflicts: kannada/romaanchanavee_kannada/romaanchanavee_kannada.md
2 parents e46a251 + b9241cd commit 6ba256f

File tree

50 files changed

+315
-14
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+315
-14
lines changed

Polish/przygoda/jedzenie/jedzenie.md

+2
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ Gdy całe ptasie mleczko jest już zjedzone, dochodzisz do oczywistych wniosków
88
[Człowiek bez RiGCzu jest jak dżentelmen bez kapelusza, lub dama bez torebki](akap/akap.md)
99

1010
[Jestem najedzony!](najedzony/najedzony.md)
11+
12+
[Mam ochotę zagrać w Wiedźmina trójkę](wiedzmin/wiedzmin.md)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Teleportujesz się na skwer przed ulubioną księgarnią
2+
komputerową skrywającą staroświeckie papierowe woluminy
3+
wszechwiedzy. Skwer jest rozgrzany popołudniowym słońcem
4+
lipcowego skwaru. Twój wzrok automatycznie kieruje się ku
5+
nogom dwóch przechodzących dziewcząt. Kobiety mijają cię,
6+
a ty odwracasz się za nimi. Podnosisz wzrok w kierunku
7+
kołyszących się pup. Odpędzasz od siebie nieczyste myśli,
8+
odwracasz się na pięcie i wchodzisz się do księgarni.
9+
10+
Sprzedawca, cybernetyczny, zasuszony hipernerd wita cię tymi
11+
słowami:
12+

english/ask-to-alice/ask-to-alice.md

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ But how can you believe anyone who stands 10 ft tall holding a white rabbit? Wha
55
[music](https://www.youtube.com/watch?v=WANNqr-vcx0) that you're hearing? You decide to that
66
it's time for another pill, but which one should you take?
77

8+
Pick one of the choices below:
9+
10+
Just click on the link.
11+
812
[The one that makes you larger](../super-man/save-the-word.md)
913

1014
[The one that makes you sleep](../sleep/marshmallow.md)

english/coffee/hollywood/hollywood.md

+17-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
Marshmellow
2+
An original screenplay concept by
3+
Anonymous
4+
5+
Science Fiction:A computer programmer teams up with a unemployed writer to prove his innocence of federal
6+
fraud charges.
7+
8+
As the story unfolds, the computer programmer falls in love with a street wise kid who has a time
9+
machine which they use to their advantage.
10+
11+
Through hiding the truth until the last moment they manage to break into 1 shopping malls, bring down the
12+
dirty politician and win the respect of mob informants.
13+
14+
Think Matrix meets Jurassic Park.
115
After writing, what you believe to be to be, a best-selling novel you decided to try to market the book right
216
and head to Hollywood. The only choice now is how to get there. You’re afraid of flying and don’t care much for
3-
public transportation.
17+
public transportation.
18+
19+
[Sleep till morning](../../marshmallow.md)

english/coffee/nude-run/nude-run.md

+2
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ How do you respond?
1515
["Cold."](../nude-run/cold-water/cold-water.md)
1616

1717
["... You're a badger."](../nude-run/badger/badger.md)
18+
19+
["You remain silent...](../nude-run/silent/silent.md)
+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
You refuse to answer the badger's question.
2+
3+
An awkward silence ensues while you and the badger maintain steadfast
4+
eyecontact.

english/dream/dream.md

+2
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ Afterwards, you decide to:
1212
[swim](../dream/swim/swim.md)
1313

1414
[dance](../dance/dance.md)
15+
16+
[karaoke](../karaoke/nope.md)

english/find-bird/bird.md

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ Upon closer inspection, one of the marshmallows is making bird sounds.
22

33
The twittering sounds like a muffled, frantic, "Help me, help me!"
44

5+
You chuckle to yourself thinking, "Wizards always try to play god".
6+
57
You use the fork to free the bird from its gooey prison. It is very small
68

79
but very strong. You tie the rope to its feet and:

english/humbleservant/humbleservant.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@ robot with a giant drill equipped! Good work
33
assembling that robot before.
44
"My drill is the drill, that creates the HEAVENS",
55
your humble servant shouts, and then it
6-
pierces through the marshmallow wall into the stratosphere.
6+
pierces through the marshmallow wall into the stratosphere.
7+
As you fly through the heavens, you hear a small voice
8+
far in the distance: "Save me Bro!Please don't leave me!"
9+
+7-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
Your best firend pulls out a boombox and starts
2-
pumping some sick beats. You and your friends
3-
start an extreme mosh pit that turns the
4-
marshmallow room into a fluff!!!
1+
Your best friend pulls out a boombox and starts
2+
pumping some sick beats. You and your friends
3+
start an extreme mosh pit that turns the
4+
marshmallow room into a fluff!!! The marshmellow
5+
walls start collapsing all around you and your
6+
friends, resulting in a mad avalanche of
7+
marshmellow gooey-ness.

english/karaoke/nope.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
You walk into a bar and see karaoke is going on!
22

3+
An eight-foot tall dinosaur wearing 3D glasses hands you the mic.
4+
35
[nope out](../marshmallow.md)
46

5-
[sing karaoke?](karaoke/sing.md)
7+
[sing karaoke?](karaoke/sing.md)

english/lego-world/lego-world.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
You step through the enchanted door and into Lego World!
2+
But this world is a Lego version of Willy Wonka and the Chocolate Factory.
3+
You are actually skiing down the slope of a marshmallow mountain made out of Legos!
4+
You are surrounded by lollipop trees and gingerbread houses.
5+
[Everything is awesome!](https://youtu.be/etzMjoH0rJw)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
You grab the conveniently placed fire extinguisher to your side.
2+
3+
You spray the extinguisher over the roaring flames and put them out quickly.

english/light-fire/fire.md

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ walls for you to squeeze through.
2929

3030
[Say xyzzy.](xyzzy/xyzzy.md)
3131

32+
[Extinguish fire.](extinguish-fire/extinguish-fire.md)
33+
3234
[Drink some coffee.](../coffee/coffee.md)
3335
[Sleep]
3436

english/macgyver/stickfork/stickforkinwall.md

+2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@ You take the fork with both hands and raise it up above your head, dismissing th
22
You then plunge the fork with all your might into the wall. With a muffled whumpf the fork wedges in the crack between
33
two marshmallows.
44

5+
The marshmellow walls convulse and heave with pain, but eventually settle to their original state.
6+
57
Now that the task is done, you stand back and marvel at your handiwork... If there was any sun in the room you could
68
probably use this to tell the time, or you could hang your coat on the newly fashioned coat hook.

english/magic/magic.md

+3
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@ Channel you inner Harry Potter and turn that rope into some grahm crackers.
22
Grab you a handfull of that marshmallow wall.
33
Use that lighter and make you some smores.
44
Eat your way out of that room and watch out for Lord Voldemort
5+
6+
[Wave your magic wand](../movie-ripoffs/hogwarts/hogwarts.md)
7+
58
You are now in the Kings Landing, looking at the Mad King on the Iron throne.
69
I am coming for you mad king. For I am the mother of dragons

english/marshmallow.md

+14
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ But it's probably not worth dwelling on that right now, you could be in danger.
1212

1313
Grave danger.
1414

15+
The type of mortal danger that so often accompanies confectionary inspired interior design.
16+
Quickly surveying your immediate surrounds, you notice a garishly dressed,
17+
vacant eyed young man lounging on a nearby sofa.
18+
19+
[Interrogate the man for clues](./movie-ripoffs/zoolander/zoolander.md)
20+
1521
These marshmallows are numerous and they look so delicious.
1622

1723
You reach out to grab a handful of the marshmallow wall, but you can't seem to take the handful away from the wall.
@@ -68,6 +74,10 @@ Pointing it at the door, eyes closed, "Alohomora..."
6874

6975
Do you:
7076

77+
[Peak through the keyhole to reveal what is beyond](world-war-marshmallows/world-war-marshmallows.md)
78+
79+
[Try the more effective "Apparation" spell to teleport elsewhere](movie-ripoffs/hogwarts/hogwarts.md)
80+
7181
[Want to break free](yuha/yuha.md)
7282

7383
[Give the marshmallow entity a turing test](turing-test/turing-test.md)
@@ -78,6 +88,8 @@ Do you:
7888

7989
[Check your phone for date, time and location?](check-your-phone/check-your-phone.md)
8090

91+
[Check mspaintadventures](mspa/mspa.md)
92+
8193
[Lunge for the lighter](lunge-for-the-lighter/lunge-for-the-lighter.md)
8294

8395
[Ask to Alice](ask-to-alice/ask-to-alice.md)
@@ -254,3 +266,5 @@ Do you:
254266
[Drool on the Marshmallow to show demonstrate your digestive superiority](drool/droolstrategem.md)
255267

256268
[Eat the Marshmallow](eatmarshmallow/eatmarshmallow.md)
269+
270+
[Escape into Willy Wonka Lego-World](lego-world/lego-world.md)
+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
Your guts turn inside out as your apparation spell throws you violently halfway across the world.
2+
You look around at the inside of the great hall at Hogwarts school of Witchcraft and Wizardry.
3+
It's just after dinner and the place is crowded with students.
4+
5+
A bearded Giant clumps up to you yelling "Cor blimey - it's HARRY POTTER!" as he picks you up in a violent bear hug.
6+
"I think you're badly mistaken" you exclaim breathlessly as he places you back on the ground.
7+
8+
"No - no mistake, Harry.", he says gleefully as he quickly scribbles a zig-zag on your forehead with a
9+
permanent marker pen. "You've got the scar and everything!".
10+
11+
Just then a clever looking girl approaches.
12+
"Hi, I'm Caroline Granger", she says, sticking out her hand. "Don't mind Hagrid. He's severely delusional."
13+
"Safest to just humor him." she whispers quietly.
14+
15+
"But where is Harry Potter?" you ask puzzled.
16+
17+
"Oh there's no such person." says Caroline smugly. "George and Fred just invented him to freak out old Mouldy-Wart."
18+
19+
At that moment, a frazzled looking bald man comes rushing out of a side door shaking with anger and yelling...
20+
"I'll get that Harry Potter if it's the last thing I do!".
21+
22+
A chorus of voices respond with helpful, but conflicting advice such as "Saw him in the girl's toilets, Sir", and
23+
"Killing death-eaters on the 3rd floor, Sir". This advice is followed by poorly concealed snickering
24+
from other students as the elderly wizard leaps up the staircase in misguided pursuit.
25+
26+
"Don't forget to put on your invisible cloak, Sir" calls Caroline as he disappears out of sight.
27+
28+
"We just tell him that he's invisible when he's wearing it - he's soooo gullible." giggles Caroline, rolling her eyes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Your wand gives off a lurid Hollywood special effect, and Morpheus slumps to the ground, lifeless.
2+
3+
The walls of the dojo dissolve and you find yourself back in the sewers, surrounded by the same badly clothed
4+
derelicts as before. Some of them are clustered around the body of Morpheus, trying desperately to revive him.
5+
6+
It suddenly occurs to you that living in the smelly sewers with no services, amenities, retail stores, entertainment etc
7+
might not be such a great future. Perhaps you should've taken the blue pill.
+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
Nothingness... Endless drifting through the void...
2+
3+
Dim red light. The taste of oil. The smell of sweaty feet. The feel of wet nappies. ...
4+
5+
You regain consciousness on a stretcher in some type of underground sewer, surrounded by a bunch of
6+
ragged hobos with mad staring eyes.
7+
8+
"He's awake, Morpheus." says a dark haired waif on your left.
9+
10+
A large leering, gap-toothed man steps over and looks into your face. "Time to learn Krav Maga." he says
11+
as he jams something sharp into the back of your skull.
12+
13+
A split second later you realise you're in the middle of a brightly lit japanese dojo, garbed in oriental
14+
combat clothes. The same large toothy man, Morpheus, stands in front of you, giggling uncontrollably.
15+
16+
"What's going on?" you ask in puzzled trepidation as you watch him slowly crouch into a fighting pose.
17+
18+
"That's for me to know and you to find out" Morpheus sniggers, lashing his foot into your groin,
19+
and immediately following up with a flurry of kicks, punches and head butts.
20+
21+
"What the hell?" you yell in pain and consternation as you desperately try to fend off the vicious attack.
22+
23+
"Do you think this is AIR that you're breathing?" Morpheus suggests cryptically as he slaps you across the face.
24+
"Actually it's not!", he giggles, "This is MY simulation, so I replaced it with Nitrous Oxide - just for laughs!"
25+
26+
A flash of inspiration hits you. "Well, if normal rules of physics don't apply then I can just use magic." you exclaim.
27+
28+
"Accio magic wand", you yell, and a magic wand flies into your hands. "Expectorate!", you shout, and a blast of
29+
gooey liquid smashes Morpheus across the room. Choose the next spell:
30+
31+
["Apparate" to get the hell out of here](../hogwarts/hogwarts.md)
32+
33+
["Avada Kedavra" to finish Morpheus off](../matrix-boss/matrix-boss.md)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
As you approach the shaggy haired hippy, it is immediately obvious that the fellow is "high as a kite",
2+
his eyes unsuccessfully attempting to focus on you as he inhales deeply from a half smoked joint.
3+
4+
"Who are you, and what the hell is this place?" you ask loudly, hoping to penetrate his drug-fogged stupor.
5+
6+
"Chill Bro - you're ruining the vibe!" whines the stoner. "I'm Hansel by the way." he adds, waving vaguely.
7+
8+
"Where am I, and how do I get out of here?" you ask the red-eyed derelict, with a sense of increasing futility.
9+
10+
"Dude, that's awesome!" Hansel responds wide-eyed. "You're lost! I'm lost! We're like cosmic twins or something!".
11+
12+
"But how did you get here?" you demand irritably, attempting to keep the conversation on track.
13+
14+
Looking puzzled Hansel continues. "Dunno. I was climbing Mt Vesuvius and I slipped and fell. Next thing I was here."
15+
He pauses for a moment "Oh... epiphany... I've never even BEEN to Vesuvius! Must be something to do with the pills."
16+
17+
Excitedly, Hansel rummages through his pockets and hauls out a grubby assortment of colored tablets.
18+
19+
"This dude, I think his name was Neon, sold me these. He said the blue ones are for waking up,
20+
and the red ones are for ... ummm ... not waking up? Or maybe the other way around? Anyhow - you wanna try?".
21+
22+
Hansel holds out the pills, which look suspiciously like M&Ms to you. Do you:
23+
24+
[Get the heck away from this junkie and explore some more](../../marshmallow.md)
25+
26+
[Take a blue pill](../../virtualreality/oculus.md)
27+
28+
[Take a red pill](../matrix/matrix.md)

english/mspa/mspa.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
You visit your favorite webpage, mspaintadventures.net.
2+
3+
Hussie's latest adventure is pure, unadulterated trash.
4+
5+
This does not surprise you in the slightest,
6+
7+
it only disappoints you.

english/polar-bear/polar-bear.md

+10
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,18 @@ For some reason, you forget your fear and watch. The polar bear eventually stops
1818
chewing away and looks up at you with big happy eyes and his tongue flopping out
1919
of the side of his mouth.
2020

21+
The polar bear was distracted by the incredible herd/pod of walruses.
22+
These amazing animals are now viewable on youtube..
23+
..(do a google search for live walrus feed)..
24+
the walruses quickly help the situation by using their tusks to pierce any
25+
marshmellows and create a rip in the fabric of reality.. you jump on the
26+
walruses back..
27+
28+
2129
Now you decide to:
2230

2331
[Take a selfie](../selfie/selfie.md)
2432

2533
[Do a dance](../dance/dance.md)
34+
35+
[and ride through the worm whole](worm_hole/worm_hole.md)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
In the new dimension, millions of walruses with kaleidoscope eyes, turn and follow
2+
you down to a bridge by a fountain where rocking horse people eat...

english/turing-test/ring/one_ring.md

+3
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ Meanwhile, you descry your surroundings for escape routes.
88
You eventually realize that tickling the walls makes the whole room to rumble and cracks start appearing in the walls.
99

1010
The cracks in the walls grow larger and larger until they form a doorway big enough for you to walk thorugh.
11+
12+
A shrill sound almost like someone scraping their fingernails on a chalkboard emanates from the doorway,
13+
growing louder with each passing moment.

english/virtualreality/oculus.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ while playing Marshmallow Kingdom again!
55
You take it off and return to the real world.
66
Checkout Samsung VR for amazing experiance.
77

8-
[Life in the real world](problems/realproblems.md).
8+
But next day the same thing happens to you again.
9+
10+
[Life in the real world](problems/realproblems.md).

english/virtualreality/problems/realproblems.md

+2
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ Hey, wait a minute... I removed my Oculus Rift, but the walls are still
33
made of marshmallows. There is still a problem here.
44

55
All of a sudden the lights went off.
6+
7+
[You hear a strange voice](../voice/strangeVoice.md).
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
“You might have noticed that removing your Rift
2+
does not return you to reality. This is working
3+
as intended.”
4+
5+
As you inspect your head with your hands,
6+
you quickly realize that the hands you are seeing
7+
do not match up with the hands you can actually feel.
8+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
You get a run up and charge at the door, it smashes open you're outside, you pause
2+
and look right and one of them sees you, you scream and turn left and scream some more
3+
while you sprint, you see an abandoned Winnebago RV you get in and drive looking in your
4+
rear-view mirror at the carnage behind you, but you're safe, for now.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Yumm, you start eating your hands and well, it's quite tasty! You begin to feel a bad
2+
about the pleasure you're taking in your self-mutiliation. However, no time to enjoy
3+
the sugary-goodness as the marshmallow monster is only steps away!
4+
5+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
You back away from the door scared, you
2+
sit down then realize you felt an urge to go out the door,
3+
those people running, drawing you to them, you have feeling of running after them,
4+
then it dawns on you, you raise your arms, look at your hands, they're not flesh
5+
and blood, they're marshmallow.
6+
7+
[Do you eat your own hands?](eat-your-hands/eat-your-hands.md)
8+
9+
or
10+
11+
[Try to remember what you watched on Periscope last night to help?](remember-periscope/remember-periscope.md)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Although you're starting to get a bit-panicky, you remember that you wasted 5 and a half
2+
hours last night watching Periscope when you should have been working on your iOS nanodegree.
3+
You think to yourself, there must have been something I watched that was useful, I know
4+
I learned a tatic or two to deal with a marshmallow monster. You quickly come to your
5+
senses, and remember that Periscope was a bunch of self-promotion and very little content.
6+
Things are not looking good!

0 commit comments

Comments
 (0)