Dev update from staging

code/_global_vars/lists/flavor.dm

@@ -115,15 +115,13 @@ GLOBAL_GETTER(cable_colors, /list, SetupCableColors())
 /proc/SetupCableColors()
 	. = list()
 
-	var/list/valid_cable_coils = typesof(/obj/item/stack/cable_coil)
-	for(var/ctype in list(
+	var/list/valid_cable_coils = typesof(/obj/item/stack/cable_coil) - typesof(
 		/obj/item/stack/cable_coil/single,
 		/obj/item/stack/cable_coil/cut,
 		/obj/item/stack/cable_coil/cyborg,
 		/obj/item/stack/cable_coil/fabricator,
 		/obj/item/stack/cable_coil/random
-	))
-		valid_cable_coils -= typesof(ctype)
+	)
 
 	var/special_name_mappings = list(/obj/item/stack/cable_coil = "Red")
 	for(var/coil_type in valid_cable_coils)
@@ -132,6 +130,6 @@ GLOBAL_GETTER(cable_colors, /list, SetupCableColors())
 		var/obj/item/stack/cable_coil/C = coil_type
 		if(!initial(C.can_have_color))
 			continue
-		var/color = initial(C.color)
+		var/color = initial(C.paint_color) || initial(C.color)
 		.[name] = color
 	. = sortTim(., /proc/cmp_text_asc)

code/_onclick/ghost.dm

@@ -45,6 +45,9 @@
 		return
 	if(user.client && user.client.inquisitive_ghost)
 		user.examinate(src)
+		return
+	if(user.client?.holder || user.antagHUD)
+		storage?.show_to(user)
 	return
 
 // ---------------------------------------

code/_onclick/other_mobs.dm

@@ -66,9 +66,9 @@
 	var/obj/item/organ/external/hand/O = GET_EXTERNAL_ORGAN(src, get_active_held_item_slot())
 	if(!istype(O))
 		return FALSE
-	var/decl/pronouns/G = get_pronouns()
+	var/decl/pronouns/pronouns = get_pronouns()
 	visible_message(
-		SPAN_DANGER("\The [src] chews on [G.his] [O.name]"),
+		SPAN_DANGER("\The [src] chews on [pronouns.his] [O.name]"),
 		SPAN_DANGER("You chew on your [O.name]!")
 	)
 	admin_attacker_log(src, "chewed on their [O.name]!")

code/game/gamemodes/endgame/supermatter_cascade/universe.dm

@@ -15,9 +15,9 @@ var/global/universe_has_ended = 0
 /datum/universal_state/supermatter_cascade/OnTurfChange(var/turf/T)
 	var/turf/space/S = T
 	if(istype(S))
-		S.color = "#0066ff"
+		S.set_color("#0066ff")
 	else
-		S.color = initial(S.color)
+		S.set_color(initial(S.color))
 
 /datum/universal_state/supermatter_cascade/DecayTurf(var/turf/T)
 	T.handle_universal_decay()

code/game/machinery/computer/guestpass.dm

@@ -34,7 +34,7 @@
 	to_chat(usr, SPAN_NOTICE("Issuing reason: [reason]."))
 
 /obj/item/card/id/guest/proc/expire()
-	color = COLOR_BLACK
+	set_color(COLOR_BLACK)
 	detail_color = COLOR_BLACK
 	update_icon()
 

code/game/machinery/vending/_vending.dm

@@ -107,7 +107,7 @@
 		var/category = current_list[2]
 		for(var/entry in current_list[1])
 			var/datum/stored_items/vending_products/product = new(src, entry)
-			product.price = atom_info_repository.get_combined_worth_for(entry) * markup
+			product.price = ceil(atom_info_repository.get_combined_worth_for(entry) * markup)
 			product.category = category
 			if(product && populate_parts)
 				product.amount = (current_list[1][entry]) ? current_list[1][entry] : 1
@@ -213,9 +213,9 @@
 	if(currently_vending.price > cashmoney.absolute_worth)
 		// This is not a status display message, since it's something the character
 		// themselves is meant to see BEFORE putting the money in
-		to_chat(usr, "[html_icon(cashmoney)] <span class='warning'>That is not enough money.</span>")
+		to_chat(usr, SPAN_WARNING("[html_icon(cashmoney)] That is not enough money."))
 		return 0
-	visible_message("<span class='info'>\The [usr] inserts some cash into \the [src].</span>")
+	visible_message(SPAN_INFO("\The [usr] inserts some cash into \the [src]."))
 	cashmoney.adjust_worth(-(currently_vending.price))
 	// Vending machines have no idea who paid with cash
 	credit_purchase("(cash)")
@@ -228,7 +228,7 @@
  * successful, 0 if failed.
  */
 /obj/machinery/vending/proc/pay_with_charge_card(var/obj/item/charge_stick/wallet)
-	visible_message("<span class='info'>\The [usr] plugs \the [wallet] into \the [src].</span>")
+	visible_message(SPAN_INFO("\The [usr] plugs \the [wallet] into \the [src]."))
 	if(wallet.is_locked())
 		status_message = "Unlock \the [wallet] before using it."
 		status_error = TRUE
@@ -327,7 +327,7 @@
 		if(R.price <= 0)
 			vend(R, user)
 		else if(issilicon(user)) //If the item is not free, provide feedback if a synth is trying to buy something.
-			to_chat(user, "<span class='danger'>Artificial unit recognized.  Artificial units cannot complete this transaction.  Purchase canceled.</span>")
+			to_chat(user, SPAN_DANGER("Artificial unit recognized.  Artificial units cannot complete this transaction.  Purchase canceled."))
 		else
 			currently_vending = R
 			if(!vendor_account || vendor_account.suspended)
