Ccomp5950 67bf27e6f4 Merge pull request #5602 from Hubblenaut/food ...

Grid Placement for Food

2014-07-15 01:22:47 -05:00

..

admin

Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs.

2014-07-09 19:12:32 +09:30

assembly

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

awaymissions

…

client

Fix Change UI verb

2014-07-05 21:28:11 +01:00

clothing

Fixes webbing and holsters shielding EMP

2014-07-12 02:56:32 -04:00

customitems

Fixes Sasha Mason-Kalinka's custom item

2014-07-02 10:16:15 +02:00

destilery

…

detectivework

Fixes some printouts causing a runtime error when photocopied

2014-06-07 18:27:22 +02:00

economy

Merged master to dev, manually fixed merge issues in map, may be some left.

2014-06-11 18:11:41 +09:30

events

Fixes human internal organs list

2014-07-12 16:15:37 -04:00

ext_scripts

…

flufftext

…

food

First pass on ore distribution map and stationary drilling rig.

2014-06-07 23:07:49 +09:30

games

Fixed a couple of oversights with cards.

2014-06-29 09:43:34 +09:30

genetics

…

hydroponics

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

icon generation

…

library

…

liquid

…

maps

…

mining

Reapplied scanners to map, stopped braces working on drill turfs with no resources.

2014-07-10 20:13:59 +09:30

mob

Merge pull request #5603 from DJSnapshot/hotfix

2014-07-14 07:12:37 +04:00

nano

…

organs

Fixes germ levels going below zero

2014-07-12 16:18:29 -04:00

paperwork

Merge pull request #5359 from Baystation12/master

2014-06-25 15:37:04 +04:00

power

fixes #5449

2014-07-10 18:21:00 +02:00

projectiles

Readjusted agony of weakbullet.

2014-07-12 12:06:43 -05:00

reagents

Merge pull request #5602 from Hubblenaut/food

2014-07-15 01:22:47 -05:00

recycling

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

2014-06-20 22:02:40 +01:00

research

Fixes #5487

2014-07-04 00:28:06 +02:00

scripting

…

security levels

…

shuttles

Merge pull request #5507 from mwerezak/supply-shuttle-fix

2014-07-05 23:16:42 +01:00

supermatter

Removes duplicate defines, updates comments

2014-07-07 23:18:12 -04:00

surgery

Merge pull request #5613 from comma/master

2014-07-14 15:49:19 +09:30

vehicles

Fixes in wheelchair and different handling of movement

2014-07-02 22:42:18 +02:00

virus2

Fixes human internal organs list

2014-07-12 16:15:37 -04:00