Skip to content

Commit

Permalink
Merge branch 'necro-lore' of https://github.com/Frost-wood/Cataclysm-DDA
Browse files Browse the repository at this point in the history
 into merge2
  • Loading branch information
KA101 committed Apr 15, 2015
2 parents 03475f3 + 6da6b4b commit d046390
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 6 deletions.
5 changes: 4 additions & 1 deletion data/json/lab_notes.json
Original file line number Diff line number Diff line change
Expand Up @@ -188,5 +188,8 @@
},{
"type" : "lab_note",
"text" : "Today we found our solution, quite by accident. It was found that XE037 is completely removed from a revivified body following a series of extremely-high energy 4th dimensional transpositions. Unfortunately, this invariably allows subplane life forms to pass into the prime plan. The cure is worse than the disease."
}
},{
"type" :"lab_note",
"text" : "The XE037 contamination has reached critical levels in which the local military forces are unable to stop. Dr. Savage has determined our best course of action is to head to the underground complex known as the VAULT, and attempt to continue production of PE062 there."
}
]
19 changes: 14 additions & 5 deletions data/json/snippets.json
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@
"category": "flier",
"text": "This is an illustrated poster for a brand of solar car. The vehicle is driving through a lush country side as small animals look on. The slogan \"Improving the world, one tank at a time.\" is written across the top. Someone used a blue pen to write \"who gives a shit\" across the slogan and put X's over the eyes of all the animals."
},{
"type" : "snippet",
"category" : "flier",
"text" : "This is a poster advertising a underground bunker. The poster shows a nuclear bomb wiping out a city while a family huddles safely underground. There a slogan \"Concerned about enemy attack? Want to protect your family? Join the VAULT program today.\" which is written in the middle."
},{
"type" : "snippet",
"category" : "note",
"text" : "The Green Fever shall purge the land for His Chosen children. I have seen His black fire shining in the eyes of the afflicted and eagerly await the day He shall consume us all. Ph'nglui mglw'nafh Cthulhu R'lyeh wgah'nagl fhtagn."
Expand Down Expand Up @@ -587,8 +591,11 @@
"type" : "snippet",
"category" : "note",
"text" : "\"This thing isn't a car any more. It's just a fucking mountain of metal on wheels, which I live in.\""
},
{
},{
"type" : "snippet",
"category" : "note",
"text" : "\"I've heard there is a underground shelter somewhere\""
},{
"type": "snippet",
"category":"newest_news",
"text":
Expand All @@ -603,7 +610,8 @@
"LEAVE TO THE EXPERTS -- GENERAL: \"Do not attempt to deal with invaders yourself, our troops have the technology and the training for military action. Loud gunfire may attract more enemy attention than you have ammo!\"",
"TOWNS OCCUPIED TERRITORY: FEMA officials said today \"Do not try to defend your property in towns: invaders use advanced tracking, perhaps scent. Please retreat to your nearest evacuation center outside town and await extraction.\"",
"PUBLIC SERVICE ANNOUNCEMENT: \"Beware Acid Rain\". Several caustic chemicals in the air react with rain clouds to cause deadly acid rain. No word yet on if this is a deliberate tactic or a side effect of the earlier bombings.",
"EDITOR SAYS \"DESTROY THE DEAD\". Recognisable enemy dead left lying in the street may give away militia positions! If you kill an enemy combatant, smash or butcher with a knife until unrecognizable! Screw Geneva! Protect our troops!"]
"EDITOR SAYS \"DESTROY THE DEAD\". Recognisable enemy dead left lying in the street may give away militia positions! If you kill an enemy combatant, smash or butcher with a knife until unrecognizable! Screw Geneva! Protect our troops!",
"SOLDIERS SEEN HEADED UNDERGROUND. Rumors abound as eyewitness see troops headed underground near a local salon. Expert sources suggest that the soldiers may be headed to a possible underground bunker"]
},


Expand All @@ -625,8 +633,9 @@
"The Future... powered by COFFEE! Rivtech brings you the greatest revolution since espresso. Why wait for milk to boil? Have your coffee ready instantly with \"THE POWER OF THE ATOM\"!",
"GLAMOPOLITAN! We've got ALL the latest tips! Whether you want to know what the elite are eating, wearing or discussing, Glamopolitan is YOUR magazine! So pick up a copy today and \"Sizzle Like A Star!\"",
"POPULAR MECHANICS: People say mechanics is boring. We say, \"Prove them Wrong!\" We've got all the articles that make it interesting to talk about, so you can \"Make Mechanics Popular!\"",
"CRAFTY CRAFTERS QUARTERLY: Macaroni isn't just for eating anymore! Learn how to make jewelery and art from it as well! We also discuss the correct way to use superglue without gluing your hands together!"]
},
"CRAFTY CRAFTERS QUARTERLY: Macaroni isn't just for eating anymore! Learn how to make jewelery and art from it as well! We also discuss the correct way to use superglue without gluing your hands together!",
"UNDERGROUND BUNKER? Sources in the government suggest that a underground bunker is being built in a secret location in case of enemy attack. We were unable to get the exact location as our sources mysteriously disappeared shortly after revealing this information."]
},



Expand Down

0 comments on commit d046390

Please sign in to comment.