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

2015-01-21 08:50:19 +01:00

..

area

Fixes #7743.

2015-01-11 11:28:24 +01:00

dna

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

gamemodes

Merge pull request #7850 from Baystation12/master

2015-01-16 14:23:03 +03:00

jobs

Fix virologists spawning without jumpsuits, IDs or PDAs. Fixes #7312.

2014-12-08 18:48:14 +00:00

machinery

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

2015-01-21 08:50:19 +01:00

magic

…

mecha

Merge resolution.

2015-01-07 03:43:12 +10:30

objects

Merge pull request #7885 from Baystation12/master

2015-01-20 18:49:03 +10:30

turfs

fix wall burning runtime, balance rwalls

2015-01-16 23:58:15 +00:00

vehicles

…

verbs

Merge pull request #7850 from Baystation12/master

2015-01-16 14:23:03 +03:00

asteroid.dm

…

atoms_movable.dm

refactor 'dir = ' into 'set_dir()'

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

atoms.dm

Fixes #7802.

2015-01-14 08:24:33 +01:00

json.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Moved supply computers to a separate file in machinery/computer/.

2014-12-17 12:53:18 +01:00