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

..

admin

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

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

assembly

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

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

awaymissions

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

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

client

adds a small check to see if the job controller started up before using buttons related to it and generate runtimes.

2014-02-14 02:37:31 -03:00

clothing

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

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

detectivework

You can now properly clean your hands of blood. Fixes #2258.

2014-01-22 17:42:36 +00:00

events

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

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

flufftext

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

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

food

By sticking a crayon in the mix when making a burger you can now make a colored burger!

2014-02-23 18:34:32 -05:00

hydroponics

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

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

library

Replaced a few more Del() and del() calls

2014-03-03 04:51:09 -08:00

mining

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

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

mob

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

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

nano

NanoUI Update

2014-01-09 01:02:13 +00:00

paperwork

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

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

power

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

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

projectiles

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

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

reagents

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

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

recycling

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

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

research

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

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

scripting

NTSL, parrots, and ID consoles hate apostrophes less.

2013-11-30 14:33:02 -05:00

security levels

Communications Console Update

2013-10-15 22:42:20 -06:00

shuttle

* Added ore boxes to the gulag, and added a conveyor belt which goes outside and has a loading machine, which will take the ore from the orebox.

2013-12-20 22:09:06 +00:00

surgery

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

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

telesci

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

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