ESwordTheCat c43652b33a Okay shards converted to pool usage now. ...

Conflicts:
	code/game/machinery/computer/arcade.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/objects/structures/displaycase.dm
	code/modules/mining/mine_turfs.dm
	code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm

2014-04-19 19:57:53 -04:00

..

xenoarchaeology

Okay shards converted to pool usage now.

2014-04-19 19:57:53 -04:00

circuitprinter.dm

Bugfixes

2013-10-30 03:13:59 -04:00

designs.dm

Added the Mech Ion Rifle, Mech Carbine, Mech Rocket Launcher

2014-01-14 22:42:50 -05:00

destructive_analyzer.dm

Fixes closets and destructive analyzer

2013-01-03 16:08:46 -08:00

message_server.dm

Garbage collection fixes

2014-02-19 20:24:31 -05:00

protolathe.dm

Pretty much all new click code

2013-10-12 14:44:36 -04:00

rd-readme.dm

…

rdconsole.dm

Remove RnD lockboxes

2013-12-30 18:33:30 -05:00

rdmachines.dm

…

research_shuttle.dm

Okay shards converted to pool usage now.

2014-04-19 19:57:53 -04:00

research.dm

Various fixes.

2013-09-27 02:41:41 -04:00

server.dm

Okay shards converted to pool usage now.

2014-04-19 19:57:53 -04:00