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

In monkey.dm my SpeciesCanConsume check was conflicting with a new canBeHandcuffed check.  All resolved now.

2014-05-14 11:07:43 -04:00

..

hud

Replaces the serviceborg beer bottle with a drinking glass, adds beer to the shaker. Emagging unlocks a second shaker with a different icon and description (but the same name) which dispenses beer2 (the disguise chloral) or mutagen or thermite.

2014-05-09 06:10:35 -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

evidence bags will now use attackby() to add items to themselves

2014-04-29 08:38:51 -03: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

evidence bags will now use attackby() to add items to themselves

2014-04-29 08:38:51 -03:00

observer.dm

Removes the click cooldown from almost everything, now it should be always be 0.1 seconds.

2014-03-28 06:32:47 -03:00

oldcode.dm

Initial pass to convert LF to CRLF

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

other_mobs.dm

Removes the click cooldown from almost everything, now it should be always be 0.1 seconds.

2014-03-28 06:32:47 -03: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