StarSmasher 711ad88903 Fixes #9294 ...

Adding 6 tomato juice to 50 protein doesn't really work if the maximum is 50.
Also fixed it in the vegetable pizzas.

Figured a quickfix would be better than a very delayed fix.

2015-05-25 22:26:55 +02:00

..

admin

Renamed kitchen utensils.

2015-05-16 21:24:36 +09:30

alarm

…

assembly

…

awaymissions

…

client

Adds engineering workboots

2015-05-23 23:00:26 -04:00

clothing

Merge pull request #9451 from PsiOmegaDelta/Tmp

2015-05-24 18:16:08 +03:00

customitems

Allowed accessories to function as custom items using icon_override

2015-05-16 01:37:04 +09:30

detectivework

…

economy

…

events

…

examine

Updated ashtrays and mineral doors.

2015-05-17 03:02:03 +09:30

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

New tables, code section. Changelog entry soon.

2015-05-13 19:08:39 +01:00

hydroponics

Merge with dev.

2015-05-20 13:39:31 +09:30

icon generation

…

library

Renamed knives.

2015-05-16 20:54:34 +09:30

lighting

fix an issue with destroying light sources that have 0 light_range

2015-05-14 10:58:52 +01:00

liquid

…

maps

…

materials

Bit of documentation.

2015-05-20 14:00:14 +09:30

mining

Rebalancing and adjusting divisors for all weapon damage values.

2015-05-17 16:51:55 +09:30

mob

Merge with master.

2015-05-23 21:29:40 +09:30

nano

Fixes #9447.

2015-05-24 11:33:54 +02:00

organs

Ghetto diagnostics!

2015-05-18 06:37:51 +03:00

overmap

…

paperwork

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

power

Merge with master.

2015-05-23 21:29:40 +09:30

projectiles

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-05-22 08:26:13 +02:00

random_map

…

reagents

Fixes #9294

2015-05-25 22:26:55 +02:00

recycling

Made sorting pipes dispesible

2015-05-16 17:27:39 +03:00

research

Merge with dev.

2015-05-20 13:39:31 +09:30

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

…

supermatter

…

surgery

Merge with dev.

2015-05-20 13:39:31 +09:30

tables

Merge with dev.

2015-05-20 13:39:31 +09:30

vehicles

Merge pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +02:00

virus2

…