@@ -355,7 +355,7 @@
 	if(!vend_ready)
 		return
 	if((!allowed(user)) && !emagged && scan_id)	//For SECURE VENDING MACHINES YEAH
-		to_chat(user, "<span class='warning'>Access denied.</span>")//Unless emagged of course
+		to_chat(user, SPAN_WARNING("Access denied."))//Unless emagged of course
 		var/deny_state = "[icon_state]-deny"
 		if(check_state_in_icon(deny_state, icon))
 			flick(deny_state, src)
@@ -390,7 +390,7 @@
 	if(prob(1)) //The vending gods look favorably upon you
 		sleep(3)
 		if(product.get_product(get_turf(src)))
-			visible_message("<span class='notice'>\The [src] clunks as it vends an additional [product.item_name].</span>")
+			visible_message(SPAN_NOTICE("\The [src] clunks as it vends an additional [product.item_name]."))
 	status_message = ""
 	status_error = 0
 	vend_ready = 1
@@ -408,7 +408,7 @@
 		return
 
 	if(R.add_product(W))
-		to_chat(user, "<span class='notice'>You insert \the [W] in the product receptor.</span>")
+		to_chat(user, SPAN_NOTICE("You insert \the [W] in the product receptor."))
 		SSnano.update_uis(src)
 		return 1
 
@@ -484,5 +484,5 @@
 		return 0
 	spawn(0)
 		throw_item.throw_at(target, rand(1,2), 3)
-	visible_message("<span class='warning'>\The [src] launches \a [throw_item] at \the [target]!</span>")
+	visible_message(SPAN_WARNING("\The [src] launches \a [throw_item] at \the [target]!"))
 	return 1

code/game/objects/alien_props.dm

@@ -65,8 +65,7 @@
 	. = ..()
 	if(!random_light_color)
 		random_light_color = get_random_colour(FALSE, 100, 255)
-	b_color = random_light_color
-	color = random_light_color
+	set_color(random_light_color) // if stuff starts exploding due to too-early update_icon calls it's this thing's fault
 
 //Airlock
 /obj/machinery/door/airlock/alien

code/game/objects/items/__item.dm

@@ -597,11 +597,6 @@
 
 	return ..()
 
-/obj/item/attack_ghost(mob/user)
-	var/mob/observer/ghost/pronouns = user
-	if(pronouns.client?.holder || pronouns.antagHUD)
-		storage?.show_to(user)
-
 /obj/item/proc/talk_into(mob/living/M, message, message_mode, var/verb = "says", var/decl/language/speaking = null)
 	return
 

code/game/objects/items/flashlights/glowstick.dm

@@ -43,5 +43,5 @@
 	color = "#ff00ff"
 
 /obj/item/flashlight/flare/glowstick/random/Initialize()
-	color = rgb(rand(50,255),rand(50,255),rand(50,255))
+	set_color(rgb(rand(50,255),rand(50,255),rand(50,255)))
 	. = ..()

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -216,7 +216,6 @@
 
 /obj/item/stack/tile/carpet/on_update_icon()
 	. = ..()
-	color = get_color()
 	if(detail_color)
 		set_overlays(overlay_image(icon, "[icon_state]-detail", detail_color, RESET_COLOR))
 

code/game/objects/items/weapons/cards_ids_syndicate.dm

@@ -131,7 +131,7 @@
 				if(choice && CanUseTopic(user, state))
 					src.icon_state = choice.icon_state
 					src.item_state = choice.item_state
-					src.color = choice.color
+					set_color(choice.color)
 					src.detail_color = choice.detail_color
 					src.extra_details = choice.extra_details
 					update_icon()

code/game/objects/items/weapons/material/shards.dm

@@ -51,12 +51,8 @@
 
 /obj/item/shard/on_update_icon()
 	. = ..()
-	if(material)
-		// 1-(1-x)^2, so that glass shards with 0.3 opacity end up somewhat visible at 0.51 opacity
-		alpha = 255 * (1 - (1 - material.opacity)*(1 - material.opacity))
-	else
-		color = "#ffffff"
-		alpha = 255
+	// 1-(1-x)^2, so that glass shards with 0.3 opacity end up somewhat visible at 0.51 opacity
+	alpha = 255 * (material ? (1 - (1 - material.opacity)**2) : 1)
 
 /obj/item/shard/attackby(obj/item/W, mob/user)
 	if(IS_WELDER(W) && material.shard_can_repair)

code/game/objects/structures/crates_lockers/closets/__closet.dm

@@ -42,7 +42,7 @@ var/global/list/closets = list()
 		var/decl/closet_appearance/app = GET_DECL(closet_appearance)
 		if(app)
 			icon = app.icon
-			color = null
+			reset_color()
 			queue_icon_update()
 
 	return INITIALIZE_HINT_LATELOAD

code/game/objects/structures/curtains.dm

@@ -60,7 +60,7 @@
 	if(curtain_kind_path)
 		var/decl/curtain_kind/kind = GET_DECL(curtain_kind_path)
 		alpha = kind.alpha
-		color = kind.color
+		set_color(kind.color)
 
 //
 // Curtain Structure

code/game/objects/structures/flora/plant.dm

@@ -70,7 +70,7 @@
 /obj/structure/flora/plant/on_update_icon()
 	. = ..()
 	icon_state = "blank"
-	color = null
+	reset_color()
 	set_overlays(plant.get_appearance(dead = dead, growth_stage = growth_stage, can_harvest = !!harvestable))
 
 /obj/structure/flora/plant/attackby(obj/item/O, mob/user)