Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge

- Merge resolution: Updates intellicard NanoUI to correctly show separate hardware integrity/backup capacitor percentages.

code/modules/client/preferences_gear.dm

@@ -897,6 +897,12 @@ var/global/list/gear_datums = list()
 	cost = 1
 	slot = slot_shoes
 
+/datum/gear/workboots
+	display_name = "workboots"
+	path = /obj/item/clothing/shoes/workboots
+	cost = 1
+	slot = slot_shoes
+
 /datum/gear/sandal
 	display_name = "sandals"
 	path = /obj/item/clothing/shoes/sandal

code/modules/clothing/shoes/jobs.dm

@@ -0,0 +1,32 @@
+/obj/item/clothing/shoes/galoshes
+	desc = "Rubber boots"
+	name = "galoshes"
+	icon_state = "galoshes"
+	permeability_coefficient = 0.05
+	flags = NOSLIP
+	slowdown = SHOES_SLOWDOWN+1
+	species_restricted = null
+
+/obj/item/clothing/shoes/jackboots
+	name = "jackboots"
+	desc = "Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time."
+	icon_state = "jackboots"
+	item_state = "jackboots"
+	force = 3
+	armor = list(melee = 30, bullet = 10, laser = 10, energy = 15, bomb = 20, bio = 0, rad = 0)
+	siemens_coefficient = 0.7
+
+/obj/item/clothing/shoes/jackboots/unathi
+	name = "toe-less jackboots"
+	desc = "Modified pair of jackboots, particularly friendly to those species whose toes hold claws."
+	item_state = "digiboots"
+	icon_state = "digiboots"
+	species_restricted = null
+
+/obj/item/clothing/shoes/workboots
+	name = "workboots"
+	desc = "A pair of steel-toed work boots designed for use in industrial settings. Safety first."
+	icon_state = "workboots"
+	item_state = "workboots"
+	armor = list(melee = 40, bullet = 0, laser = 0, energy = 15, bomb = 20, bio = 0, rad = 20)
+	siemens_coefficient = 0.7

code/modules/clothing/shoes/miscellaneous.dm

@@ -52,15 +52,6 @@
 	icon_state = "black"
 	body_parts_covered = FEET
 
-/obj/item/clothing/shoes/galoshes
-	desc = "Rubber boots"
-	name = "galoshes"
-	icon_state = "galoshes"
-	permeability_coefficient = 0.05
-	flags = NOSLIP
-	slowdown = SHOES_SLOWDOWN+1
-	species_restricted = null
-
 /obj/item/clothing/shoes/clown_shoes
 	desc = "The prankster's standard-issue clowning shoes. Damn they're huge!"
 	name = "clown shoes"
@@ -81,21 +72,6 @@
 	else
 		playsound(src, "clownstep", 20, 1)
 
-/obj/item/clothing/shoes/jackboots
-	name = "jackboots"
-	desc = "Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time."
-	icon_state = "jackboots"
-	item_state = "jackboots"
-	force = 3
-	siemens_coefficient = 0.7
-
-/obj/item/clothing/shoes/jackboots/unathi
-	name = "toe-less jackboots"
-	desc = "Modified pair of jackboots, particularly friendly to those species whose toes hold claws."
-	item_state = "digiboots"
-	icon_state = "digiboots"
-	species_restricted = null
-
 /obj/item/clothing/shoes/cult
 	name = "boots"
 	desc = "A pair of boots worn by the followers of Nar-Sie."

code/modules/clothing/spacesuits/rig/modules/computer.dm

@@ -131,7 +131,7 @@
 	if(!target)
 		if(ai_card)
 			if(istype(ai_card,/obj/item/device/aicard))
-				ai_card.attack_self(H)
+				ai_card.ui_interact(H, state = deep_inventory_state)
 			else
 				eject_ai(H)
 		update_verb_holder()

code/modules/clothing/spacesuits/rig/modules/modules.dm

@@ -234,7 +234,7 @@
 		SetupStat(R)
 
 /mob/proc/SetupStat(var/obj/item/weapon/rig/R)
-	if(R && !R.canremove && R.installed_modules.len && statpanel("Hardsuit Modules"))
+	if(src == usr && R && !R.canremove && R.installed_modules.len && statpanel("Hardsuit Modules"))
 		var/cell_status = R.cell ? "[R.cell.charge]/[R.cell.maxcharge]" : "ERROR"
 		statpanel("Hardsuit Modules", "Suit charge", cell_status)
 		for(var/obj/item/rig_module/module in R.installed_modules)

code/modules/mob/living/carbon/human/say.dm

@@ -170,8 +170,9 @@
 /mob/living/carbon/human/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name)
 	switch(message_mode)
 		if("intercom")
-			for(var/obj/item/device/radio/intercom/I in view(1, null))
+			for(var/obj/item/device/radio/intercom/I in view(1))
 				I.talk_into(src, message, verb, speaking)
+				I.add_fingerprint(src)
 				used_radios += I
 		if("headset")
 			if(l_ear && istype(l_ear,/obj/item/device/radio))

code/modules/nano/interaction/inventory_deep.dm

@@ -0,0 +1,10 @@
+/*
+	This state checks if src_object is contained anywhere in the user's inventory, including bags, etc.
+*/
+/var/global/datum/topic_state/deep_inventory_state/deep_inventory_state = new()
+
+/datum/topic_state/deep_inventory_state/can_use_topic(var/src_object, var/mob/user)
+	if(!user.contains(src_object))
+		return STATUS_CLOSE
+
+	return user.shared_nano_interaction()

code/modules/power/port_gen.dm

@@ -214,7 +214,11 @@
 	else if (temperature > upper_limit)
 		bias = max(round((temperature - average)/TEMPERATURE_DIVISOR, 1), -TEMPERATURE_CHANGE_MAX)
 
-	temperature += rand(-7 + bias, 7 + bias)
+	//limit temperature increase so that it cannot raise temperature above upper_limit,
+	//or if it is already above upper_limit, limit the increase to 0.
+	var/inc_limit = max(upper_limit - temperature, 0)
+	var/dec_limit = min(temperature - lower_limit, 0)
+	temperature += between(dec_limit, rand(-7 + bias, 7 + bias), inc_limit)
 
 	if (temperature > max_temperature)
 		overheat()

code/modules/reagents/dispenser/supply.dm

@@ -144,7 +144,7 @@
 		_tname {\
 			name = _name ;\
 			containername = _cname ;\
-			containertype = /obj/structure/closet/crate/secure;\
+			containertype = /obj/structure/closet/crate;\
 			cost = _cost ;\
 			contains = list( _type , _type );\
 			group = "Reagent Cartridges"\