Chinsky 8d81675509 Merge pull request #5420 from mwerezak/emergency-shuttle ...

Fixes #5418 - also a bunch of small shuttle fixes

2014-07-01 02:10:23 +04:00

..

admin

Merge pull request #5420 from mwerezak/emergency-shuttle

2014-07-01 02:10:23 +04: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

Somehow when I added spawnpoints I put them in the wrong place. Moved the file.

2014-07-01 01:04:19 +09:30

clothing

Merge pull request #5397 from Zuhayr/dev

2014-06-30 00:04:25 +09:30

customitems

Fixes the jackboots

2014-06-28 14:11:58 +03: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

Having an infection raises your body temperature

2014-06-21 16:55:07 -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

Update distribution.dm

2014-06-25 16:48:20 +09:30

mob

Merge pull request #5420 from mwerezak/emergency-shuttle

2014-07-01 02:10:23 +04:00

nano

…

organs

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

2014-06-24 04:22:28 +04:00

paperwork

Merge pull request #5359 from Baystation12/master

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

power

Merge pull request #5331 from UristMcKerman/pipeturbine

2014-06-24 13:08:11 +04:00

projectiles

Fixed some icon issues with vox/adjusted paths, fixed icon issue with armalis cannon.

2014-06-29 10:00:35 +09:30

reagents

Cleaned up some reagent stuff, made Skrell alcoholics a legit issue, fixed IPC getting phoron contamination from clothing.

2014-07-01 01:03:50 +09:30

recycling

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

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

research

Fixes #5410 and possibly #5399

2014-07-01 01:04:29 +09:30

scripting

…

security levels

Mutiny Mode

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

shuttles

Resets emergency shuttle authorization on arrival

2014-06-30 15:14:44 -04:00

supermatter

Nextgen lights #1: supermatter

2014-06-18 19:52:19 +04:00

surgery

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

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

vehicles

Cargo train update

2014-06-23 19:53:58 +12:00

virus2

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

2014-06-22 21:58:30 +09:30