Chinsky a3cff314bd Merge pull request #5466 from Hubblenaut/master ...

Fixes Sasha Mason-Kalinka's custom item

2014-07-03 05:10:49 +04:00

..

admin

Merge pull request #5420 from mwerezak/emergency-shuttle

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

assembly

…

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

Fixed some vox icons.

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

customitems

Fixes Sasha Mason-Kalinka's custom item

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

destilery

…

detectivework

…

economy

…

events

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

2014-06-30 23:44:46 +01:00

ext_scripts

…

flufftext

…

food

…

games

Fixed a couple of oversights with cards.

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

genetics

…

hydroponics

…

icon generation

…

library

…

liquid

…

maps

…

mining

Update distribution.dm

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

mob

Merge with master.

2014-07-02 06:59:11 +09:30

nano

…

organs

Fixed embedding.

2014-07-01 10:12:58 +09:30

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

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

2014-06-30 23:44:46 +01:00

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

…

shuttles

Fixes bad emergency shuttle can_force() check

2014-07-01 22:40:15 -04:00

supermatter

…

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