Zuhayr 3c10cc5852 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into customitems

2015-05-13 17:00:10 +09:30

..

admin

Added exosuit customisation kits to cargo.

2015-05-13 11:20:54 +09:30

alarm

more lightweight camera caching

2015-05-10 17:06:30 +01:00

assembly

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

awaymissions

…

client

Dev merge.

2015-05-12 23:33:29 +09:30

clothing

Added exosuit customisation kits to cargo.

2015-05-13 11:20:54 +09:30

customitems

Very minor oversight.

2015-05-12 23:56:51 +09:30

detectivework

…

economy

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

2015-05-09 11:13:05 +02:00

events

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

2015-05-12 13:40:47 +02:00

examine

The examine tab now lists the available pen commands.

2015-05-05 09:03:43 +02:00

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

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

2015-05-12 13:40:47 +02:00

hydroponics

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

2015-05-12 13:40:47 +02:00

icon generation

…

library

…

lighting

new object-based lighting system

2015-05-10 20:54:25 +01:00

liquid

…

maps

…

materials

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

mining

qdel

2015-05-12 13:12:58 +09:30

mob

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into customitems

2015-05-13 17:00:10 +09:30

nano

Merge pull request #9134 from PsiOmegaDelta/UngrabRuntime

2015-05-10 23:20:56 +09:30

organs

…

overmap

…

paperwork

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

power

Merge pull request #9073 from PsiOmegaDelta/QDels

2015-05-12 18:26:57 +03:00

projectiles

Dev merge.

2015-05-12 23:33:29 +09:30

random_map

…

reagents

Dev merge.

2015-05-12 23:33:29 +09:30

recycling

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

research

Dev merge.

2015-05-12 23:33:29 +09:30

scripting

…

security levels

…

shieldgen

new object-based lighting system

2015-05-10 20:54:25 +01:00

shuttles

…

spells

new object-based lighting system

2015-05-10 20:54:25 +01:00

supermatter

new object-based lighting system

2015-05-10 20:54:25 +01:00

surgery

…

vehicles

new object-based lighting system

2015-05-10 20:54:25 +01:00

virus2

…