Chinsky 02227d9da7 Merge pull request #5700 from Whitellama/master ...

Bug fixes: #5697, #5690, #5687, #5685

2014-07-20 17:42:23 +04:00

..

admin

modularize ban system

2014-07-18 21:08:01 +00:00

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

Changes labcoat sprite to be closed on custom item...

2014-07-14 21:11:46 -04: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 lingering reference to organ_failure

2014-07-18 12:02:39 -04:00

ext_scripts

Bot down? Let's not lock up the entire server.

2014-05-29 21:36:34 -05:00

flufftext

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

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

Targeting eyes with book/paper shows book/paper

2014-05-03 19:56:55 +03:00

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

borer detatch fixes

2014-07-20 04:42:14 +02:00

nano

…

organs

Merge pull request #5656 from mwerezak/wound-infections

2014-07-17 15:39:16 +04:00

paperwork

Merge pull request #5359 from Baystation12/master

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

power

Bugfix - cable coil now shows correct transferred amount.

2014-07-16 22:59:14 +02:00

projectiles

Readjusted agony of weakbullet.

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

reagents

Fixed #5697, grammatical error with empty glasses, cans, condiment containers

2014-07-19 16:22:09 -07:00

recycling

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

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

research

another missing battery check

2014-07-16 15:20:23 +02:00

scripting

*NIX Log files part 2.

2014-03-26 18:51:37 -05:00

security levels

Mutiny Mode

2014-05-11 15:03:50 -05:00

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