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

..

admin

Merge pull request #7963 from Incoming5643/manage_ass

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

assembly

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

awaymissions

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

client

Merge pull request #7924 from Incoming5643/mulligan_rounds

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

clothing

move alt_desc to obj/item/clothing

2015-02-28 11:02:58 -05:00

crafting

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

detectivework

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

emoji

…

events

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

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

flufftext

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

food&drinks

Merge pull request #7941 from phil235/SmallFoodRenamingFix

2015-02-25 08:24:38 -06:00

holiday

…

hydroponics

Merge pull request #8027 from Iamgoofball/patch-36

2015-02-28 07:00:27 +03:00

library

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

mining

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

2015-02-24 22:16:53 +00:00

mob

Merge pull request #7963 from Incoming5643/manage_ass

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

nano

Auto load required nanoui files on client login

2015-02-25 12:25:21 +13:00

paperwork

fixes warning on compile

2015-02-25 16:28:21 +11:00

power

Revert "Allows portable machines to be mounted on any turf that can have cables."

2015-02-21 02:29:29 +03:00

projectiles

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

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

reagents

Merge pull request #8024 from Iamgoofball/patch-35

2015-02-28 06:59:56 +03:00

recycling

Merge pull request #7897 from paprka/riiiip

2015-02-24 21:47:52 -06:00

research

Merge pull request #7988 from Menshin/protalathe_matcheck_fix

2015-02-27 11:11:52 +03:00

scripting

…

security levels

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

shuttle

…

surgery

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

2015-02-19 18:16:33 +00:00

telesci

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