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

Conflicts:
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/living_defines.dm

2015-04-07 01:06:38 +02:00

..

__DEFINES

Merge pull request #8618 from Xhuis/my_ears_they_bleed

2015-03-31 19:16:59 +11:00

__HELPERS

Remove an infinite loop in getFlatIcon

2015-04-01 00:10:24 +13:00

_globalvars

Randomizes Order of Job Spawn Points

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

_onclick

Merge pull request #8520 from MrPerson/effect_cleanup

2015-03-30 01:21:40 +11: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 #8628 from Fayrik/AllTheSmallThings

2015-04-04 20:58:07 +11:00

datums

Merge pull request #8639 from Incoming5643/its_time_to_get_hard

2015-04-02 20:24:14 +11:00

defines

Day Who-Knows: Bar Gambling Expansion!

2015-03-29 18:09:54 -05:00

game

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

2015-04-07 01:06:38 +02:00

js

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

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

LINDA

Fixes fires in the walls

2015-03-20 05:50:06 +03:00

modules

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

2015-04-07 01:06:38 +02:00

_compile_options.dm

…

hub.dm

…

world.dm

Moves chat toggles into their own variable.

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