mwerezak 77288fb951 Merge remote-tracking branch 'upstream/dev' into camera ...

Conflicts:
	code/game/machinery/portable_turret.dm

2014-12-03 23:37:02 -05:00

..

area

Nukeops shuttle docking

2014-11-29 03:51:45 +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 pull request #7210 from Zuhayr/dev

2014-12-02 17:23:19 -08:00

jobs

refactor 'dir = ' into 'set_dir()'

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

machinery

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

2014-12-03 23:37:02 -05:00

magic

…

mecha

refactor 'dir = ' into 'set_dir()'

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

objects

Merge pull request #7217 from mwerezak/syndie-suit

2014-12-03 17:02:48 -05:00

turfs

Reverted wall repairing with tape

2014-12-02 23:17:46 +13: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

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30