GinjaNinja32 9ecde8f2a7 Merge pull request #9633 from comma/dev-freeze ...

Couple fixes

2015-06-02 14:37:07 +01:00

..

admin

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

2015-06-02 13:13:40 +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

…

events

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

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

examine

Updated ashtrays and mineral doors.

2015-05-17 03:02:03 +09:30

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

…

hydroponics

Cleanup

2015-05-30 05:35:00 +09:30

icon generation

…

library

Renamed knives.

2015-05-16 20:54:34 +09:30

lighting

…

liquid

…

maps

…

materials

Merge pull request #9573 from Zuhayr/chairs

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

mining

Rebalancing and adjusting divisors for all weapon damage values.

2015-05-17 16:51:55 +09:30

mob

Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks

2015-05-31 23:55:08 +03:00

nano

Merge pull request #9554 from GinjaNinja32/nano_template

2015-05-30 02:16:32 +09:30

organs

Merge pull request #9582 from mwerezak/robolimbs

2015-05-31 17:14:25 +09:30

overmap

…

paperwork

More consistent logging via admin_inject_log proc

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

power

Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks

2015-05-31 23:55:08 +03: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

Made sorting pipes dispesible

2015-05-16 17:27:39 +03:00

research

Merge pull request #9553 from GinjaNinja32/reagent_protection

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

scripting

…

security levels

…

shieldgen

Implements github suggestions

2015-05-23 22:22:38 +02:00

shuttles

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

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

spells

…

supermatter

…

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

…