YotaXP febfa4d1e5 Merge branch 'qdel-with-datums' ...

Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/controllers/garbage.dm
	code/game/atoms.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/modules/mob/mob.dm

2014-03-27 21:46:53 -04:00

..

__DEFINES

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

__HELPERS

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

_globalvars

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

_onclick

Merge branch 'qdel-with-datums'

2014-03-27 21:46:53 -04:00

ATMOSPHERICS

Merge pull request #3030 from Razharas/UnaryMachinery

2014-03-22 20:07:17 -03:00

controllers

Merge branch 'qdel-with-datums'

2014-03-27 21:46:53 -04:00

datums

Merge pull request #3187 from phil235/pierrotfix

2014-03-26 16:56:00 -07: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 'qdel-with-datums'

2014-03-27 21:46:53 -04:00

js

…

LINDA

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

modules

Merge branch 'qdel-with-datums'

2014-03-27 21:46:53 -04:00

unused

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

WorkInProgress

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00: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

Big(gish) map reorganization.

2014-01-13 22:38:11 +00:00