Razharas c0aa3b56bb Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker ...

Conflicts:
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/aifixer.dm
	code/modules/hydroponics/biogenerator.dm
	code/modules/power/apc.dm
	code/modules/research/server.dm
	icons/obj/stationobjs.dmi

Yeah nah time to merge this shit behore resolving conflicts will take more than 2 hours

2014-02-06 22:05:39 +04:00

..

components

Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker

2014-02-06 22:05:39 +04:00

atmospherics.dm

Cleanup of pipe unwrenching code.

2013-10-12 17:24:54 +01:00

datum_pipe_network.dm

Few changes to how round start works.

2011-08-03 05:59:10 +00:00

datum_pipeline.dm

Adding Linda.

2013-08-10 06:15:14 -03:00

he_pipes.dm

-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

2012-07-23 00:48:51 +00:00

pipes.dm

/code/ATMOSPHERICS/* lowercasing pass.

2013-11-18 01:36:36 +01:00