phil235 57203430fd Merge branch 'master' of https://github.com/tgstation/-tg-station into ActionButtonUpdateRefactor ...

Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/mob/living/carbon/inventory.dm
	code/modules/mob/living/carbon/life.dm
	icons/mob/actions.dmi

2016-02-23 19:49:38 +01:00

..

hud

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

2016-02-23 19:49:38 +01:00

_defines.dm

Remove eroneous code; click catcher define; bygex path fix

2016-02-04 17:19:47 -06:00

adjacent.dm

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

2015-07-19 21:53:39 +02:00

ai.dm

Renames click intercept method to avoid collision with ClickOn

2016-02-20 15:39:14 +01:00

click.dm

Renames click intercept method to avoid collision with ClickOn

2016-02-20 15:39:14 +01:00

cyborg.dm

Renames click intercept method to avoid collision with ClickOn

2016-02-20 15:39:14 +01:00

drag_drop.dm

Dragging an item onto itself === clicking it

2015-09-19 15:59:24 -07:00

god.dm

Hand of God Fixes/Tweaks

2015-11-07 15:25:28 -03:00

item_attack.dm

Revert "Simple animal force threshold no longer converts damage to brute"

2016-02-06 17:25:44 -05:00

observer.dm

Renames click intercept method to avoid collision with ClickOn

2016-02-20 15:39:14 +01:00

other_mobs.dm

Merge conflict fix

2016-01-19 10:02:50 +02:00

overmind.dm

Adds blob help! Blobs can now check what stuff does with a help verb! Help, it's eating me!

2015-11-20 17:00:43 -05:00

telekinesis.dm

Changes relatives paths into absolute paths and makes some if()'s better

2016-01-17 01:36:56 +02:00