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

..

__DEFINES

Merge pull request #7884 from Incoming5643/layers4lizards

2015-02-26 01:47:40 -06: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 #8006 from MrStonedOne/SomeThingThatEndsInYFollowedByTwoNumbers

2015-02-27 16:17:20 +03: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 remote-tracking branch 'upstream/master' into traymesons

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

js

…

LINDA

Resolves #3947 - Fires can now spread on shuttle turfs (and all simulated turfs). However, fires will not burn non-turf/simulated/floor

2015-01-11 00:11:22 +00:00

modules

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

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

_compile_options.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

hub.dm

…

world.dm

Merge pull request #7257 from Lo6a4evskiy/Sec_record_photo

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