PsiOmegaDelta c3f0a46c19 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/weapons/storage/briefcase.dm
	html/changelogs/.all_changelog.yml

2015-06-05 10:39:41 +02:00

..

admin

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

2015-06-04 08:20:00 +02:00

alarm

…

assembly

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

awaymissions

…

client

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

2015-06-04 08:20:00 +02:00

clothing

Ported action button system from Paradise/tg

2015-06-02 17:17:13 +09:30

customitems

…

detectivework

…

economy

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

2015-06-04 08:10:49 +02:00

events

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

2015-06-04 08:20:00 +02:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

Adds ghost click to posibrains.

2015-05-25 16:49:22 +09:30

holodeck

…

hydroponics

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

2015-06-04 08:20:00 +02:00

icon generation

…

library

…

lighting

…

liquid

…

maps

…

materials

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

2015-06-01 09:07:03 +02:00

mining

Refactored random map generator system and added several terrain generators.

2015-06-03 04:36:19 +09:30

mob

Merge pull request #9662 from PsiOmegaDelta/150604-SpiderGlow

2015-06-05 10:37:58 +03:00

nano

Allows all synths to view the alternative law sets.

2015-06-02 14:48:08 +02:00

organs

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

2015-06-04 08:20:00 +02:00

overmap

…

paperwork

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

2015-05-30 16:11:57 +02:00

power

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

2015-06-05 10:39:41 +02:00

projectiles

Makes special wizard projectile staffs only usable by wizards.

2015-06-04 19:42:06 +01:00

random_map

Refactored random map generator system and added several terrain generators.

2015-06-03 04:36:19 +09:30

reagents

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

2015-06-02 13:35:02 +02:00

recycling

Now when welding sorting pipe, game update it's name

2015-06-04 20:48:57 +03:00

research

NPC mobs and blobs now attack all external human limbs.

2015-06-04 09:20:02 +02:00

scripting

…

security levels

…

shieldgen

fix #9666

2015-06-04 18:46:27 +03:00

shuttles

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

2015-05-30 15:59:54 +02:00

spells

Changes teleportation scroll and spellbook to be only usable by wizards

2015-06-04 20:21:31 +01:00

supermatter

Merge pull request #9408 from mwerezak/sm-eject

2015-05-28 11:35:39 +09:30

surgery

Additional IPC tweaks.

2015-05-31 02:30:57 +09:30

tables

Fixes IV stands blocking bullets

2015-05-26 23:05:38 -04:00

vehicles

Merge pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +02:00

virus2

Attempting to guarantee immunity to viruses for virus_immune var.

2015-05-25 15:52:51 +09:30

xgm

reorganize xgm into its own module

2015-06-02 16:29:23 +01:00