diff --git a/code/modules/nifsoft/software/01_vision.dm b/code/modules/nifsoft/software/01_vision.dm
index afc1e533d1..77331a48d9 100644
--- a/code/modules/nifsoft/software/01_vision.dm
+++ b/code/modules/nifsoft/software/01_vision.dm
@@ -108,6 +108,12 @@
 	incompatible_with = list(NIF_MATERIAL,NIF_THERMALS,NIF_NIGHTVIS)
 	vision_exclusive = TRUE
 
+/datum/nifsoft/mesons/life()
+	if((. = ..()))
+		var/mob/living/carbon/human/H = nif.human
+		if(H.client)
+			H.client.screen |= global_hud.meson
+
 /datum/nifsoft/material
 	name = "Material Scanner"
 	desc = "Similar to the worn Optical Material Scanner Goggles, these allow you to see objects through walls."
@@ -122,6 +128,12 @@
 	incompatible_with = list(NIF_MESONS,NIF_THERMALS,NIF_NIGHTVIS)
 	vision_exclusive = TRUE
 
+/datum/nifsoft/material/life()
+	if((. = ..()))
+		var/mob/living/carbon/human/H = nif.human
+		if(H.client)
+			H.client.screen |= global_hud.material
+
 /datum/nifsoft/thermals
 	name = "Thermal Scanner"
 	desc = "Similar to the worn Thermal Goggles, these allow you to see heat-emitting creatures through walls."
@@ -137,6 +149,12 @@
 	incompatible_with = list(NIF_MESONS,NIF_MATERIAL,NIF_NIGHTVIS)
 	vision_exclusive = TRUE
 
+/datum/nifsoft/thermals/life()
+	if((. = ..()))
+		var/mob/living/carbon/human/H = nif.human
+		if(H.client)
+			H.client.screen |= global_hud.thermal
+
 /datum/nifsoft/nightvis
 	name = "Low-Light Amp"
 	desc = "Similar to the worn Night Vision Goggles, these allow you to see in complete darkness."
@@ -150,3 +168,9 @@
 	darkness_view = 7
 	incompatible_with = list(NIF_MESONS,NIF_MATERIAL,NIF_THERMALS)
 	vision_exclusive = TRUE
+
+/datum/nifsoft/nightvis/life()
+	if((. = ..()))
+		var/mob/living/carbon/human/H = nif.human
+		if(H.client)
+			H.client.screen |= global_hud.nvg
diff --git a/code/modules/projectiles/guns/energy/pump.dm b/code/modules/projectiles/guns/energy/pump.dm
index 3080ffe6a1..693ad2bb01 100644
--- a/code/modules/projectiles/guns/energy/pump.dm
+++ b/code/modules/projectiles/guns/energy/pump.dm
@@ -36,6 +36,7 @@
 	if(lockable)
 		locked = !locked
 		to_chat(user, "<span class='warning'>You [locked ? "enable" : "disable"] the safety lock on \the [src]!</span>")
+		return 1
 
 /obj/item/weapon/gun/energy/locked/special_check(mob/user)
 	if(locked)