phil235 18323955a7 Merge branch 'master' of https://github.com/tgstation/-tg-station into LifeProcsDuplicateFix ...

Conflicts:
	code/modules/mob/living/carbon/human/life.dm

2015-02-25 19:01:59 +01:00

..

__DEFINES

re-adds GOTTAGOFAST, renames the current gottagofast to IGNORESLOWDOWN, adds GOTTAGOREALLYFAST for meth

2015-02-23 19:35:58 -08:00

__HELPERS

Merge pull request #7700 from RemieRichards/ExplosionsAndEmbedding

2015-02-24 01:22:01 +03:00

_globalvars

…

_onclick

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

2015-02-25 19:01:59 +01:00

ATMOSPHERICS

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

controllers

fixes another runtime with starlight

2015-02-24 16:48:06 -08:00

datums

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

2015-02-23 18:47:21 -08:00

defines

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

game

Merge pull request #7981 from MrStonedOne/revert-7970-removegaytider

2015-02-25 18:47:53 +01:00

js

…

LINDA

…

modules

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

2015-02-25 19:01:59 +01:00

_compile_options.dm

…

hub.dm

…

world.dm

…