MrPerson 9dc713ba9c Merge branch 'master' of https://github.com/tgstation/-tg-station into screen_alert_2 ...

Conflicts:
	code/_onclick/hud/alert.dm
	code/game/objects/items.dm
	code/modules/mob/living/carbon/human/human.dm
	icons/mob/screen_alert.dmi

2015-06-09 03:23:18 -07:00

..

hud

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

2015-06-09 03:23:18 -07:00

adjacent.dm

Utterly guts the use of .locs from the game.

2015-05-21 23:41:47 -07:00

ai.dm

File restructure

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

click.dm

eol fixes (probably) and examine fix in closets

2015-05-28 20:48:47 +10: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

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

observer.dm

The singularity/narsie are no longer machines

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

other_mobs.dm

Move_Pulled around corners

2015-04-08 02:47:56 +02:00

overmind.dm

Initial pass to convert LF to CRLF

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

telekinesis.dm

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00