merge conflict fix, reset map

code/modules/projectiles/ammunition/ammo_casings.dm

@@ -369,12 +369,13 @@
 	projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/riot
 	icon_state = "foamdart_riot"
 
-/obj/item/ammo_casing/shotgun/dart/assassination
-	desc = "A specialist shotgun dart designed to inncapacitate and kill the target over time, so you can get very far away from your target"
-
-/obj/item/ammo_casing/shotgun/dart/assassination/New()
-	..()
-	reagents.add_reagent("neurotoxin", 6)
+/obj/item/ammo_casing/shotgun/assassination
+	name = "assassination shell"
+	desc = "A specialist shrapnel shell that has been laced with a silencing toxin."
+	projectile_type = /obj/item/projectile/bullet/pellet/assassination
+	icon_state = "gshell"
+	pellets = 6
+	variance = 25
 
 /obj/item/ammo_casing/cap
 	desc = "A cap for children toys."

code/modules/projectiles/ammunition/magazines.dm

@@ -122,6 +122,9 @@
 	ammo_type = /obj/item/ammo_casing/shotgun/improvised
 	max_ammo = 1
 
+/obj/item/ammo_box/magazine/internal/shot/improvised/cane
+	ammo_type = /obj/item/ammo_casing/shotgun/assassination
+
 /obj/item/ammo_box/magazine/internal/shot/riot
 	name = "riot shotgun internal magazine"
 	ammo_type = /obj/item/ammo_casing/shotgun/rubbershot

code/modules/projectiles/guns/projectile/revolver.dm

@@ -417,7 +417,7 @@
 	can_unsuppress = 0
 	slot_flags = null
 	origin_tech = "" // NO GIVAWAYS
-	mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised/cane
 	sawn_desc = "I'm sorry, but why did you saw your cane in the first place?"
 	attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
 	fire_sound = 'sound/weapons/Gunshot_silenced.ogg'

code/modules/projectiles/projectile/bullets.dm

@@ -109,6 +109,15 @@
 	range = rand(1, 10)
 	..()
 
+/obj/item/projectile/bullet/pellet/assassination
+	damage = 12
+	tile_dropoff = 1	// slightly less damage and greater damage falloff compared to normal buckshot
+
+/obj/item/projectile/bullet/pellet/assassination/on_hit(atom/target, blocked = 0)
+	if(..(target, blocked))
+		var/mob/living/M = target
+		M.AdjustSilence(2)	// HELP MIME KILLING ME IN MAINT
+
 /obj/item/projectile/bullet/pellet/overload/on_hit(atom/target, blocked = 0)
  	..()
  	explosion(target, 0, 0, 2)