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

Conflicts:
	code/_onclick/click.dm
	code/game/objects/items/weapons/material/kitchen.dm
	code/modules/mob/living/silicon/ai/ai.dm

2015-12-20 11:55:53 +01:00

..

antagonist

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2

2015-12-05 12:47:03 -06:00

area

Compilation fixes due to issues caused by merging https://github.com/Baystation12/Baystation12/pull/11617.

2015-12-18 09:33:14 +01:00

dna

…

gamemodes

Merge branch '_base-turf' of https://github.com/mwerezak/Baystation12 into dev

2015-12-17 20:25:36 -05:00

jobs

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

2015-12-08 08:23:10 +01:00

machinery

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

2015-12-13 10:47:33 +01:00

magic

…

mecha

Merge branch '_base-turf' of https://github.com/mwerezak/Baystation12 into dev

2015-12-17 20:25:36 -05:00

objects

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

2015-12-20 11:55:53 +01:00

turfs

Merge branch '_base-turf' of https://github.com/mwerezak/Baystation12 into dev

2015-12-17 20:25:36 -05:00

vehicles

…

verbs

Compilation fixes.

2015-12-13 10:21:00 +01:00

atoms_movable.dm

Fixes #10751 Thrown items now use last_move direction isntead of neverchanging dir

2015-12-12 15:29:08 +03:00

atoms.dm

Forensics fixes/tweaks.

2015-12-10 19:34:28 +10:30

base_turf.dm

Updates all get_base_turf usages to get_base_turf_by_area.

2015-12-06 14:01:21 -05:00

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

…