Neerti 462eaa834b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/25/2015_bay_sync ...

Conflicts:
	.travis.yml
	code/modules/clothing/spacesuits/rig/modules/combat.dm
	code/modules/clothing/spacesuits/rig/modules/utility.dm
	code/modules/mob/living/silicon/ai/ai.dm
	icons/mob/rig_back.dmi
	polaris.dme

2015-06-25 18:50:18 -04:00

..

admin

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

alarm

…

assembly

…

awaymissions

…

client

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

2015-06-22 16:59:19 +02:00

clothing

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/25/2015_bay_sync

2015-06-25 18:50:18 -04:00

customitems

…

detectivework

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

economy

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

2015-06-20 20:40:06 +02:00

events

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

examine

Updates chameleon gun help text

2015-06-06 23:26:56 -04:00

ext_scripts

Merge pull request #9857 from GinjaNinja32/bot

2015-06-18 13:46:50 -04:00

flufftext

…

food

…

games

…

genetics

…

ghosttrap

Fixes tiny oversight in ghost trap datum. GG global vars.

2015-06-11 08:38:32 +09:30

holodeck

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

hydroponics

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

2015-06-16 10:52:33 +02:00

icon generation

…

library

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

lighting

…

liquid

…

maps

…

materials

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

2015-06-20 20:40:06 +02:00

mining

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/25/2015_bay_sync

2015-06-25 18:50:18 -04:00

mob

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/25/2015_bay_sync

2015-06-25 18:50:18 -04:00

nano

Fixes antags being able to see the appearance changer.

2015-06-21 21:12:28 +02:00

organs

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

2015-06-22 16:59:19 +02:00

overmap

…

paperwork

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

power

Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct

2015-06-21 01:18:25 +09:30

projectiles

Merge pull request #9880 from PsiOmegaDelta/150621-MeteorExAct

2015-06-21 13:16:23 +01:00

random_map

…

reagents

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

2015-06-22 16:59:19 +02:00

recycling

Fixes disposal bins filling instantly

2015-06-24 22:09:47 -04:00

research

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/25/2015_bay_sync

2015-06-25 18:50:18 -04:00

scripting

…

security levels

…

shieldgen

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

shuttles

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

spells

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

supermatter

Merge pull request #9694 from PsiOmegaDelta/150605-Meteors

2015-06-08 14:17:57 +03:00

surgery

…

tables

Makes standard tables plastic

2015-06-14 13:38:56 -04:00

vehicles

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

virus2

…

xgm

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

2015-06-25 17:58:37 +09:30