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

Conflicts:
	code/game/gamemodes/cult/talisman.dm
	maps/exodus-1.dmm

2014-12-09 09:42:14 +01:00

..

admin

Merge pull request #7268 from GinjaNinja32/playerpanel_lang

2014-12-08 06:45:38 +01:00

assembly

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

awaymissions

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

client

Adds image for cult talismans

2014-12-08 20:45:15 -05:00

clothing

Merge pull request #7326 from Raptor1628/dev-freeze

2014-12-08 20:43:56 -05:00

customitems

Merge pull request #7089 from sabiram/dev

2014-11-23 18:08:16 +01:00

destilery

…

detectivework

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

2014-11-21 10:27:56 +01:00

economy

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

2014-11-26 22:10:09 +01:00

events

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

ext_scripts

…

flufftext

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

food

…

games

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

genetics

…

hydroponics

Merge resolution.

2014-12-08 13:01:04 +10:30

icon generation

…

library

…

liquid

…

maps

Fixes Map Loader issues.

2014-11-28 08:37:23 +01:00

mining

Merge pull request #7205 from Mloc/bs12-setdir

2014-12-02 14:38:31 +01:00

mob

Merge pull request #7271 from Segrain/dev-freeze

2014-12-08 20:40:02 -05:00

nano

Fixes #7199

2014-12-07 22:13:31 +10:30

organs

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

paperwork

Duct Tape

2014-12-02 23:17:45 +13:00

power

Merge pull request #7205 from Mloc/bs12-setdir

2014-12-02 14:38:31 +01:00

projectiles

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

2014-12-09 09:07:38 +01:00

reagents

Cargo can now order empty blood packs.

2014-11-30 16:45:52 +01:00

recycling

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

research

Merge resolution.

2014-12-08 13:01:04 +10:30

scripting

…

security levels

Readded monkey dexterity checks in each attack_hand as appropriate.

2014-11-13 17:46:37 +10:30

shieldgen

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

shuttles

Merge resolution.

2014-12-08 13:01:04 +10:30

supermatter

Supermatter warning now has its own proc. Fixed some SM bugs.

2014-11-30 00:23:55 +01:00

surgery

Fixes #7238

2014-12-07 11:52:29 +10:30

vehicles

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

virus2

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30