GinjaNinja32 314a28fa75 Merge remote-tracking branch 'upstream/dev' into span_class=notice ...

Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/OpTable.dm
	code/game/machinery/floodlight.dm
	code/game/machinery/spaceheater.dm

2015-06-02 17:33:20 +01:00

..

antagonist

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01:00

area

Dev-freeze into dev merge.

2015-05-30 00:31:12 +09:30

dna

code/game, excluding code/game/machinery and code/game/objects

2015-05-29 21:51:27 +01:00

gamemodes

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01:00

jobs

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01:00

machinery

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01:00

magic

…

mecha

code/game, excluding code/game/machinery and code/game/objects

2015-05-29 21:51:27 +01:00

objects

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01:00

turfs

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01:00

vehicles

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

verbs

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-05-29 21:55:37 +01:00

asteroid.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

atoms_movable.dm

Replaces nuke disk search_contents_for with a global nuke disk registry

2015-05-22 01:15:04 -04:00

atoms.dm

Ability to head blind_message when invisible people do things readded

2015-05-22 00:02:36 +10:00

json.dm

…

periodic_news.dm

…

response_team.dm

code/game, excluding code/game/machinery and code/game/objects

2015-05-29 21:51:27 +01:00

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Supply shuttle and crate fixes

2015-05-23 16:15:04 +01:00