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

2015-06-05 10:23:23 +02:00

..

admin

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

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

alarm

…

assembly

…

awaymissions

…

client

Fixes #9623

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

clothing

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

2015-05-30 15:59:54 +02: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 #9626 from GinjaNinja32/vine_event_fix

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

icon generation

…

library

…

lighting

…

liquid

…

maps

…

materials

Merge pull request #9573 from Zuhayr/chairs

2015-05-31 11:33:24 +03:00

mining

…

mob

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

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

nano

Allows all synths to view the alternative law sets.

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

organs

Fixes #9648

2015-06-02 21:40:30 -04:00

overmap

…

paperwork

More consistent logging via admin_inject_log proc

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

power

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

2015-06-05 10:23:23 +02:00

projectiles

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

2015-05-22 08:26:13 +02:00

random_map

…

reagents

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

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

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

…

surgery

…

tables

Fixes IV stands blocking bullets

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

vehicles

…

virus2

…