Mloc-Argent 6630e4838e Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/alarm.dm

2014-06-30 23:44:46 +01:00

..

area

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

2014-06-30 23:44:46 +01:00

dna

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

2014-06-19 10:05:27 +10:00

gamemodes

Fixes #5113

2014-07-01 01:04:50 +09:30

jobs

Merge pull request #5397 from Zuhayr/dev

2014-06-30 00:04:25 +09:30

machinery

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

2014-06-30 23:44:46 +01:00

magic

…

mecha

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

2014-06-23 20:57:47 +01:00

objects

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

2014-06-30 23:44:46 +01:00

turfs

atmos: make fires more destructive

2014-06-23 20:58:14 +01:00

vehicles

…

verbs

color change ( http://i.imgur.com/6SAj7OT.png )

2014-06-02 23:17:23 -07:00

asteroid.dm

…

atoms_movable.dm

Updates l_move_time to use world.time

2014-06-19 18:11:39 -04:00

atoms.dm

Re-enables organ infections, adds wound infection

2014-06-19 21:25:59 -04:00

communications.dm

…

json.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Adds shuttle controller

2014-06-23 22:00:57 -04:00