MrPerson 6b29fecda1 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r ...

Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/rechargestation.dm
	code/game/machinery/turrets.dm
	code/game/objects/structures/crates_lockers/closets.dm
	code/modules/research/circuitprinter.dm

2014-03-08 22:03:03 -08:00

..

implant.dm

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

2014-03-02 21:39:27 -08:00

implantcase.dm

second pass

2014-02-15 20:11:12 -08:00

implantchair.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

implanter.dm

second pass

2014-02-15 20:11:12 -08:00

implantfreedom.dm

Renames the "freedom" bundle the "implant" bundle cause that's what it is, man.

2014-02-16 15:22:54 -05:00

implantpad.dm

second pass

2014-02-15 20:11:12 -08:00

implantuplink.dm

Made uplink_owner key rather than name

2014-03-04 14:55:03 -05:00