Ccomp5950 e7fd4ae332 Supermatter will stop processing when it's in space. ...

Conflicts:
	code/modules/supermatter/supermatter.dm

2014-02-19 19:33:40 -05:00

..

admin

More DNA fixes.

2014-02-07 20:56:21 -05:00

assembly

Standardize CLUMSY

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

awaymissions

…

client

Revert "New fonts work first iteration"

2014-02-04 02:47:14 -05:00

clothing

Buff superior welding goggles.

2014-02-15 15:36:06 -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

More DNA fixes.

2014-02-07 20:56:21 -05: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

Diona roasts needs cooperation for acid

2014-02-01 19:22:40 -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

Improved creature AI and random mob spawning in caves.

2014-02-16 04:40:18 -05:00

mob

Code effeciency project: handle_embedded_objects

2014-02-19 19:26:04 -05:00

nano

Comm console is now NanoUI. Fixes github #489, hopefully.

2014-02-15 15:33:45 -05:00

organs

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

2014-02-06 03:23:43 -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

Code effeciency project: apc update_icons

2014-02-19 19:31:10 -05:00

projectiles

rerebalanced the SoC after running the odds

2014-02-16 05:47:17 -05:00

reagents

Jay Owen demands that this pull be merged.

2014-02-16 05:42:55 -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 will stop processing when it's in space.

2014-02-19 19:33:40 -05:00

surgery

Surgery tracking.

2014-02-05 22:54:51 -05:00

virus2

Check for internals and accessibility on toxic farts.

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