Minor nations bug fixes

code/modules/mob/living/silicon/robot/inventory.dm

@@ -13,11 +13,11 @@
 	if(!O)
 		return 0
 
-	O.mouse_opacity = 2	
+	O.mouse_opacity = 2
 	if(istype(O,/obj/item/borg/sight))
 		var/obj/item/borg/sight/S = O
 		sight_mode &= ~S.sight_mode
-		
+
 	if(client)
 		client.screen -= O
 	contents -= O
@@ -71,6 +71,7 @@
 			sight_mode |= module_state_3:sight_mode
 	else
 		src << "You need to disable a module first!"
+	src.update_icons()
 
 /mob/living/silicon/robot/proc/uneq_active()
 	uneq_module(module_active)

code/modules/mob/living/silicon/robot/robot.dm

@@ -1008,16 +1008,16 @@ var/list/robot_verbs_default = list(
 		else
 			overlays += "ov-openpanel -c"
 
-	if(modtype == ("Combat" || "Peacekeeper"))
+	var/combat = list("Combat","Peacekeeper")
+	if(modtype in combat)
 		if (base_icon == "")
 			base_icon = icon_state
 		if(module_active && istype(module_active,/obj/item/borg/combat/mobility))
 			icon_state = "[base_icon]-roll"
 		else
 			icon_state = base_icon
-
-	if(activated(/obj/item/borg/combat/shield))
-		overlays += "[icon_state]-shield"
+		if(activated(/obj/item/borg/combat/shield))
+			overlays += "[base_icon]-shield"
 
 	if(jetpackoverlay)
 		overlays += "minerjetpack-[icon_state]"