Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pogo

code/modules/client/asset_cache.dm

@@ -270,8 +270,8 @@ proc/getFilesSlow(var/client/client, var/list/files, var/register_asset = TRUE)
 /datum/asset/chem_master/register()
 	for(var/i = 1 to 20)
 		assets["pill[i].png"] = icon('icons/obj/chemical.dmi', "pill[i]")
-	for(var/i = 1 to 20)
-		assets["bottle[i].png"] = icon('icons/obj/chemical.dmi', "bottle[i]")
+	for(var/i in list("bottle", "small_bottle", "wide_bottle", "round_bottle"))
+		assets["[i].png"] = icon('icons/obj/chemical.dmi', "[i]")
 	for(var/asset_name in assets)
 		register_asset(asset_name, assets[asset_name])
 

code/modules/client/client procs.dm

@@ -56,6 +56,7 @@
 	//search the href for script injection
 	if( findtext(href,"<script",1,0) )
 		log_to_dd("Attempted use of scripts within a topic call, by [src]")
+		log_runtime(EXCEPTION("Attempted use of scripts within a topic call, by [src]"), src)
 		message_admins("Attempted use of scripts within a topic call, by [src]")
 		return
 

code/modules/client/preference/loadout/loadout_hat.dm

@@ -112,3 +112,8 @@
 /datum/gear/hat/red_beret
 	display_name = "beret, red"
 	path = /obj/item/clothing/head/beret
+
+/datum/gear/hat/sci_beret
+	display_name = "science beret"
+	path = /obj/item/clothing/head/beret/sci
+	allowed_roles = list("Research Director", "Scientist")

code/modules/client/preference/preferences_mysql.dm

@@ -61,7 +61,7 @@
 	// Might as well scrub out any malformed be_special list entries while we're here
 	for(var/role in be_special)
 		if(!(role in special_roles))
-			log_to_dd("[C.key] had a malformed role entry: '[role]'. Removing!")
+			log_runtime(EXCEPTION("[C.key] had a malformed role entry: '[role]'. Removing!"), src)
 			be_special -= role
 
 	var/DBQuery/query = dbcon.NewQuery({"UPDATE [format_table_name("player")]