Miauw 67e37bd449 Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid ...

Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
	code/modules/research/designs.dm
	maps/tgstation.2.1.2.dmm

2014-01-07 18:18:59 +01:00

..

_DynamicAreaLighting_TG.dm

Minor lighting optimization

2013-10-25 16:01:29 -04:00

configuration.dm

Added a failsafe, default_laws is now a config option.

2013-12-23 13:10:04 +01:00

failsafe.dm

Changed some global_list stuff:

2012-10-24 20:11:39 +00:00

lighting_controller.dm

Minor modifications to Yvar's A* fixes:

2013-05-19 09:54:39 +01:00

master_controller.dm

Merge pull request #1647 from Giacom/small_tweaks

2013-10-28 10:41:18 -07:00

shuttle_controller.dm

* Removes a debug message.

2013-12-23 14:31:19 +00:00

supply_shuttle.dm

Tons of typo fixes and renames Centcomm to Centcom. Manual merge of #1950.

2013-12-13 21:14:23 +00:00

verbs.dm

Committing carn's modifications to events and other things. Full details below.

2013-02-17 11:44:37 +00:00

voting.dm

Removed percentages and added a "Did not vote" count for custom votes. (Non-voters get automatically added to status quo option in non-custom votes)

2013-12-08 11:34:12 -07:00