Mloc-Argent 64d2a69a32 Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm

2014-07-06 17:50:53 +01: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

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

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 #5483

2014-07-04 17:48:12 +09:30

ext_scripts

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

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

flufftext

…

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

…

liquid

…

maps

…

mining

Fixes #5472

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

mob

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

2014-07-06 17:50:53 +01:00

nano

This change to nanomanager optimizes the sending of nanoui assets to clients.

2014-07-03 22:55:54 +01:00

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

Stops buckled mobs from slipping (for now)

2014-07-02 22:36:49 +02:00

recycling

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

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

research

Fixes #5487

2014-07-04 00:28:06 +02:00

scripting

…

security levels

…

shuttles

Merge pull request #5507 from mwerezak/supply-shuttle-fix

2014-07-05 23:16:42 +01: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

Fixes in wheelchair and different handling of movement

2014-07-02 22:42:18 +02:00

virus2

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

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