PsiOmega a9034bca66 Merge remote-tracking branch 'upstream/dev' into CultVisualNetwork ...

Conflicts:
	code/modules/mob/living/simple_animal/shade.dm
	code/setup.dm

2015-03-30 22:55:24 +02:00

..

admin

Merge pull request #8380 from volas/sanitize_procs

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

alarm

…

assembly

…

awaymissions

…

client

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

2015-03-29 13:04:53 +02:00

clothing

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

2015-03-30 20:17:05 +02:00

customitems

Adds Andrewmeythaler's custom item.

2015-03-17 22:19:13 -05: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

Fixes #8439.

2015-03-13 23:27:35 +01:00

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

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

2015-03-30 20:17:05 +02:00

hydroponics

Mob refactoring.

2015-03-29 10:44:31 +02:00

icon generation

…

library

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

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

liquid

…

maps

…

mining

Updates drill and scanner

2015-03-24 18:34:26 +03:00

mob

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

2015-03-30 22:55:24 +02:00

nano

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

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

organs

Mob refactoring.

2015-03-29 10:44:31 +02:00

overmap

…

paperwork

merge fix

2015-03-25 01:13:23 +03:00

power

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

2015-03-29 13:04:53 +02:00

projectiles

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

2015-03-30 20:17:05 +02:00

random_map

…

reagents

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

2015-03-30 20:17:05 +02:00

recycling

sanitize() refactor: first pass (sanitize)

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

research

Merge pull request #8560 from PsiOmegaDelta/PCAILaws

2015-03-30 21:23:34 +03:00

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-29 16:23:06 +02:00

supermatter

…

surgery

Mob refactoring.

2015-03-29 10:44:31 +02:00

vehicles

…

virus2

…