GinjaNinja32 681a6d21ea Merge remote-tracking branch 'upstream/dev' into ! ...

Conflicts:
	code/modules/mob/hear_say.dm

2014-12-08 15:32:49 +00:00

..

area

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

2014-12-05 21:29:50 -05:00

dna

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

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

gamemodes

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

2014-12-08 13:03:20 +10:30

jobs

Shuffling some items around to ensure spawn

2014-12-07 20:01:43 +10:30

machinery

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

2014-12-08 15:32:49 +00:00

magic

…

mecha

refactor 'dir = ' into 'set_dir()'

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

objects

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

2014-12-08 15:32:49 +00:00

turfs

Merge resolution.

2014-12-08 13:01:04 +10:30

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

Merge pull request #6075 from MrSnapwalk/ertv3

2014-08-22 05:01:02 -05:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

Noted a wall-deletion optimization made over at -tg. Credit to @Aranclanos.

2014-08-19 10:50:17 +02:00

socket_talk.dm

…

sound.dm

Sound fixes

2014-07-28 14:09:16 -04:00

supplyshuttle.dm

Removed attack_paw, attack_animal and attack_slime.

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