Tigercat2000 dd79aaa967 Merge remote-tracking branch 'upstream/master' into to_chat ...

Conflicts:
	code/game/machinery/door_control.dm

2016-04-05 21:10:36 -07:00

..

area

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

dna

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

gamemodes

Fix remaining issues and sound shit

2016-04-05 16:26:11 -07:00

jobs

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

machinery

Merge remote-tracking branch 'upstream/master' into to_chat

2016-04-05 21:10:36 -07:00

magic

Replace most (if not all) output << operators with to_chat(user, message)

2016-04-05 08:15:05 -07:00

mecha

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

objects

Merge remote-tracking branch 'upstream/master' into to_chat

2016-04-05 21:10:36 -07:00

turfs

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

vehicles/spacepods

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

verbs

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

asteroid.dm

Ports tg simple_animal bots

2016-03-28 00:22:04 -04:00

atoms_movable.dm

fix tile_bound

2016-04-01 16:36:39 -07:00

atoms.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

data_huds.dm

Merge branch 'master' into buttbots2

2016-03-31 13:33:46 -04:00

response_team.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

sound.dm

Fix remaining issues and sound shit

2016-04-05 16:26:11 -07:00