Zuhayr b690f927ba Fixes #5472

2014-07-03 05:20:29 +09:30

..

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 the jackboots

2014-06-28 14:11:58 +03:00

destilery

…

detectivework

…

economy

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

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

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

Merge branch 'master' into dev

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

icon generation

…

library

…

liquid

…

maps

…

mining

Fixes #5472

2014-07-03 05:20:29 +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

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