Remie Richards 736ffafa55 Merge branch 'master' of https://github.com/tgstation/-tg-station into BlobReroll ...

Conflicts:
	code/game/gamemodes/blob/blobs/blob_mobs.dm
	code/game/gamemodes/blob/blobs/core.dm

2015-03-01 00:18:19 +00:00

..

__DEFINES

Merge pull request #7924 from Incoming5643/mulligan_rounds

2015-02-28 21:27:18 +00:00

__HELPERS

Merge pull request #7700 from RemieRichards/ExplosionsAndEmbedding

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

_globalvars

Lots of fixes and improvements

2015-02-04 17:35:42 +04:00

_onclick

Merge pull request #7959 from phil235/AttackSelfTKFix

2015-02-25 19:54:36 -08: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 #7963 from Incoming5643/manage_ass

2015-02-28 21:28:44 +00:00

datums

Merge pull request #7955 from Jordie0608/greytiderahelps!admintakes10braindamage!

2015-02-25 19:53:41 -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 branch 'master' of https://github.com/tgstation/-tg-station into BlobReroll

2015-03-01 00:18:19 +00:00

js

…

LINDA

…

modules

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

2015-03-01 00:18:19 +00:00

_compile_options.dm

…

hub.dm

…

world.dm

Merge pull request #7257 from Lo6a4evskiy/Sec_record_photo

2015-02-05 18:45:53 +01:00