PsiOmegaDelta 3d9aa48f49 Merge pull request #9442 from GinjaNinja32/shuttle ...

Supply shuttle and crate fixes

2015-05-24 14:43:15 +02:00

..

admin

Renamed kitchen utensils.

2015-05-16 21:24:36 +09:30

alarm

…

assembly

…

awaymissions

…

client

Final tweaks to recipe availability and material inheritance.

2015-05-17 18:22:21 +09:30

clothing

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

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

customitems

Allowed accessories to function as custom items using icon_override

2015-05-16 01:37:04 +09:30

detectivework

…

economy

…

events

…

examine

Updated ashtrays and mineral doors.

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

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

…

hydroponics

Merge with dev.

2015-05-20 13:39:31 +09:30

icon generation

…

library

Renamed knives.

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

lighting

…

liquid

…

maps

…

materials

Bit of documentation.

2015-05-20 14:00:14 +09:30

mining

Rebalancing and adjusting divisors for all weapon damage values.

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

mob

Merge with master.

2015-05-23 21:29:40 +09:30

nano

…

organs

Ghetto diagnostics!

2015-05-18 06:37:51 +03:00

overmap

…

paperwork

…

power

Merge with master.

2015-05-23 21:29:40 +09:30

projectiles

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

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

random_map

…

reagents

Supply shuttle and crate fixes

2015-05-23 16:15:04 +01:00

recycling

Made sorting pipes dispesible

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

research

Merge with dev.

2015-05-20 13:39:31 +09:30

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

…

supermatter

…

surgery

Merge with dev.

2015-05-20 13:39:31 +09:30

tables

Merge with dev.

2015-05-20 13:39:31 +09:30

vehicles

Merge pull request #9390 from mwerezak/attack-animation

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

virus2

…