Merge conflict fix

code/game/objects/items/devices/desynchronizer.dm

@@ -39,7 +39,7 @@
 	var/new_duration = input(user, "Set the duration (5-300):", "Desynchronizer", duration / 10) as null|num
 	if(new_duration)
 		new_duration = new_duration SECONDS
-		new_duration = CLAMP(new_duration, 50, max_duration)
+		new_duration = clamp(new_duration, 50, max_duration)
 		duration = new_duration
 		to_chat(user, "<span class='notice'>You set the duration to [DisplayTimeText(duration)].</span>")
 	return TRUE

code/game/objects/items/devices/electrochromatic_kit.dm

@@ -0,0 +1,14 @@
+/obj/item/electronics/electrochromatic_kit
+	name = "electrochromatic kit"
+	desc = "A kit for upgrading a window into an electrochromatic one."
+	/// Electrochromatic ID
+	var/id
+
+/obj/item/electronics/electrochromatic_kit/attack_self(mob/user)
+	. = ..()
+	if(.)
+		return
+	var/new_id = input(user, "Set this kit's electrochromatic ID", "Set ID", id) as text|null
+	if(isnull(new_id))
+		return
+	id = new_id

code/game/objects/items/devices/flashlight.dm

@@ -351,6 +351,12 @@
 	light_color = "#FFAA44"
 	flashlight_power = 0.8
 
+/obj/item/flashlight/lantern/jade
+	name = "jade lantern"
+	desc = "An ornate, green lantern."
+	color = LIGHT_COLOR_GREEN
+	light_color = LIGHT_COLOR_GREEN 
+
 /obj/item/flashlight/slime
 	gender = PLURAL
 	name = "glowing slime extract"

code/game/objects/items/devices/gps.dm

@@ -75,7 +75,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
 	if(!ui)
 		// Variable window height, depending on how many GPS units there are
 		// to show, clamped to relatively safe range.
-		var/gps_window_height = CLAMP(325 + GLOB.GPS_list.len * 14, 325, 700)
+		var/gps_window_height = clamp(325 + GLOB.GPS_list.len * 14, 325, 700)
 		ui = new(user, src, ui_key, "gps", "Global Positioning System", 470, gps_window_height, master_ui, state) //width, height
 		ui.open()
 

code/game/objects/items/devices/lightreplacer.dm

@@ -171,7 +171,7 @@
 
 // Negative numbers will subtract
 /obj/item/lightreplacer/proc/AddUses(amount = 1)
-	uses = CLAMP(uses + amount, 0, max_uses)
+	uses = clamp(uses + amount, 0, max_uses)
 
 /obj/item/lightreplacer/proc/AddShards(amount = 1, user)
 	bulb_shards += amount

code/game/objects/items/devices/multitool.dm

@@ -68,10 +68,9 @@
 	update_icon()
 
 /obj/item/multitool/update_icon_state()
+	icon_state = initial(icon_state)
 	if(selected_io)
-		icon_state = "multitool_red"
-	else
-		icon_state = "multitool"
+		icon_state += "_red"
 
 /obj/item/multitool/proc/wire(var/datum/integrated_io/io, mob/user)
 	if(!io.holder.assembly)

code/game/objects/items/devices/pressureplates.dm

@@ -8,6 +8,7 @@
 	level = 1
 	var/trigger_mob = TRUE
 	var/trigger_item = FALSE
+	var/specific_item = null
 	var/trigger_silent = FALSE
 	var/sound/trigger_sound = 'sound/effects/pressureplate.ogg'
 	var/obj/item/assembly/signaler/sigdev = null
@@ -35,6 +36,8 @@
 	. = ..()
 	if(!can_trigger || !active)
 		return
+	if(trigger_item && !istype(AM, specific_item))
+		return
 	if(trigger_mob && isliving(AM))
 		var/mob/living/L = AM
 		to_chat(L, "<span class='warning'>You feel something click beneath you!</span>")

code/game/objects/items/devices/radio/electropack.dm

@@ -84,7 +84,7 @@
 			if(!usr.canUseTopic(src, BE_CLOSE))
 				return
 			new_code = round(new_code)
-			new_code = CLAMP(new_code, 1, 100)
+			new_code = clamp(new_code, 1, 100)
 			code = new_code
 
 		if(href_list["set"] == "power")

code/game/objects/items/devices/radio/radio.dm

@@ -199,7 +199,7 @@
 	if(!spans)
 		spans = list(M.speech_span)
 	if(!language)
-		language = M.get_default_language()
+		language = M.get_selected_language()
 	INVOKE_ASYNC(src, .proc/talk_into_impl, M, message, channel, spans.Copy(), language)
 	return ITALICS | REDUCE_RANGE
 

code/game/objects/items/devices/traitordevices.dm

@@ -240,7 +240,7 @@ effective or pretty fucking useless.
 			charge = max(0,charge - 25)//Quick decrease in light
 		else
 			charge = min(max_charge,charge + 50) //Charge in the dark
-		animate(user,alpha = CLAMP(255 - charge,0,255),time = 10)
+		animate(user,alpha = clamp(255 - charge,0,255),time = 10)
 
 
 /obj/item/jammer