PsiOmega 9d90691605 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/gamemodes/wizard/spellbook.dm

2015-06-14 10:35:29 +02:00

..

admin

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

2015-06-14 10:35:29 +02:00

alarm

…

assembly

…

awaymissions

…

client

Fixes #9623

2015-06-02 13:13:44 +03:00

clothing

Merge pull request #9743 from Techhead0/voidsuitTweaks

2015-06-09 02:51:24 +01:00

customitems

…

detectivework

…

economy

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

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

events

Merge pull request #9626 from GinjaNinja32/vine_event_fix

2015-06-03 04:00:21 +09:30

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

…

hydroponics

Merge pull request #9723 from atlantiscze/plant-fix

2015-06-13 01:38:47 +09:30

icon generation

…

library

…

lighting

…

liquid

…

maps

…

materials

Fixes #9777

2015-06-10 23:14:34 +09:30

mining

…

mob

Fixes #9503

2015-06-10 23:14:33 +09:30

nano

AI restrictions and rejuvenation.

2015-06-08 09:10:33 +02:00

organs

Merge pull request #9704 from atlantiscze/clean-up-your-trash

2015-06-10 23:07:38 +09:30

overmap

…

paperwork

More consistent logging via admin_inject_log proc

2015-05-29 16:57:42 +01:00

power

Merge pull request #9704 from atlantiscze/clean-up-your-trash

2015-06-10 23:07:38 +09:30

projectiles

Merge pull request #9711 from mwerezak/syringelog

2015-06-07 09:00:21 +02:00

random_map

…

reagents

Merge pull request #9745 from Kelenius/ofReagentsAndOD

2015-06-08 20:43:55 +09:30

recycling

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

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

research

Merge pull request #9553 from GinjaNinja32/reagent_protection

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

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

…

supermatter

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

2015-06-07 10:30:27 +02:00

surgery

Merge with dev.

2015-05-20 13:39:31 +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

…