MrPerson 24dcf08b2e Merge branch 'master' of https://github.com/tgstation/-tg-station into alert_alert_ur_a_faget ...

Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	icons/mob/screen_alien.dmi

2015-03-02 12:04:38 -08:00

..

hud

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

2015-03-02 12:04:38 -08:00

adjacent.dm

Corrected swapped comments

2014-05-05 01:10:18 +02:00

ai.dm

File restructure

2014-12-27 22:08:25 +00:00

click.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

cyborg.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

drag_drop.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

item_attack.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

observer.dm

The singularity/narsie are no longer machines

2014-12-12 19:42:37 -03:00

other_mobs.dm

Merge pull request #6707 from phil235/HostileAttackingTargetFix

2015-01-01 12:47:27 -03:00

overmind.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

telekinesis.dm

Merge pull request #7959 from phil235/AttackSelfTKFix

2015-02-25 19:54:36 -08:00