PsiOmegaDelta 12fb0bdb10 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower ...

Conflicts:
	code/modules/nano/nanoui.dm

2015-12-06 12:10:33 +01:00

..

admin

Merge pull request #11502 from PsiOmegaDelta/151121-InWorldParams

2015-12-02 09:56:28 +10:30

alarm

Relables alarm (un)registration to (un)register_alarm.

2015-11-29 12:32:19 +01:00

assembly

Runtime fixes.

2015-12-02 08:37:09 +01:00

awaymissions

…

blob

…

client

Merge pull request #11590 from PsiOmegaDelta/151204-SaveMyCharacter

2015-12-05 18:59:19 +00:00

clothing

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

2015-12-06 11:48:20 +01:00

customitems

…

detectivework

…

economy

…

events

…

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

…

holodeck

…

hydroponics

Merge pull request #11516 from Baystation12/dev-freeze

2015-11-24 14:35:56 +01:00

icon generation

…

library

…

lighting

Re-adds missing lighting initializer.

2015-11-21 16:20:04 +01:00

liquid

…

maps

…

materials

…

mining

Tweaks to the previous commits.

2015-12-01 02:14:47 +10:30

mob

Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower

2015-12-06 12:10:33 +01:00

multiz

…

nano

Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower

2015-12-06 12:10:33 +01:00

organs

Removes a leftover world <<

2015-12-02 18:21:09 +10:30

overmap

…

paperwork

Removed uneceserry variable

2015-11-22 13:23:45 +02:00

power

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

2015-12-06 11:48:20 +01:00

projectiles

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

2015-12-06 11:48:20 +01:00

random_map

Merge pull request #11570 from Raptor1628/dev

2015-12-03 21:22:34 +01:00

reagents

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

2015-12-06 11:48:20 +01:00

recycling

…

research

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

2015-12-06 11:48:20 +01:00

scripting

…

security levels

…

shieldgen

…

shuttles

Merge pull request #11516 from Baystation12/dev-freeze

2015-11-24 14:35:56 +01:00

spells

…

supermatter

…

surgery

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

2015-12-06 11:48:20 +01:00

tables

…

vehicles

…

virus2

…

wireless

More wireless fixes

2015-12-06 16:50:48 +13:00

xgm

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

2015-12-06 11:34:36 +01:00