MrPerson 645ca7f8a1 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor ...

Conflicts:
	code/_onclick/click.dm
	code/game/atoms.dm
	code/game/objects/items/toys.dm
	code/modules/paperwork/folders.dm
	code/modules/power/cable.dm

2014-06-09 01:50:44 -07:00

..

__DEFINES

Merge pull request #3418 from VistaPOWA/pr_announce

2014-04-18 19:05:44 -07:00

__HELPERS

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

2014-05-13 14:03:42 -05:00

_globalvars

Strip Menu now obscures items based on flags_inv

2014-05-31 13:45:14 -06:00

_onclick

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

2014-06-09 01:50:44 -07:00

ATMOSPHERICS

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

2014-06-09 01:50:44 -07:00

controllers

Removes gamemode check

2014-05-30 23:10:53 +01:00

datums

Tweaked the power distribution handling :

2014-05-25 00:54:41 +02:00

defines

Merge pull request #3750 from hornygranny/tablethisfornow

2014-05-28 18:58:11 +02:00

game

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

2014-06-09 01:50:44 -07:00

js

- Added href getter datum. Returns either what you want or null.

2011-10-11 20:24:14 +00:00

LINDA

Added more stuff to the status panel for admins, air related, these are only temporal (hehehe)

2014-04-17 21:37:06 -03:00

modules

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

2014-06-09 01:50:44 -07: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

Updated hub.dm to be slightly more descriptive.

2013-02-17 21:12:16 +00:00

world.dm

Fixed world/topic() administrator counter for the HUB, banners and other admin tools

2014-05-04 17:29:35 +01:00