Amunak d28cb57f79 Merges upstream/dev to ref, resolves merge conflicts

2014-12-18 03:44:28 +01:00

..

area

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

2014-12-12 09:04:09 +01:00

dna

Fixes exploit that lets AIs use machinery even after cameras are disabled.

2014-11-30 15:24:39 +01:00

gamemodes

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

2014-12-15 08:58:28 +01:00

jobs

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

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

machinery

Merges upstream/dev to ref, resolves merge conflicts

2014-12-18 03:44:28 +01:00

magic

…

mecha

Merges upstream/dev to ref, resolves merge conflicts

2014-12-18 03:44:28 +01:00

objects

Merges upstream/dev to ref, resolves merge conflicts

2014-12-18 03:44:28 +01:00

turfs

Merge pull request #7175 from atlantiscze/pewPEWPEWboom

2014-12-16 21:17:54 -05:00

vehicles

…

verbs

Chat tags for OOC and LOOC.

2014-11-28 11:15:53 +01:00

asteroid.dm

…

atoms_movable.dm

refactor 'dir = ' into 'set_dir()'

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

atoms.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00: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