diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 276c1796b3..625886611a 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -69,7 +69,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
 	name = "random arcade"
 	desc = "random arcade machine"
 	icon_state = "arcade"
-	icon_keyboard = "no_keyboard"
+	icon_keyboard = null
 	icon_screen = "invaders"
 	light_color = LIGHT_COLOR_GREEN
 	var/list/prize_override
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 5aa41a8be0..97d2f3bab4 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -209,7 +209,7 @@
 	name = "security camera monitor"
 	desc = "An old TV hooked into the station's camera network."
 	icon_state = "television"
-	icon_keyboard = "no_keyboard"
+	icon_keyboard = null
 	icon_screen = "detective_tv"
 	pass_flags = PASSTABLE
 
diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm
index a7071ac72e..54b515f74c 100644
--- a/code/game/machinery/computer/pod.dm
+++ b/code/game/machinery/computer/pod.dm
@@ -138,13 +138,13 @@
 	name = "\improper DoorMex control console"
 	icon_state = "oldcomp"
 	icon_screen = "library"
-	icon_keyboard = "no_keyboard"
+	icon_keyboard = null
 
 // /obj/machinery/computer/pod/old/mass_driver_controller
 // 	name = "\improper Mass Driver Controller"
 // 	icon = 'icons/obj/airlock_machines.dmi'
 // 	icon_state = "airlock_control_standby"
-// 	icon_keyboard = "no_keyboard"
+// 	icon_keyboard = null
 // 	density = FALSE
 
 // /obj/machinery/computer/pod/old/mass_driver_controller/toxinsdriver
diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm
index 14545f9570..78314ee6b6 100644
--- a/code/modules/mining/aux_base.dm
+++ b/code/modules/mining/aux_base.dm
@@ -15,6 +15,7 @@
 	name = "auxillary base management console"
 	icon = 'icons/obj/terminals.dmi'
 	icon_state = "dorm_available"
+	icon_keyboard = null
 	var/shuttleId = "colony_drop"
 	desc = "Allows a deployable expedition base to be dropped from the station to a designated mining location. It can also \
 interface with the mining shuttle at the landing site if a mobile beacon is also deployed."
diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
index a34e0f6f12..7be279bc87 100644
--- a/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -78,6 +78,7 @@
 	lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
 	ammo_type = list(/obj/item/ammo_casing/energy/net, /obj/item/ammo_casing/energy/trap)
+	modifystate = FALSE
 	can_flashlight = 0
 	ammo_x_offset = 1
 
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index 6991aeef43..7ae4aae5fc 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -7,6 +7,7 @@
 	density = TRUE
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "mixer0"
+	icon_keyboard = null
 	use_power = TRUE
 	idle_power_usage = 20
 	resistance_flags = ACID_PROOF
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 3204b36cc5..d4f1eb71ee 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