Ccomp5950 976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-04-25 21:14:58 -05:00

..

xenoarchaeology

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

2014-04-25 21:14:58 -05:00

circuitprinter.dm

Fix for acid pouring.

2013-10-27 21:56:08 +03:00

designs.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

destructive_analyzer.dm

Fixed destructive analyzer failure messages.

2014-01-08 19:27:27 +00:00

message_server.dm

World loops 2: Electric Boogaloo.

2013-07-01 19:43:56 +04:00

protolathe.dm

Fix for #3254.

2013-07-06 16:50:01 +03:00

rd-readme.dm

Fixed typo in RD Readme

2014-04-16 02:41:54 -07:00

rdconsole.dm

Removed R&D lockboxes.

2013-12-22 13:29:28 -06:00

rdmachines.dm

-Killed the updateDialog lag. I added a check to see if there were any mobs to update, if not it will stop checking until a user uses the machine again. I had to replace all the machine = src and machine = null with procs to help make it manageable. I believe this is one of the culprits causing the server to lag as the round goes on, as more players will interact with machines.

2012-10-25 19:15:51 +00:00

research_shuttle.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

research.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

server.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00