diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index d81aea807d0..b0b02280c94 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -739,6 +739,28 @@ For the sake of consistency, I suggest always rounding up on even values when ap
 			mouthshoot = FALSE
 			return
 
+	if (istype(in_chamber))
+		user.visible_message(SPAN_WARNING("[user] pulls the trigger."))
+		if(silenced)
+			playsound(user, fire_sound, 10, 1)
+		else
+			playsound(user, fire_sound, 60, 1)
+		if(istype(in_chamber, /obj/item/projectile/bullet/cap))
+			user.show_message(SPAN_WARNING("You feel rather silly, trying to commit suicide with a toy."))
+			mouthshoot = FALSE
+			return
+
+	if (istype(in_chamber))
+		user.visible_message(SPAN_WARNING("[user] pulls the trigger."))
+		if(silenced)
+			playsound(user, fire_sound, 10, 1)
+		else
+			playsound(user, fire_sound, 60, 1)
+		if(istype(in_chamber, /obj/item/projectile/chameleon))
+			user.show_message(SPAN_WARNING("The gun fired but...you feel fine?"))
+			mouthshoot = FALSE
+			return
+
 		in_chamber.on_hit(M)
 		if (!in_chamber.is_halloss())
 			log_and_message_admins("[key_name(user)] commited suicide using \a [src]")
diff --git a/maps/__Nadezhda/area/_Nadezhda_areas.dm b/maps/__Nadezhda/area/_Nadezhda_areas.dm
index ffae2e5e490..ce083f69925 100644
--- a/maps/__Nadezhda/area/_Nadezhda_areas.dm
+++ b/maps/__Nadezhda/area/_Nadezhda_areas.dm
@@ -358,11 +358,13 @@
 /area/nadezhda/outside/forest/hunting_lodge
 	name = "Hunting Lodge"
 	icon_state = "forest"
+	is_maintenance = FALSE
 	is_dungeon_lootable = FALSE
 
 /area/nadezhda/outside/forest/hunting_lodge_dark
 	name = "Hunting Lodge"
 	icon_state = "erisblue"
+	is_maintenance = FALSE
 	dynamic_lighting = TRUE
 	is_dungeon_lootable = FALSE