Merge pull request #1795 from CIB/master

Various fixes

code/datums/organs/organ_external.dm

@@ -428,7 +428,7 @@
 
 					W = new wound_type(damage)
 				if(BURN)
-					var/list/size_names = list(/datum/wound/moderate_burn, /datum/wound/large_burn, /datum/wound/severe_burn, /datum/wound/deep_burn, /datum/wound/carbonised_area)
+					var/list/size_names = list(/datum/wound/moderate_burn, /datum/wound/large_burn, /datum/wound/severe_burn, /datum/wound/deep_burn, /datum/wound/carbonised_area, /datum/wound/carbonised_area)
 					wound_type = size_names[size]
 
 					W = new wound_type(damage)

code/game/machinery/iv_drip.dm

@@ -90,3 +90,23 @@
 		update_icon()
 	else
 		return ..()
+
+/obj/machinery/iv_drip/examine()
+	set src in view()
+	..()
+	if (!(usr in view(2)) && usr!=src.loc) return
+
+	if(beaker)
+		usr << "\blue Attached is \a [beaker] with:"
+		if(beaker.reagents && beaker.reagents.reagent_list.len)
+			for(var/datum/reagent/R in beaker.reagents.reagent_list)
+				usr << "\blue [R.volume] units of [R.name]"
+		else
+			usr << "\blue Attached is an empty [beaker]."
+	else
+		usr << "\blue No chemicals are attached."
+
+	if(attached)
+		usr << "\blue [attached] is attached."
+	else
+		usr << "\blue No one is attached."

code/modules/admin/verbs/adminhelp.dm

@@ -14,9 +14,10 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an", "monkey", "ali
 	if (src.handle_spam_prevention(msg,MUTE_ADMINHELP))
 		return
 
-	src.verbs -= /client/verb/adminhelp
+	/**src.verbs -= /client/verb/adminhelp
 	spawn(1200)
-		src.verbs += /client/verb/adminhelp	// 2 minute cool-down for adminhelps
+		src.verbs += /client/verb/adminhelp	// 2 minute cool-down for adminhelps//Go to hell
+	**/
 
 	if(!msg)	return
 	msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN))

code/modules/mob/new_player/preferences.dm

@@ -1163,6 +1163,8 @@ datum/preferences
 		character.h_style = h_style
 		character.f_style = f_style
 
+		character.skills = skills
+
 		// Destroy/cyborgize organs
 		for(var/name in organ_data)
 			var/datum/organ/external/O = character.organs[name]