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

Conflicts:
	code/modules/mob/mob.dm

2015-04-03 09:33:05 +02:00

..

admin

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

2015-04-03 09:33:05 +02:00

alarm

…

assembly

…

awaymissions

…

client

Merged with dev.

2015-03-31 11:17:13 +10:30

clothing

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

2015-04-03 09:33:05 +02:00

customitems

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

2015-03-31 01:37:55 -04:00

detectivework

…

economy

…

events

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

2015-04-03 09:33:05 +02:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

Fixes #8696

2015-03-31 20:30:06 -04:00

hydroponics

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

2015-04-03 09:33:05 +02:00

icon generation

…

library

…

liquid

…

maps

…

mining

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

2015-03-31 02:13:22 -04:00

mob

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

2015-04-03 09:33:05 +02:00

nano

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

2015-03-28 20:26:24 +01:00

organs

Added organs to the processing list when removed, oops.

2015-04-01 20:54:34 -07:00

overmap

…

paperwork

Merge with dev.

2015-03-30 08:36:52 +10:30

power

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

2015-03-31 02:13:22 -04:00

projectiles

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

2015-04-03 09:33:05 +02:00

random_map

…

reagents

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

2015-04-03 09:33:05 +02:00

recycling

…

research

Fixes #8696

2015-03-31 20:30:06 -04:00

scripting

…

security levels

Allows admins to more easily set security levels.

2015-03-31 14:32:28 +02:00

shieldgen

…

shuttles

…

spells

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

2015-03-31 00:16:56 -04:00

supermatter

…

surgery

Removing some debugs.

2015-04-01 18:06:46 -07:00

vehicles

…

virus2

Added macros for droplimb flags.

2015-03-31 11:42:45 +10:30