mwerezak 398459c2e7 Merge remote-tracking branch 'upstream/dev' into inventoryfix ...

Conflicts:
	code/modules/organs/organ_external.dm

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

..

admin

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

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

alarm

…

assembly

…

awaymissions

…

client

Merged with dev.

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

clothing

Merge pull request #8604 from Zuhayr/limbs

2015-03-31 08:38:54 +03:00

customitems

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

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

detectivework

sanitize() refactor: second pass(other sanitize functions)

2015-03-23 01:38:09 +03:00

economy

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00

events

Merge pull request #8380 from volas/sanitize_procs

2015-03-29 00:57:33 +10:30

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

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

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

hydroponics

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

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

icon generation

…

library

sanitize() refactor: second pass(other sanitize functions)

2015-03-23 01:38:09 +03:00

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' into inventoryfix

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

nano

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

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

organs

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

2015-03-31 01:37:55 -04: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' into inventoryfix

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

random_map

…

reagents

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

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

recycling

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03:00

research

Merged with dev.

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

scripting

…

security levels

…

shieldgen

…

shuttles

First pass on making heist a pirate mode (human based)

2015-03-21 11:13:05 +10:30

spells

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

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

supermatter

…

surgery

Added macros for droplimb flags.

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

vehicles

…

virus2

Added macros for droplimb flags.

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