RKF45 c69ddf76ec Reintroducing the dough-based cooking system. ...

Conflicts:
	code/modules/food/recipes_microwave.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	icons/obj/food.dmi

2014-02-01 19:22:22 -05:00

..

admin

Merge branch 'master' of https://github.com/ZomgPonies/Paradise

2014-01-31 02:51:21 -05:00

assembly

Standardize CLUMSY

2014-01-21 22:49:22 -05:00

awaymissions

Clown Planet corpses start skeletonized, exploit fixes

2014-01-01 21:38:19 -05:00

client

Fixes for new species

2014-01-28 16:33:02 -05:00

clothing

Cleaned collar rendering code

2014-02-01 19:05:12 -05:00

customitems

Updated sprite to actually fit our server

2014-01-24 22:18:07 +01:00

destilery

Reintroducing the dough-based cooking system.

2014-02-01 19:22:22 -05:00

detectivework

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 07:14:16 -05:00

DetectiveWork

…

economy

…

events

Merge pull request #141 from alex-gh/vending_event_rebalanced

2014-01-31 19:26:39 -08:00

ext_scripts

Let's try it like this

2014-01-27 16:07:48 -05:00

flufftext

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 07:14:16 -05:00

food

Reintroducing the dough-based cooking system.

2014-02-01 19:22:22 -05:00

genetics

…

hydroponics

Generic attack sounds for all melee weapons

2014-01-22 10:15:43 -05:00

icon generation

…

library

Added a garbage collector implementation based on rumors from Goon and proc references in released gooncode.

2014-01-29 23:45:21 -05:00

liquid

…

maps

…

mining

Added a garbage collector implementation based on rumors from Goon and proc references in released gooncode.

2014-01-29 23:45:21 -05:00

mob

Tail rendering fix

2014-02-01 19:05:28 -05:00

nano

Missed a spot

2014-01-20 04:11:31 -05:00

organs

Fixed decapitated being still alive

2014-02-01 05:01:15 -05:00

paperwork

Added a garbage collector implementation based on rumors from Goon and proc references in released gooncode.

2014-01-29 23:45:21 -05:00

power

Missed a qdel in narsie.

2014-01-31 02:35:10 -05:00

projectiles

Walking mushrooms will now hunt and eat eachother, growing stronger when they do! The stronger they get, the better the quality of the mushroom slices you can butcher out of them! Don't smack em yourself though, or you'll bruise them, and they won't get stronger from being eaten.

2014-02-01 05:27:59 -05:00

reagents

Reintroducing the dough-based cooking system.

2014-02-01 19:22:22 -05:00

recycling

Standardize FAT

2014-01-21 22:57:10 -05:00

research

Added a garbage collector implementation based on rumors from Goon and proc references in released gooncode.

2014-01-29 23:45:21 -05:00

scripting

…

security levels

Gamme to shuttle, part two

2014-01-16 06:57:17 -05:00

store

…

supermatter

Supermatter update.

2014-01-17 09:06:00 -05:00

surgery

IPC brain surgery code.

2014-01-29 16:55:30 -05:00

virus2

Check for internals and accessibility on toxic farts.

2014-01-28 23:38:31 -05:00