xxalpha f9ebb2cff7 Merge remote-tracking branch 'upstream/master' into traymesons ...

Conflicts:
	code/modules/research/designs.dm
	icons/mob/eyes.dmi
	icons/obj/clothing/glasses.dmi

2015-02-27 21:15:01 +00:00

..

devices

Merge remote-tracking branch 'upstream/master' into traymesons

2015-02-27 21:15:01 +00:00

robot

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

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

stacks

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

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

weapons

Merge pull request #7562 from Iamgoofball/drugs

2015-02-25 08:26:21 +03:00

apc_frame.dm

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

blueprints.dm

Resolves #6971 - non-lighting_subarea areas are now stored in list/sortedAreas. This list is sorted by area name using timSort only when areas are added to it. Currently the only other thing that adds to this list is the station-blueprints object.

2015-01-18 20:46:30 +00:00

bodybag.dm

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

candle.dm

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

crayons.dm

Adds a new body outline graffiti for crayons, gives the detective a white crayon, changes the sprite for the mime crayon, and puts a waistcoat in the detective's closet.

2015-01-03 13:44:23 -06:00

documents.dm

-Removed some duplicate code

2014-05-04 16:18:48 -06:00

holotape.dm

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

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

latexballoon.dm

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

shooting_range.dm

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

toys.dm

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

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

trash.dm

Cooking overhaul: adding tablecraft food recipes, customizable food, food ingredients (from bay)

2015-02-05 16:48:25 +01:00