Segrain 121b10b16c Conflict fix.

2013-10-21 04:37:28 +03:00

..

admin

Conflict fix.

2013-10-21 04:37:28 +03:00

assembly

…

awaymissions

Recommitting PA sprites by Flash Kirby.

2013-09-01 21:10:39 +01:00

client

Fancy ghosts!

2013-10-06 16:10:47 +04:00

clothing

Conflict fix.

2013-10-21 04:37:28 +03:00

customitems

Merge branch 'master' into dev-freeze

2013-10-08 22:01:16 +01:00

destilery

…

detectivework

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

economy

Renamed file so defines go before they are used.

2013-09-30 21:06:42 +04:00

events

moves and renames economy files to /modules instead of /wip, cleanup and shuffles of a bunch of code, removes "linked_db" (requirement for financial machinery to be connected to an accounts database)

2013-09-20 13:35:49 +10:00

ext_scripts

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

flufftext

Several ZAS fixes.

2013-07-25 21:34:12 -07:00

food

Minor Food Fix: Made basic salad nonhallucinogenic, uses 2 cabbage 1 tomato 1 carrot 1 apple for recipe. Moved Valid Salad's Doctor's Delight to the Aesir Salad.

2013-09-30 02:02:49 -04:00

genetics

…

icon generation

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

library

More attempts at string limit string reduction.

2013-08-31 20:13:03 +01:00

liquid

…

maps

…

mining

Mining shuttle console now tells you if the shuttle is moving or not

2013-09-22 15:48:39 -04:00

mob

Conflict fix.

2013-10-21 04:37:28 +03:00

nano

Multiple minor updates to Nano.

2013-09-19 01:39:59 +01:00

organs

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev

2013-10-15 10:56:50 +04:00

paperwork

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev

2013-10-15 10:56:50 +04:00

power

Merge branch 'master' into dev-freeze

2013-10-08 22:01:16 +01:00

projectiles

Conflict fix.

2013-10-21 04:37:28 +03:00

reagents

Conflict fix.

2013-10-21 04:37:28 +03:00

recycling

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

research

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

scripting

…

security levels

Maint_all_access and req_one_access.

2013-08-04 16:29:41 +03:00

surgery

Typo fix.

2013-10-11 10:16:00 +03:00

virus2

Conflict fix.

2013-10-21 04:37:28 +03:00