Merge branch 'master' of github.com:Baystation12/Baystation12

Conflicts:
	maps/tgstation.2.0.8.dmm
Maps and R&D fix, for the Rapid Syringe Gun
Merge pull request #902 from Hawk-v3/master

Map, R&D Rapid Syringe Gun and Pipefinding Algo fixes
TG: - CE's locker spawns the hazard vest above the toolbox
- CE's locker spawns with an industrial backpack at the bottom
- Sec locker spawns with a sec backpack at the bottom
- HoS locker spawns with the injectors lockbox above the flashbang box
- HoS locker spawns with an armor vest at the bottom for the convenience of HoS' who want to play with regular armor.
- Added this to the changelog, I used the old format because the new one is just too tedious to do by hand, sorry.
 Revision: r3062
Author: 	 baloh.matevz
Fix for blood level not going down from syringes.
Clean up Syringe and Notebook code.
TG: Added stat tracking for cyborg frames built, cyborgs created, MMIs filled, AIs
created, and cyborg modules chosen.

cyborg_frames_built
cyborgs_created
mmis_filled
ais_created

standard_cyborgs
service_cyborgs
miner_cyborgs
medical_cyborgs
security_cyborgs
engineering_cyborgs
janitor_cyborgs
I also added the fetchbot icons, which I forgot to mention.
Revision: r3064
Author: 	 petethegoat
Date: 	Feb 8, 2012
TG: Added a new one-use artefact, Veil Render(sprites by Ausops), for the wizard
which will summon Nar-Sie after a few seconds of delay. Yes believe it or not I
got permission to add this.

Added Veil Render to the spellbook

Added the effect "rend" as part of Veil Render's summoning process. Rend spawns
Nar-Sie and deletes itself after a 3 second delay.

Updated the changelog.
Revision: r3067
Author: 	 kortgstation
TG: Added a line counter tool. Counts the number of files, lines, characters, etc.
in the project.
Revision: r3070
Author: 	 baloh.matevz
Merge fixes.
New verb: rightandwrong

When used, it will arm every human mob that is not already a special role (and
with a client assigned) with a random gun from the following list:
-Taser
-Egun
-Laser
-Revolver
-C20r
-Decloner
-Desert Eagle
TG: -Gyrojet Pistol
-Pulse Rifle
-Silenced Pistol
-Laser Cannon
-Combat Shotgun
-Mini-Uzi
-Mini-Ebow

It will then inform the player that
"You are the survivor! Your own safety matters above all else, trust no one and
kill anyone who gets in your way. However, armed as you are, now would be the
perfect time to settle that score or grab that pair of yellow gloves you've been
eyeing..."

And make them a traitor/give them the objective to survive till the round ends.

After use, rightandwrong will remove itself from the users list of verbs.

rightandwrong addeded to the Spellbook under "Summon Guns"
The verb will appear in the spell tab.

Updated changelog
Revision: r3071
Author: 	 kortgstation
TG: Added the caution code, sprited by magicbones, not present anywhere on the map

http://nanotrasen.com/phpBB3/viewtopic.php?f=10&t=4548&start=50#p37266

Added a power switch (/obj/structure/powerswitch), which is used to split or
connect two cables.

The way it works is simple. It connects the powernets by adding cable on the
floor it's on and removing it when it's turned off.

In-file description:
//This is a power switch. When turned on it looks at the cables around the tile
that it's on and notes which cables are trying to connect to it.
//After it knows this it creates the number of cables from the center to each of
the cables attempting to conenct. These cables cannot be removed
//with wirecutters. When the switch is turned off it removes all the cables on
the tile it's on.
//The switch uses a 5s delay to prevent powernet change spamming.

Screenshot:
http://www.kamletos.si/power%20switch.PNG
Revision: r3072
Author: 	 baloh.matevz
TG: - Here's a thingamabob for all you sissies who cry "What a terrible new
changelog markup, oh my". Launch in browser of choice (tested in FF, Opera,
Chrome, IE8+), fill the form, click "Get HTML", copy&paste into changelog.
Revision: r3074
Author: 	 panurgomatic
TG: - Added water balloons (sprites courtesy of Sieve,) these can be filled with
most reagents and burst on throwing if filled, applying the reagents to whatever
is hit (along with everything else on that tile.) These are winnable from the
arcade, for now. I'll probably think of a better way to implement them.
Revision: r3075
Author: 	 quartz235
TG: You will now face the direction of the item/turf/mob/anything you're interacting
with (or trying to interact with) (applied whenever you click, shift-click or
alt-click)

Added this to the changelog.
Revision: r3077
Author: 	 baloh.matevz

Also some merge fixes.
Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates
Merge pull request #903 from Erthilo/master

Adds fingerless gloves, new sprites for filing cabinet, pressure, and gun toggle, fixes blood level not decreasing from syringes
Adds null rod properly. Removes effects from bible.
Merge pull request #904 from Erthilo/TGUpdates

TG Updates up to r3077
Merge branch 'master' of git://github.com/Baystation12/Baystation12