mwerezak add9ec3b65 Makes IB bleed with same rate as external bleeding ...

Also updates drip() to remove the amount of blood actually passed into
it as argument.

2014-08-16 21:45:21 -04:00

..

admin

Master to dev merge.

2014-08-11 17:23:40 +09:30

assembly

integrate XGM into the code

2014-07-22 19:52:12 +01:00

awaymissions

Updates eng rig path, adds obj sprites

2014-07-19 23:18:32 -04:00

client

Merged in preferences file changes, changed None to Unset for home system.

2014-08-11 10:38:01 +09:30

clothing

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

2014-08-14 08:58:59 +02:00

customitems

Master to dev merge.

2014-08-11 17:23:40 +09:30

destilery

…

detectivework

Master to dev merge.

2014-08-11 17:23:40 +09:30

economy

Merge resolution with PDA nanoui.

2014-07-25 22:57:53 +09:30

events

Removes the loophole ion-law. Adds in some other ion law changes.

2014-08-14 11:20:45 +02:00

ext_scripts

…

flufftext

integrate XGM into the code

2014-07-22 19:52:12 +01:00

food

…

games

…

genetics

…

hydroponics

Fixed #5912

2014-08-10 16:29:09 -04:00

icon generation

…

library

Made arcane tomes a subtype of books, fixes #5838

2014-08-10 02:23:36 -07:00

liquid

…

maps

…

mining

Fixed the overlay issue for now. This will need replacing.

2014-08-13 12:04:51 +09:30

mob

Merge pull request #5978 from Zuhayr/journalism

2014-08-14 10:54:49 +04:00

nano

NanoUI updates.

2014-07-21 22:32:45 +01:00

organs

Makes IB bleed with same rate as external bleeding

2014-08-16 21:45:21 -04:00

paperwork

Master to dev merge.

2014-08-11 17:23:40 +09:30

power

Master to dev merge.

2014-08-11 17:23:40 +09:30

projectiles

Renames "laser gun" to "laser carbine"

2014-08-14 22:59:18 -04:00

reagents

Master to dev merge.

2014-08-11 17:23:40 +09:30

recycling

Updates disposal bin pressurization

2014-08-07 19:31:17 -04:00

research

Removes telecomm and RD server temperature cap

2014-07-28 20:24:17 -04:00

scripting

…

security levels

Fixes icons and other things not updating when the master controller updates power status.

2014-08-10 03:45:20 -04:00

shieldgen

Reorganizes shieldgen source code and icon files

2014-08-10 11:58:25 -04:00

shuttles

Master to dev merge.

2014-08-11 17:23:40 +09:30

supermatter

Master to dev merge.

2014-08-11 17:23:40 +09:30

surgery

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

2014-07-16 19:32:00 +09:30

vehicles

Fixes runtime in train/explode()

2014-08-10 18:37:39 -04:00

virus2

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

2014-07-16 19:30:41 +09:30