PsiOmega affff253bc Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	.travis.yml
	code/modules/mob/living/living.dm
	code/modules/mob/mob_grab.dm

2015-09-02 14:58:13 +02:00

..

admin

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

2015-08-28 11:18:57 +02:00

alarm

…

assembly

…

awaymissions

Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess

2015-08-24 17:45:10 +09:30

client

…

clothing

Adds if(check_slot) check.

2015-08-25 16:39:54 -04:00

customitems

…

detectivework

…

economy

…

events

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

2015-08-28 11:27:20 +02:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

…

holodeck

…

hydroponics

[Botany] Gas-related traits revealed on the plant analyzer

2015-08-30 11:58:39 -04:00

icon generation

…

library

…

lighting

…

liquid

…

maps

…

materials

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

2015-09-01 03:22:08 +02:00

mining

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

2015-09-01 03:22:08 +02:00

mob

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

2015-09-02 14:58:13 +02:00

nano

Limbs now copy hair data from their owner and may have optional body hair icons blended into them.

2015-08-31 16:34:13 +09:30

organs

Limbs now copy hair data from their owner and may have optional body hair icons blended into them.

2015-08-31 16:34:13 +09:30

overmap

…

paperwork

Adds Supply Fax

2015-08-31 15:32:35 -04:00

power

fixes emitter runtime by using new calling syntax

2015-08-31 16:41:43 +10:00

projectiles

Merge pull request #9891 from Zuhayr/dev

2015-08-21 14:23:57 -04:00

random_map

Amending some loc setting lines.

2015-08-25 12:40:09 +09:30

reagents

Merge pull request #10808 from Hubblenaut/dev

2015-09-01 12:56:54 +03:00

recycling

…

research

Fixes a few issues with the mechfab, fixes #10852

2015-08-25 12:28:20 +03:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

…

supermatter

…

surgery

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

2015-08-22 03:11:53 +09:30

tables

improve defines in table code

2015-08-28 00:12:18 +01:00

vehicles

…

virus2

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

2015-08-30 10:23:14 +02:00

xgm

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

2015-08-25 08:12:39 +02:00