LaserGun Change and Other
Adds Red Laser Tag equipment set and Blue laser tag equipment set to the "Select Equipment" Admin verb
Merge pull request #4 from tgstation/master

pull from tgstation master to phil235 master
Changes Aloe cocktail recipe

Changes Aloe cocktail recipe to 1 orangejuice, 1 whiskey, 1 watermelonjuice to avoid conflict with the irish cream recipe (2 whiskey, 1 milk cream)
Fixes #2914
changes the aloe recipe to 1 irishcream + 1 watermelonjuice
Update autolathe.dm

Added the proximity sensor to the autolathe.
Replaced all the red syndicate space suits with the red/black version, including the uplink item. It looks cooler.
You can now put the syndicate suit back into the box it came in.
Gave the DJ Station the orange syndicate suit, looks very nice.
Replaced the syndicate suit in the derelict's singularity engine with the yellow/black engie version.
Replaced the other syndicate suit in the derelict with the red/black version.
Added a red/black space suit to the abandoned mining station, inside the resin corridor, along with a syndicate toolbox.
Moved the xeno suit to the hydro room, on the abandoned mining station. It looked out of place out in the open.
Moved the SWAT helmet on the derelict to the derelict armoury.
Watertank nozzles no longer delete
Changed the replica suit/helmet to the black/red version.
Changed the description on the uplink datum.
Made all the suit/helmet names lowercase for all the different versions.
Changed the max_w_class to allow the suit to be inserted, won't allow anything else to be inserted due to the can_hold list not being empty.
Feedback messages for the crusher.
Revert "Merge pull request #3142 from Alek2ander/master"

This reverts commit 6f9b58abcebf1e1f8996ed33cafae7bdbf7909a7, reversing
changes made to eda7110a23a971b53112cbf2a3a1cf30f2c78ff3.

Im so sorry aran, so sorry
Adding four boards to the list of R&D circuit designs

Adds the boards for telecom traffic control console, telescience console, mechbay recharger and vendor to the list of R&D designs.
Fixes some minor typos.
Fixes one typo
Merge pull request #3229 from Razharas/pAIrevert

Revert "Merge pull request #3142 from Alek2ander/master"
Merge pull request #3222 from phil235/aloefix

Changes Aloe cocktail recipe
Merge pull request #3223 from GunHog/Proxsensor

Adds prox sensor to the autolathe.
Advance diseases cache the generated id to help stop the amount of calls to sortList.
For the start of the month, I'll make combat more robust because I think everyone is pretty unrobust.
This won't be reverted.
Happy clicks.
Merge pull request #3238 from Giacom/advance_cache

Advance diseases cache the generated id to help stop the amount of calls to sortList.
Merge pull request #3242 from Aranclanos/HappyCLicks

Making the game better for everyone.