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

..

__DEFINES

Fixes bullet_act not checking for damagetype on many, many objects.

2014-03-01 16:39:22 -08:00

__HELPERS

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

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

_globalvars

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

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

_onclick

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

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

ATMOSPHERICS

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

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

controllers

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

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

datums

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

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

defines

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

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

game

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

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

js

…

LINDA

Some changes to Linda, self_compare() removed and added N2O to the air group merge.

2014-03-03 01:29:42 -03:00

modules

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

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

unused

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

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

WorkInProgress

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

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

_compile_options.dm

This is for discussion of things that need to be changed to move away from purely stun based combat. Please only comment if you have something to contribute, rather than just saying you like or dislike it.

2014-02-27 10:56:06 -08:00

hub.dm

…

world.dm

…