Skip to content

/Cataclysm-DDA

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

Added More Cannibal Recipes #4371

Merged
merged 7 commits into from Nov 17, 2013

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
6 participants
@EkarusRyndren @VampyreLord @ianestrachan @Rivet-the-Zombie @kevingranade @infectedmochi
@EkarusRyndren
Copy link
Contributor

commented Nov 15, 2013

Couldn't help but notice a few were missing so I added them, also added
a meat (and human meat) sandwich recipe.

EkarusRyndren added some commits Nov 15, 2013

@EkarusRyndren
Added More Cannibal Recipes 
Couldn't help but notice a few were missing so I added them, also added
a meat (and human meat) sandwich recipe.
Loading status checks…
a736732
@EkarusRyndren
Fixes a Typo in the Cannibal Recipes 
Whoops, my bad
Loading status checks…
ae2813f
@EkarusRyndren
Fixes Typo again, hopefully for real this time. 
...I'm not too sure what I'm doing, sorry. If it fails again I'm just
going to leave it be
Loading status checks…
827414f
data/json/items/comestibles.json Outdated
{
"type" : "COMESTIBLE",
"id" : "swisscheeseburger",
"name" : "swiss cheeseburger",

This comment has been minimized.

Sign in to view
Copy link
@Rivet-the-Zombie

Rivet-the-Zombie Nov 15, 2013

Member

What exactly does putting Emmental on a hamburger have to do with cannibalism?

'swiss cheeseburger' doesn't really say 'cannibal food' to me.

This comment has been minimized.

Sign in to view
Copy link
@EkarusRyndren

EkarusRyndren Nov 15, 2013

Author Contributor

@Rivet-the-Zombie I'm not too good with naming XD Was meant to be more of a pun on nationality rather than the cheese type... It doesn't work
@VampyreLord

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Nov 15, 2013

I think the only thing need to be added is cooked human meat.
@EkarusRyndren

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Nov 15, 2013

@VampyreLord It's been there since the beginning. "Cooked Creep" you need to read the book to get the recipe though.
@ianestrachan

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Nov 15, 2013

Maybe "Swede Cheeseburger" instead of "Swiss Cheeseburger"?

Though, most of the existing ones have some alliteration in the name, usually with some minor insult for the first word (cooked creep, sap soup, jerk jerkey, etc). Possibly for theming, possibly for being easily recognized.

Also, possibly, because most of the delicious NPCs in the game are also assholes.

How about...

  • Spaghetti/sandwich: simpleton, scoundrel, scumbag, schmoe, shmuck, slob
  • Pizza: pinhead, poser, punk
  • Burger: bonehead, buffoon
  • Cheeseburger: chump? This one's a little harder.
@Rivet-the-Zombie

This comment has been minimized.

Sign in to view
Copy link
Member

commented Nov 16, 2013

Forbidden anthropophagous delights.

Hmmm long porkburger anyone?
@EkarusRyndren

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Nov 16, 2013

@ianestrachan I picked "Bobburger" for a reason, mainly in the pilot episode of the show "Bob's Burgers" is titled "Human Flesh" XD

I /may/ add other foodstuffs (and cannibal versions) later once my eyes recover.
@EkarusRyndren
Changed a few names to make more sense 
More descriptive, less confusing. Also changed "swisscheeseburger" to
"cheeseburgerhuman" for simplicity's sake.
Loading status checks…
5c4c9a8
@EkarusRyndren

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Nov 16, 2013

...merge failed and I have no idea why
@ianestrachan

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Nov 16, 2013

I think Jenkins broke, I saw the exact same message on someone else's OK-looking PR a moment ago.
@EkarusRyndren
Fixes a few missing items 
I'm sorry XD Hopefully I'll get better at this before everyone grows to
hate me.
Loading status checks…
a90815e
data/json/recipes.json Outdated
"reversible": false,
"autolearn": false,
"book_learn": [[ "cookbook_human", 3 ]],
"book_learn": [[ "cookbook_human", 3 ]],

This comment has been minimized.

Sign in to view
Copy link
@Rivet-the-Zombie

Rivet-the-Zombie Nov 16, 2013

Member

Looks like you've got a doubled line here.
@EkarusRyndren
fixes more stuff 
Thanks Rivet, double-checked the other files and found one more issue
that's been corrected. Hopefully this'll be the last fix.
Loading status checks…
50204b5
data/json/items/comestibles.json Outdated
"heal" : 0,
"addiction_potential" : 0,
"nutrition" : 25,
"description" : "human flesh slices cured in brine and vacuum-packed. Salty but tasty in a pinch. ",

This comment has been minimized.

Sign in to view
Copy link
@infectedmochi

infectedmochi Nov 16, 2013

Contributor

"human" should be "Human" IMO.

This comment has been minimized.

Sign in to view
Copy link
@Rivet-the-Zombie

Rivet-the-Zombie Nov 16, 2013

Member

Yeah that needs capitalized.

This comment has been minimized.

Sign in to view
Copy link
@EkarusRyndren

EkarusRyndren Nov 16, 2013

Author Contributor

Fixed it, hopefully I'll get better about this kind of stuff x.=.x Thanks again for being so helpful everyone.
data/json/recipes.json
@@ -17304,6 +17570,71 @@
]
]
},{
"type" : "recipe",

This comment has been minimized.

Sign in to view
Copy link
@Rivet-the-Zombie

Rivet-the-Zombie Nov 16, 2013

Member

Did you accidentally double an existing recipe here?

This comment has been minimized.

Sign in to view
Copy link
@EkarusRyndren

EkarusRyndren Nov 16, 2013

Author Contributor

As I understand it no, there was no existing recipe for a "Meat Sandwich" I thought about letting the player craft it cold but using raw meat in an sandwich sounded disgusting. I did however use the BLT as a base for it.

This comment has been minimized.

Sign in to view
Copy link
@Rivet-the-Zombie

Rivet-the-Zombie Nov 16, 2013

Member

Oh right on. I didn't realize we lacked a recipe for that!
@EkarusRyndren
fixes a few more typos
Loading status checks…
24c834f
@EkarusRyndren

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Nov 16, 2013

So... How do I go about marking this "ready to go" ?
@kevingranade

This comment has been minimized.

Sign in to view
Copy link
Member

commented Nov 17, 2013

You aren't doing anything wrong, we're just behind.

Rivet-the-Zombie added a commit that referenced this pull request Nov 17, 2013

@Rivet-the-Zombie
Merge pull request #4371 from EkarusRyndren/hoomanmeats 
Added More Cannibal Recipes
14058f1

@Rivet-the-Zombie Rivet-the-Zombie merged commit 14058f1 into CleverRaven:master Nov 17, 2013
1 check passed

1 check passed

default Merged build finished.
Details

@EkarusRyndren EkarusRyndren deleted the EkarusRyndren:hoomanmeats branch Nov 17, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.