Rolan7 0fa91b06f1 Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue3401 ...

Conflicts:
	code/modules/mob/living/carbon/monkey/monkey.dm - I don't know why it thought there was a conflict.  Opening it in tortoisemerge showed no conflicts and automatically cleared the status.  I reset to the repo's version just to be safe, then re-added my freakin 2 line function which has caused 2-3 "conflicts" so far.

2014-07-07 13:42:31 -04:00

..

hud

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

2014-07-07 13:42:31 -04:00

adjacent.dm

Corrected swapped comments

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

ai.dm

Merge pull request #3215 from MrStonedOne/silicon-macros-and-hotkeys

2014-04-01 01:27:39 -05:00

click.dm

You now face what you are examining when using the verb

2014-05-31 14:11:42 -06:00

cyborg.dm

Revert "Merge pull request #3218 from AndroidSFV/aiphotoext2"

2014-04-21 18:59:58 +02:00

drag_drop.dm

Initial pass to convert LF to CRLF

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

item_attack.dm

Fix attack message from hitting monkey,alien,slime with an item.

2014-06-10 20:16:11 +02:00

observer.dm

Cyborgs can no longer strip people or search storage items

2014-06-11 21:50:41 -06:00

oldcode.dm

Initial pass to convert LF to CRLF

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

other_mobs.dm

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

2014-07-07 13:42:31 -04:00

overmind.dm

Initial pass to convert LF to CRLF

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

telekinesis.dm

FUCK YOU GIITTTT ;_;

2014-04-08 14:47:05 +02:00