Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.
Sign upA small selection of fixes. #3629
Conversation
Rivet-the-Zombie
added some commits
Oct 13, 2013
i2amroy
reviewed
Oct 13, 2013
| @@ -7723,7 +7723,7 @@ | |||
| "type" : "COMESTIBLE", | |||
| "id" : "watermelon", | |||
| "name" : "watermelon", | |||
| "weight" : 4000, | |||
| "weight" : 200, | |||
This comment has been minimized.
This comment has been minimized.
i2amroy
Oct 13, 2013
Member
This should be about 600, (600 * 8 charges = 4800 g, a fairly average watermelon that's just a bit on the small side).
i2amroy
reviewed
Oct 13, 2013
| @@ -7489,7 +7489,7 @@ | |||
| "type" : "COMESTIBLE", | |||
| "id" : "pineapple", | |||
| "name" : "pineapple", | |||
| "weight" : 1500, | |||
| "weight" : 300, | |||
This comment has been minimized.
This comment has been minimized.
Rivet-the-Zombie
added some commits
Oct 13, 2013
This comment has been minimized.
This comment has been minimized.
|
Hadn't known there was a color protocol on junk food. Thanks? |
This comment has been minimized.
This comment has been minimized.
|
By and large most of the foods are colored to somewhat match their RL color. I saw that they were all magenta so I changed some of them to food-colors. |
This comment has been minimized.
This comment has been minimized.
|
OK, thanks. |
This comment has been minimized.
This comment has been minimized.
|
Hmm. Unless "dried meat" and "beef jerky" are split out (they may well be, though looking like not?), that's a net Nerf to commercial beef jerky. Might want to check that? |
This comment has been minimized.
This comment has been minimized.
|
Beef jerky only requires salt and basic cooking. Plus it grants morale. 1 raw meat = 3 jerky. Dried meat grants no morale and requires a special (bulky) machine and 25 batteries per unit of resulting dried meat plus a lot of time to make it. 2 raw meats = 2 dehydrated meats. |
kevingranade
merged commit eadf2c3
into
CleverRaven:master
Oct 15, 2013
1 check passed
This comment has been minimized.
This comment has been minimized.
|
OK. Searched comestibles.json and only came up with "dried meat" in the description for Beef Jerky. :-/ |
Rivet-the-Zombie commentedOct 13, 2013
Some of the new fruit had weights that were way off, and all the new junk foods aside from fries were magenta, both issues have been addressed. Also removes morale boost from dried meat and vegetables and fixes PDA's lack of ammo type tag. Makes (acid) rain protection a clothing flag instead of specific to one article of clothing. Makes storage bags smaller when not in use. Also fixes DE .44 magnum ammo count as pointed out on the forums.