Merge branch 'master' into upstream-merge-32188

code/datums/antagonists/changeling.dm

@@ -15,8 +15,6 @@
 
 	var/list/stored_profiles = list() //list of datum/changelingprofile
 	var/datum/changelingprofile/first_prof = null
-	//var/list/absorbed_dna = list()
-	//var/list/protected_dna = list() //dna that is not lost when capacity is otherwise full
 	var/dna_max = 6 //How many extra DNA strands the changeling can store for transformation.
 	var/absorbedcount = 0
 	var/chem_charges = 20

code/datums/browser.dm

@@ -220,18 +220,6 @@
 // This is added to mob so that it can be used without a reference to the browser object
 // There is probably a better place for this...
 /mob/proc/browse_rsc_icon(icon, icon_state, dir = -1)
-	/*
-	var/icon/I
-	if (dir >= 0)
-		I = new /icon(icon, icon_state, dir)
-	else
-		I = new /icon(icon, icon_state)
-		setDir("default")
-
-	var/filename = "[ckey("[icon]_[icon_state]_[dir]")].png"
-	src << browse_rsc(I, filename)
-	return filename
-	*/
 
 
 // Registers the on-close verb for a browse window (client/verb/.windowclose)

code/datums/components/decal.dm

@@ -2,9 +2,10 @@
 	dupe_mode = COMPONENT_DUPE_ALLOWED
 
 	var/cleanable
+	var/description
 	var/mutable_appearance/pic
 
-/datum/component/decal/Initialize(_icon, _icon_state, _dir, _cleanable=CLEAN_GOD, _color, _layer=TURF_LAYER)
+/datum/component/decal/Initialize(_icon, _icon_state, _dir, _cleanable=CLEAN_GOD, _color, _layer=TURF_LAYER, _description)
 	if(!isatom(parent) || !_icon || !_icon_state)
 		. = COMPONENT_INCOMPATIBLE
 		CRASH("A turf decal was applied incorrectly to [parent.type]: icon:[_icon ? _icon : "none"] icon_state:[_icon_state ? _icon_state : "none"]")
@@ -15,6 +16,7 @@
 	pic.color = _color
 
 	cleanable = _cleanable
+	description = _description
 
 	apply()
 
@@ -22,6 +24,8 @@
 		RegisterSignal(COMSIG_ATOM_DIR_CHANGE, .proc/rotate_react)
 	if(_cleanable)
 		RegisterSignal(COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react)
+	if(_description)
+		RegisterSignal(COMSIG_PARENT_EXAMINE, .proc/examine)
 
 /datum/component/decal/Destroy()
 	remove()
@@ -50,4 +54,7 @@
 
 /datum/component/decal/proc/clean_react(strength)
 	if(strength >= cleanable)
-		qdel(src)
+		qdel(src)
+
+/datum/component/decal/proc/examine(mob/user)
+	to_chat(user, description)

code/datums/components/material_container.dm

@@ -22,8 +22,6 @@
 	var/last_insert_success
 	var/precise_insertion = FALSE
 	var/datum/callback/precondition
-	//MAX_STACK_SIZE = 50
-	//MINERAL_MATERIAL_AMOUNT = 2000
 
 /datum/component/material_container/Initialize(list/mat_list, max_amt = 0, _show_on_examine = FALSE, list/allowed_types, datum/callback/_precondition)
 	materials = list()

code/datums/datumvars.dm

@@ -418,24 +418,9 @@
 		item = "[VV_HTML_ENCODE(name)] = /icon (<span class='value'>[value]</span>)"
 		#endif
 
-/*		else if (istype(value, /image))
-		#ifdef VARSICON
-		var/rnd = rand(1, 10000)
-		var/image/I = value
-
-		src << browse_rsc(I.icon, "tmp[REF(value)][rnd].png")
-		html += "[name] = <img src=\"tmp[REF(value)][rnd].png\">"
-		#else
-		html += "[name] = /image (<span class='value'>[value]</span>)"
-		#endif
-*/
 	else if (isfile(value))
 		item = "[VV_HTML_ENCODE(name)] = <span class='value'>'[value]'</span>"
 
-	//else if (istype(value, /client))
-	//	var/client/C = value
-	//	item = "<a href='?_src_=vars;Vars=[REF(value)]'>[VV_HTML_ENCODE(name)] [REF(value)]</a> = [C] [C.type]"
-
 	else if (istype(value, /datum))
 		var/datum/D = value
 		if ("[D]" != "[D.type]") //if the thing as a name var, lets use it.

code/datums/diseases/beesease.dm

@@ -35,6 +35,4 @@
 				affected_mob.visible_message("<span class='danger'>[affected_mob] coughs up a swarm of bees!</span>", \
 													"<span class='userdanger'>You cough up a swarm of bees!</span>")
 				new /mob/living/simple_animal/hostile/poison/bees(affected_mob.loc)
-		//if(5)
-		//Plus if you die, you explode into bees
 	return

code/datums/diseases/cold.dm

@@ -13,12 +13,6 @@
 	..()
 	switch(stage)
 		if(2)
-/*
-			if(affected_mob.sleeping && prob(40))  //removed until sleeping is fixed
-				to_chat(affected_mob, "\blue You feel better.")
-				cure()
-				return
-*/
 			if(affected_mob.lying && prob(40))  //changed FROM prob(10) until sleeping is fixed
 				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
 				cure()
@@ -36,12 +30,6 @@
 			if(prob(1))
 				to_chat(affected_mob, "<span class='danger'>Mucous runs down the back of your throat.</span>")
 		if(3)
-/*
-			if(affected_mob.sleeping && prob(25))  //removed until sleeping is fixed
-				to_chat(affected_mob, "\blue You feel better.")
-				cure()
-				return
-*/
 			if(affected_mob.lying && prob(25))  //changed FROM prob(5) until sleeping is fixed
 				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
 				cure()

code/datums/hud.dm

@@ -29,7 +29,7 @@ GLOBAL_LIST_INIT(huds, list(
 	var/list/hud_icons = list() //these will be the indexes for the atom's hud_list
 
 /datum/atom_hud/proc/remove_hud_from(mob/M)
-	if(!M)
+	if(!M || !hudusers[M])
 		return
 	if (!--hudusers[M])
 		hudusers -= M
@@ -79,7 +79,8 @@ GLOBAL_LIST_INIT(huds, list(
 /mob/proc/reload_huds()
 	for(var/datum/atom_hud/hud in (GLOB.huds|GLOB.active_alternate_appearances))
 		if(hud && hud.hudusers[src])
-			hud.add_hud_to(src)
+			for(var/atom/A in hud.hudatoms)
+				hud.add_to_single_hud(src, A)
 
 /mob/dead/new_player/reload_huds()
 	return