Merge pull request #1511 from SkyMarshal/master

Made PLASMAGUARD work right as a flag, and the IRC adminhelp echo now lacks the HTML

code/modules/admin/verbs/adminhelp.dm

@@ -101,6 +101,6 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an", "monkey", "ali
 	msg = sanitize_simple(msg, replacechars)
 	if(tension_master)
 		tension_master.new_adminhelp()
-	send2adminirc("#bs12admin","HELP: \"[src.key]: [msg]\"")
+	send2adminirc("#bs12admin","HELP: \"[src.key]: [original_msg]\"")
 	//feedback_add_details("admin_verb","AH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	return

code/setup.dm

@@ -167,7 +167,7 @@ var/MAX_EXPLOSION_RANGE = 14
 
 #define BLOCKHAIR	32768		// temporarily removes the user's hair icon
 
-#define PLASMAGUARD 65536		//Does not get contaminated by plasma.
+#define PLASMAGUARD 8192		//Does not get contaminated by plasma.
 
 //flags for pass_flags
 #define PASSTABLE	1