mwerezak 9b2f5cea33 Merge remote-tracking branch 'upstream/dev' into inventoryfix ...

Conflicts:
	code/game/gamemodes/revolution/rp-revolution.dm
	code/game/machinery/kitchen/juicer.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/structures/stool_bed_chair_nest/stools.dm
	code/modules/destilery/main.dm
	code/modules/hydroponics/biogenerator.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/carbon/monkey/inventory.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm

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

..

admin

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

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

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-freeze' into dev

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

customitems

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

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

destilery

Replaces uses of u_equip() with remove_from_mob() or drop_from_inventory(), where appropriate.

2015-03-30 22:05:00 -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

Fixes #8439.

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

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 01:37:55 -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 01:37:55 -04:00

mob

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

2015-03-31 01:37:55 -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

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

2015-03-13 09:31:03 +01:00

paperwork

merge fix

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

power

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

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

projectiles

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

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

random_map

…

reagents

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

2015-03-31 01:37:55 -04: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-31 00:16:56 -04:00

supermatter

…

surgery

Mob refactoring.

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

vehicles

…

virus2

…