Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

code/modules/nifsoft/nif.dm

@@ -171,9 +171,10 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
 		SC.brainmobs = list()
 	stat = NIF_PREINSTALL
 	vis_update()
-	H.verbs -= /mob/living/carbon/human/proc/set_nif_examine
+	if(H)
+		H.verbs -= /mob/living/carbon/human/proc/set_nif_examine
+		H.nif = null
 	qdel_null(menu)
-	H.nif = null
 	human = null
 	install_done = null
 	update_icon()

code/modules/nifsoft/software/10_combat.dm

@@ -85,7 +85,7 @@ var/global/datum/unarmed_attack/hardclaws/unarmed_hardclaws = new()
 
 		var/mob/living/carbon/human/H = nif.human
 		H.adjustHalLoss(30)
-		var/obj/item/weapon/gun/energy/gun/martin/dazzle/dgun = new(get_turf(H))
+		var/obj/item/weapon/gun/energy/gun/compact/dazzle/dgun = new(get_turf(H))
 		H.put_in_hands(dgun)
 		nif.notify("Weapon deployed!",TRUE)
 		used = TRUE
@@ -93,10 +93,6 @@ var/global/datum/unarmed_attack/hardclaws/unarmed_hardclaws = new()
 			uninstall()
 
 //The gun to go with this implant
-/obj/item/weapon/gun/energy/gun/martin/dazzle
+/obj/item/weapon/gun/energy/gun/compact/dazzle
 	name = "Microlaser"
 	desc = "A tiny nanofabricated laser."
-
-	icon = 'icons/obj/gun_vr.dmi'
-	icon_state = "PDW"
-	item_state = "gun"