Modified hallucination code a bit and created a hallucination var limit.
Fixed, so it can compile now
Signed-off-by: Firecage <firecage@hotmail.com>
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
Signed-off-by: Firecage <firecage@hotmail.com>
Removes the pixel_x and pixel_y from the cable coils on chemistry, they already do that, it's hardcoded
Makes fingerprintslast use ckey instead of key
Cleans a bit the prime() code, large grenades won't be a huge copypaste anymore
Asay logs will now show up when the grenade is activated instead of used. Only when The grenade is activated by an assembly.
New proc, get_mob_by_ckey(). Give it a ckey and it will return a mob.
Fixes transit tubes being stuck, it uses process() instead of a spawn'd loop.
Segmented the transit tube code into its own folder and code files, for each part of the tube.
Merge pull request #3465 from Giacom/pandemic_fix

Ports a Pandemic machine fix
Damn .dme
can't knock down if aiming at head.
Revert "Tweaked the stats more"

This reverts commit a12d6bad9b2c29aa3fef236112b7641d1a6c45e5.

Conflicts:
	code/game/gamemodes/changeling/powers/tiny_prick.dm
Reverting
Merge pull request #3488 from Firecage/master

Forks, knives  and cleavers
Merge pull request #3218 from AndroidSFV/aiphotoext2

AI Photography Extention #2
Merge pull request #3360 from Kelenius/blessing-fix

Fixed a bug where holy water had to be applied twice for blessing
Reverting 3
Signed-off-by: Firecage <firecage@hotmail.com>
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
Revert "Merge pull request #3218 from AndroidSFV/aiphotoext2"

This reverts commit f2d850ee25c4c9f8fc3876b0c5453d44e8e02066, reversing
changes made to 805e2570bfaa3c7a06ab9d6ff5cb44de65dca34c.