Hubblenaut 534befe753 Merge remote-tracking branch 'upstream/dev-freeze' into dev-freeze ...

Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/human/unarmed_attack.dm

2014-12-28 00:04:53 +01:00

..

__HELPERS

Fixes and tweaks to the previous.

2014-12-23 22:03:02 +10:30

_onclick

Why in the dicks is slime code so HORRIBLE. Removes a very redundant piece of code in obj/item/attack() dealing with slimes.

2014-12-24 04:19:56 +10:30

ATMOSPHERICS

Replaces awful connect type system with bitflags

2014-12-23 18:59:54 -05:00

controllers

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

datums

Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)

2014-12-23 17:38:05 +10:30

defines

Table/rack refactor. Fixes #7509

2014-12-24 12:14:48 +10:30

FEA

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

game

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

js

…

modules

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

2014-12-28 00:04:53 +01:00

TriDimension

Replaces awful connect type system with bitflags

2014-12-23 18:59:54 -05:00

unused

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

WorkInProgress

Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)

2014-12-23 17:38:05 +10:30

ZAS

add sleeping for ZAS connection edges

2014-12-21 20:35:40 +00:00

global.dm

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

hub.dm

…

names.dm

…

setup.dm

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

stylesheet.dm

Merge resolution.

2014-12-22 23:28:27 +10:30

world.dm

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30