Iamgoofball 7114d5ac04 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive ...

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Goon-Medicine.dm

2015-03-14 20:00:35 -07:00

..

__DEFINES

Merge pull request #8206 from RemieRichards/AILessProcessing

2015-03-14 16:21:22 -05:00

__HELPERS

Fixes resisting out of cuffs failing.

2015-03-10 12:24:15 +01:00

_globalvars

Randomizes Order of Job Spawn Points

2015-03-02 20:01:36 -07:00

_onclick

Merge pull request #8256 from phil235/StrangenessTextFix

2015-03-13 15:23:30 -05: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

Merge pull request #8141 from Incoming5643/Subjectivity_is_a_bitch

2015-03-09 00:14:28 -05:00

datums

Merge pull request #8256 from phil235/StrangenessTextFix

2015-03-13 15:23:30 -05: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 branch 'master' of https://github.com/tgstation/-tg-station into explosive

2015-03-14 20:00:35 -07:00

js

…

LINDA

…

modules

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

2015-03-14 20:00:35 -07:00

_compile_options.dm

…

hub.dm

…

world.dm

Moves chat toggles into their own variable.

2015-03-05 18:38:07 +01:00