Merge pull request #1502 from SkyMarshal/master

ZAS/Plasma settings now have proper names/descriptions, and added feedback when a preset is used.

code/ZAS/Plasma.dm

@@ -1,21 +1,39 @@
 pl_control/var
 	PLASMA_DMG = 3
+	PLASMA_DMG_NAME = "Plasma Damage Amount"
+	PLASMA_DMG_DESC = "Self Descriptive"
 
-	CLOTH_CONTAMINATION = 0 //If this is on, plasma does damage by getting into cloth.
+	CLOTH_CONTAMINATION = 0
+	CLOTH_CONTAMINATION = "Cloth Contamination"
+	CLOTH_CONTAMINATION_DESC = "If this is on, plasma does damage by getting into cloth."
 
-	PLASMAGUARD_ONLY = 0 //If this is on, only biosuits and spacesuits protect against contamination and ill effects.
+	PLASMAGUARD_ONLY = 0
+	PLASMAGUARD_ONLY_NAME = "\"PlasmaGuard Only\""
+	PLASMAGUARD_ONLY_DESC = "If this is on, only biosuits and spacesuits protect against contamination and ill effects."
 
-	GENETIC_CORRUPTION = 0 //Chance of genetic corruption as well as toxic damage, X in 10,000.
+	GENETIC_CORRUPTION = 0
+	GENETIC_CORRUPTION_NAME = "Genetic Corruption Chance"
+	GENETIC_CORRUPTION_DESC = "Chance of genetic corruption as well as toxic damage, X in 10,000."
 
-	SKIN_BURNS = 1       //Plasma has an effect similar to mustard gas on the un-suited.
+	SKIN_BURNS = 1
+	SKIN_BURNS_DESC = "Plasma has an effect similar to mustard gas on the un-suited."
+	SKIN_BURNS_NAME = "Skin Burns"
 
-	EYE_BURNS = 1 //Plasma burns the eyes of anyone not wearing eye protection.
+	EYE_BURNS = 1
+	EYE_BURNS_NAME = "Eye Burns"
+	EYE_BURNS_DESC = "Plasma burns the eyes of anyone not wearing eye protection."
 
 	CONTAMINATION_LOSS = 0.01
+	CONTAMINATION_LOSS_NAME = "Contamination Loss"
+	CONTAMINATION_LOSS_DESC = "How much toxin damage is dealt from contaminated clothing" //Per tick?  ASK ARYN
 
 	PLASMA_HALLUCINATION = 0
+	PLASMA_HALLUCINATION_NAME = "Plasma Hallucination"
+	PLASMA_HALLUCINATION_DESC = "Does being in plasma cause you to hallucinate?"
 
 	N2O_HALLUCINATION = 1
+	N2O_HALLUCINATION_NAME = "N2O Hallucination"
+	N2O_HALLUCINATION_DESC = "Does being in sleeping gas cause you to hallucinate?"
 
 
 obj/var/contaminated = 0

code/ZAS/Variable Settings.dm

@@ -221,7 +221,7 @@ vs_control
 				//plc.PLASMA_DMG_OFFSET = 3
 				//plc.PLASMA_DMG_QUOTIENT = 5
 
-		/////world << "Plasma color updated."
+		world << "\blue <b>[key_name(user)] changed the global plasma/ZAS settings to \"[def]\"</b>"
 
 pl_control
 	var/list/settings = list()