Zuhayr 0e4c2430d1 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev

2015-08-18 11:59:50 -07:00

..

admin

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

2015-08-18 11:59:50 -07:00

alarm

…

assembly

…

awaymissions

…

client

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

2015-08-18 11:59:50 -07:00

clothing

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

2015-08-18 11:59:50 -07:00

customitems

Small tweaks to get rolldowns to work properly.

2015-08-09 17:01:07 +09:30

detectivework

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

2015-08-15 11:06:03 +02:00

economy

Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney

2015-08-13 08:06:11 +02:00

events

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

2015-08-11 18:47:05 +01:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

Fix gender issues, some typos from various files

2015-08-11 13:41:40 +03:00

ghosttrap

…

holodeck

Merge pull request #10040 from PsiOmegaDelta/150707-MoreOverlaysFewerStates

2015-08-16 00:40:47 +01:00

hydroponics

Merge branch 'dev' into ofBeesAndHoney

2015-08-13 08:33:46 +03:00

icon generation

…

library

Merge pull request #10279 from Kearel/LibraryModifications

2015-08-13 17:47:16 +03:00

lighting

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

2015-08-18 11:59:50 -07:00

liquid

…

maps

…

materials

Merge branch 'dev' into ofBeesAndHoney

2015-08-14 16:55:21 +03:00

mining

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

2015-08-08 15:34:51 +02:00

mob

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

2015-08-17 09:44:21 +02:00

nano

Merge branch 'dev' into ofSleepersAndNano

2015-08-13 09:20:51 +03:00

organs

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

2015-08-13 09:01:10 +02:00

overmap

…

paperwork

Merge pull request #10279 from Kearel/LibraryModifications

2015-08-13 17:47:16 +03:00

power

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

2015-08-12 21:18:18 +02:00

projectiles

Merge pull request #10200 from mwerezak/gun-desc

2015-08-14 03:55:43 +03:00

random_map

…

reagents

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2015-08-16 05:40:47 -07:00

recycling

Merge branch 'dev' into ofSleepersAndNano

2015-08-13 09:20:51 +03:00

research

[minor] Fix research design item path definition, usage of TECH_* macros

2015-08-17 00:25:37 +06:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

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

2015-08-14 08:34:42 +02:00

supermatter

…

surgery

…

tables

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

2015-08-13 05:55:05 +01:00

vehicles

…

virus2

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

2015-08-18 11:59:50 -07:00

xgm

…