PsiOmega 8e55ad8114 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/mob.dm

2015-04-03 09:33:05 +02:00

..

__HELPERS

Merge pull request #8380 from volas/sanitize_procs

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

_onclick

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

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

ATMOSPHERICS

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

2015-04-03 09:33:05 +02:00

controllers

sanitize() refactor: third pass (misc)

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

datums

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

2015-04-03 09:33:05 +02:00

defines

Cleans up announcement sound handling. Plays communication blackout sound at half volume.

2015-03-31 14:51:22 +02:00

FEA

refactor 'dir = ' into 'set_dir()'

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

game

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

2015-04-03 09:33:05 +02:00

js

…

modules

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

2015-04-03 09:33:05 +02:00

TriDimension

Replaces awful connect type system with bitflags

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

ZAS

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

2015-03-26 17:01:33 +10:30

global.dm

finishes work on adapting the goon process scheduler for BS12.

2015-03-04 05:14:36 -05:00

hub.dm

…

names.dm

…

setup.dm

Merge pull request #8604 from Zuhayr/limbs

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

stylesheet.dm

Makes reflex shooting more obvious

2015-04-02 21:54:35 -04:00

world.dm

Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.

2015-03-28 11:01:11 +10:30