Merge pull request #53 from Aurorastation/development

Development

code/modules/admin/banjob.dm

@@ -26,6 +26,10 @@ var/jobban_keylist[0]		//to store the keys & ranks
 			if(config.usewhitelist && !check_whitelist(M))
 				return "Whitelisted Job"
 
+		if (config.use_age_restriction_for_jobs)
+			if (config.age_restrictions[rank] && M.client.player_age < config.age_restrictions[rank])
+				return "Age Restricted"
+
 		for (var/s in jobban_keylist)
 			if( findtext(s,"[M.ckey] - [rank]") == 1 )
 				var/startpos = findtext(s, "## ")+3

code/modules/admin/player_notes_sql.dm

@@ -8,6 +8,8 @@
 	var/ckey = sanitizeSQL(key)
 	var/content = sanitizeSQL(note)
 
+	note = sql_sanitize_text(note)
+
 	var/a_ckey
 	if(usr)
 		a_ckey = sanitizeSQL(usr.key)

code/modules/admin/topic.dm

@@ -1366,6 +1366,7 @@
 		var/special_role_description = ""
 		var/health_description = ""
 		var/gender_description = ""
+		var/species_description = ""
 		var/turf/T = get_turf(M)
 
 		//Location
@@ -1399,8 +1400,18 @@
 			if(MALE,FEMALE)	gender_description = "[M.gender]"
 			else			gender_description = "<font color='red'><b>[M.gender]</b></font>"
 
+		//Species
+		if(ishuman(M))
+			var/mob/living/carbon/human/K = M
+			if(K.species)
+				species_description = "[K.species.name]"
+			else
+				species_description = "Unknown"
+		else
+			species_description = "N/A"
+
 		src.owner << "<b>Info about [M.name]:</b> "
-		src.owner << "Mob type = [M.type]; Gender = [gender_description] Damage = [health_description]"
+		src.owner << "Mob type = [M.type]; Species = <b>[species_description]</b>; Gender = [gender_description]; Damage = [health_description]"
 		src.owner << "Name = <b>[M.name]</b>; Real_name = [M.real_name]; Mind_name = [M.mind?"[M.mind.name]":""]; Key = <b>[M.key]</b>;"
 		src.owner << "Location = [location_description];"
 		src.owner << "[special_role_description]"

code/modules/admin/verbs/warning.dm

@@ -88,8 +88,12 @@
 	if(!reason)
 		return
 
+	reason = sql_sanitize_text(reason)
+
 	var/notes = input("Add Additional Information. This is visible to staff only.") as null|text
 
+	notes = sql_sanitize_text(notes)
+
 	var/severity
 	switch(alert("Set Warning Severity",,"Standard","Severe"))
 		if("Standard")