diff --git a/code/citadel/cit_guns.dm b/code/citadel/cit_guns.dm
index ae78d1d172..ec1caacdab 100644
--- a/code/citadel/cit_guns.dm
+++ b/code/citadel/cit_guns.dm
@@ -26,4 +26,38 @@
 	build_type = PROTOLATHE
 	materials = list(MAT_GOLD = 2500, MAT_METAL = 5000, MAT_GLASS = 5000)
 	build_path = /obj/item/gun/energy/laser/carbine/nopin
-	category = list("Weapons")
\ No newline at end of file
+	category = list("Weapons")
+
+/obj/item/gun/ballistic/automatic/pistol/antitank
+	name = "Anti Tank Pistol"
+	desc = "A massively impractical and silly monstrosity of a pistol that fires .50 calliber rounds. The recoil is likely to dislocate your wrist."
+	icon = 'icons/obj/guns/cit_guns.dmi'
+	icon_state = "atp"
+	item_state = "pistol"
+	recoil = 6
+	mag_type = /obj/item/ammo_box/magazine/sniper_rounds
+	fire_delay = 50
+	burst_size = 1
+	origin_tech = "combat=7"
+	can_suppress = 0
+	w_class = WEIGHT_CLASS_NORMAL
+	actions_types = list()
+	fire_sound = 'sound/weapons/blastcannon.ogg'
+	spread = 30		//damn thing has no rifling.
+
+
+/obj/item/gun/ballistic/automatic/pistol/antitank/update_icon()
+	..()
+	if(magazine)
+		cut_overlays()
+		add_overlay("atp-mag")
+	else
+		cut_overlays()
+	icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
+
+/obj/item/gun/ballistic/automatic/pistol/antitank/syndicate
+	name = "Syndicate Anti Tank Pistol"
+	desc = "A massively impractical and silly monstrosity of a pistol that fires .50 calliber rounds. The recoil is likely to dislocate a variety of joints without proper bracing."
+	pin = /obj/item/device/firing_pin/implant/pindicate
+	origin_tech = "combat=7;syndicate=6"
+
diff --git a/code/game/objects/items/dice.dm b/code/game/objects/items/dice.dm
index 771d322c34..7cf88e77ef 100644
--- a/code/game/objects/items/dice.dm
+++ b/code/game/objects/items/dice.dm
@@ -1,193 +1,192 @@
-/obj/item/storage/pill_bottle/dice
-	name = "bag of dice"
-	desc = "Contains all the luck you'll ever need."
-	icon = 'icons/obj/dice.dmi'
-	icon_state = "dicebag"
-
-/obj/item/storage/pill_bottle/dice/New()
-	..()
-	var/special_die = pick("1","2","fudge","space","00","8bd20","4dd6","100")
-	if(special_die == "1")
-		new /obj/item/dice/d1(src)
-	if(special_die == "2")
-		new /obj/item/dice/d2(src)
-	new /obj/item/dice/d4(src)
-	new /obj/item/dice/d6(src)
-	if(special_die == "fudge")
-		new /obj/item/dice/fudge(src)
-	if(special_die == "space")
-		new /obj/item/dice/d6/space(src)
-	new /obj/item/dice/d8(src)
-	new /obj/item/dice/d10(src)
-	if(special_die == "00")
-		new /obj/item/dice/d00(src)
-	new /obj/item/dice/d12(src)
-	new /obj/item/dice/d20(src)
-	if(special_die == "8bd20")
-		new /obj/item/dice/eightbd20(src)
-	if(special_die == "4dd6")
-		new /obj/item/dice/fourdd6(src)
-	if(special_die == "100")
-		new /obj/item/dice/d100(src)
-
-/obj/item/dice //depreciated d6, use /obj/item/dice/d6 if you actually want a d6
-	name = "die"
-	desc = "A die with six sides. Basic and servicable."
-	icon = 'icons/obj/dice.dmi'
-	icon_state = "d6"
-	w_class = WEIGHT_CLASS_TINY
-	var/sides = 6
-	var/result = null
-	var/list/special_faces = list() //entries should match up to sides var if used
-	var/can_be_rigged = TRUE
-	var/rigged = FALSE
-
-/obj/item/dice/New()
-	result = rand(1, sides)
-	update_icon()
-	..()
-
-/obj/item/dice/d1
-	name = "d1"
-	desc = "A die with one side. Deterministic!"
-	icon_state = "d1"
-	sides = 1
-
-/obj/item/dice/d2
-	name = "d2"
-	desc = "A die with two sides. Coins are undignified!"
-	icon_state = "d2"
-	sides = 2
-
-/obj/item/dice/d4
-	name = "d4"
-	desc = "A die with four sides. The nerd's caltrop."
-	icon_state = "d4"
-	sides = 4
-
-/obj/item/dice/d6
-	name = "d6"
-
-/obj/item/dice/d6/space
-	name = "space cube"
-	desc = "A die with six sides. 6 TIMES 255 TIMES 255 TILE TOTAL EXISTENCE, SQUARE YOUR MIND OF EDUCATED STUPID: 2 DOES NOT EXIST."
-	icon_state = "spaced6"
-
-/obj/item/dice/d6/space/New()
-	..()
-	if(prob(10))
-		name = "spess cube"
-
-/obj/item/dice/fudge
-	name = "fudge die"
-	desc = "A die with six sides but only three results. Is this a plus or a minus? Your mind is drawing a blank..."
-	sides = 3 //shhh
-	icon_state = "fudge"
-	special_faces = list("minus","blank","plus")
-
-/obj/item/dice/d8
-	name = "d8"
-	desc = "A die with eight sides. It feels... lucky."
-	icon_state = "d8"
-	sides = 8
-
-/obj/item/dice/d10
-	name = "d10"
-	desc = "A die with ten sides. Useful for percentages."
-	icon_state = "d10"
-	sides = 10
-
-/obj/item/dice/d00
-	name = "d00"
-	desc = "A die with ten sides. Works better for d100 rolls than a golfball."
-	icon_state = "d00"
-	sides = 10
-
-/obj/item/dice/d12
-	name = "d12"
-	desc = "A die with twelve sides. There's an air of neglect about it."
-	icon_state = "d12"
-	sides = 12
-
-/obj/item/dice/d20
-	name = "d20"
-	desc = "A die with twenty sides. The prefered die to throw at the GM."
-	icon_state = "d20"
-	sides = 20
-
-/obj/item/dice/d100
-	name = "d100"
-	desc = "A die with one hundred sides! Probably not fairly weighted..."
-	icon_state = "d100"
-	sides = 100
-
-/obj/item/dice/d100/update_icon()
-	return
-
-/obj/item/dice/eightbd20
-	name = "strange d20"
-	desc = "A weird die with raised text printed on the faces. Everything's white on white so reading it is a struggle. What poor design!"
-	icon_state = "8bd20"
-	sides = 20
-	special_faces = list("It is certain","It is decidedly so","Without a doubt","Yes, definitely","You may rely on it","As I see it, yes","Most likely","Outlook good","Yes","Signs point to yes","Reply hazy try again","Ask again later","Better not tell you now","Cannot predict now","Concentrate and ask again","Don't count on it","My reply is no","My sources say no","Outlook not so good","Very doubtful")
-
-/obj/item/dice/eightbd20/update_icon()
-	return
-
-/obj/item/dice/fourdd6
-	name = "4d d6"
-	desc = "A die that exists in four dimensional space. Properly interpreting them can only be properly done with the help of a mathematician, a physicist, and a priest."
-	icon_state = "4dd6"
-	sides = 48
-	special_faces = list("Cube-Side: 1-1","Cube-Side: 1-2","Cube-Side: 1-3","Cube-Side: 1-4","Cube-Side: 1-5","Cube-Side: 1-6","Cube-Side: 2-1","Cube-Side: 2-2","Cube-Side: 2-3","Cube-Side: 2-4","Cube-Side: 2-5","Cube-Side: 2-6","Cube-Side: 3-1","Cube-Side: 3-2","Cube-Side: 3-3","Cube-Side: 3-4","Cube-Side: 3-5","Cube-Side: 3-6","Cube-Side: 4-1","Cube-Side: 4-2","Cube-Side: 4-3","Cube-Side: 4-4","Cube-Side: 4-5","Cube-Side: 4-6","Cube-Side: 5-1","Cube-Side: 5-2","Cube-Side: 5-3","Cube-Side: 5-4","Cube-Side: 5-5","Cube-Side: 5-6","Cube-Side: 6-1","Cube-Side: 6-2","Cube-Side: 6-3","Cube-Side: 6-4","Cube-Side: 6-5","Cube-Side: 6-6","Cube-Side: 7-1","Cube-Side: 7-2","Cube-Side: 7-3","Cube-Side: 7-4","Cube-Side: 7-5","Cube-Side: 7-6","Cube-Side: 8-1","Cube-Side: 8-2","Cube-Side: 8-3","Cube-Side: 8-4","Cube-Side: 8-5","Cube-Side: 8-6")
-
-/obj/item/dice/fourdd6/update_icon()
-	return
-
-/obj/item/dice/attack_self(mob/user)
-	diceroll(user)
-
-/obj/item/dice/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback)
-	if(!..())
-		return
-	diceroll(thrower)
-
-/obj/item/dice/proc/diceroll(mob/user)
-	result = rand(1, sides)
-	if(rigged && result != rigged)
-		if(prob(Clamp(1/(sides - 1) * 100, 25, 80)))
-			result = rigged
-	var/fake_result = rand(1, sides)//Daredevil isn't as good as he used to be
-	var/comment = ""
-	if(sides == 20 && result == 20)
-		comment = "Nat 20!"
-	else if(sides == 20 && result == 1)
-		comment = "Ouch, bad luck."
-	update_icon()
-	if(initial(icon_state) == "d00")
-		result = (result - 1)*10
-	if(special_faces.len == sides)
-		result = special_faces[result]
-	if(user != null) //Dice was rolled in someone's hand
-		user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \
-							 "<span class='notice'>You throw [src]. It lands on [result]. [comment]</span>", \
-							 "<span class='italics'>You hear [src] rolling, it sounds like a [fake_result].</span>")
-	else if(!src.throwing) //Dice was thrown and is coming to rest
-		visible_message("<span class='notice'>[src] rolls to a stop, landing on [result]. [comment]</span>")
-
-/obj/item/dice/d4/Crossed(mob/living/carbon/human/H)
-	if(istype(H) && !H.shoes)
-		if(PIERCEIMMUNE in H.dna.species.species_traits)
-			return 0
-		to_chat(H, "<span class='userdanger'>You step on the D4!</span>")
-		H.apply_damage(4,BRUTE,(pick("l_leg", "r_leg")))
-		H.Knockdown(60)
-
-/obj/item/dice/update_icon()
-	cut_overlays()
-	add_overlay("[src.icon_state][src.result]")
-
-/obj/item/dice/microwave_act(obj/machinery/microwave/M)
-	if(can_be_rigged)
-		rigged = result
-	..(M)
+/obj/item/storage/pill_bottle/dice
+	name = "bag of dice"
+	desc = "Contains all the luck you'll ever need."
+	icon = 'icons/obj/dice.dmi'
+	icon_state = "dicebag"
+
+/obj/item/storage/pill_bottle/dice/New()
+	..()
+	var/special_die = pick("1","2","fudge","space","00","8bd20","4dd6","100")
+	if(special_die == "1")
+		new /obj/item/dice/d1(src)
+	if(special_die == "2")
+		new /obj/item/dice/d2(src)
+	new /obj/item/dice/d4(src)
+	new /obj/item/dice/d6(src)
+	if(special_die == "fudge")
+		new /obj/item/dice/fudge(src)
+	if(special_die == "space")
+		new /obj/item/dice/d6/space(src)
+	new /obj/item/dice/d8(src)
+	new /obj/item/dice/d10(src)
+	if(special_die == "00")
+		new /obj/item/dice/d00(src)
+	new /obj/item/dice/d12(src)
+	new /obj/item/dice/d20(src)
+	if(special_die == "8bd20")
+		new /obj/item/dice/eightbd20(src)
+	if(special_die == "4dd6")
+		new /obj/item/dice/fourdd6(src)
+	if(special_die == "100")
+		new /obj/item/dice/d100(src)
+
+/obj/item/dice //depreciated d6, use /obj/item/dice/d6 if you actually want a d6
+	name = "die"
+	desc = "A die with six sides. Basic and servicable."
+	icon = 'icons/obj/dice.dmi'
+	icon_state = "d6"
+	w_class = WEIGHT_CLASS_TINY
+	var/sides = 6
+	var/result = null
+	var/list/special_faces = list() //entries should match up to sides var if used
+	var/can_be_rigged = TRUE
+	var/rigged = FALSE
+
+/obj/item/dice/New()
+	result = rand(1, sides)
+	update_icon()
+	..()
+
+/obj/item/dice/d1
+	name = "d1"
+	desc = "A die with one side. Deterministic!"
+	icon_state = "d1"
+	sides = 1
+
+/obj/item/dice/d2
+	name = "d2"
+	desc = "A die with two sides. Coins are undignified!"
+	icon_state = "d2"
+	sides = 2
+
+/obj/item/dice/d4
+	name = "d4"
+	desc = "A die with four sides. The nerd's caltrop."
+	icon_state = "d4"
+	sides = 4
+
+/obj/item/dice/d6
+	name = "d6"
+
+/obj/item/dice/d6/space
+	name = "space cube"
+	desc = "A die with six sides. 6 TIMES 255 TIMES 255 TILE TOTAL EXISTENCE, SQUARE YOUR MIND OF EDUCATED STUPID: 2 DOES NOT EXIST."
+	icon_state = "spaced6"
+
+/obj/item/dice/d6/space/New()
+	..()
+	if(prob(10))
+		name = "spess cube"
+
+/obj/item/dice/fudge
+	name = "fudge die"
+	desc = "A die with six sides but only three results. Is this a plus or a minus? Your mind is drawing a blank..."
+	sides = 3 //shhh
+	icon_state = "fudge"
+	special_faces = list("minus","blank","plus")
+
+/obj/item/dice/d8
+	name = "d8"
+	desc = "A die with eight sides. It feels... lucky."
+	icon_state = "d8"
+	sides = 8
+
+/obj/item/dice/d10
+	name = "d10"
+	desc = "A die with ten sides. Useful for percentages."
+	icon_state = "d10"
+	sides = 10
+
+/obj/item/dice/d00
+	name = "d00"
+	desc = "A die with ten sides. Works better for d100 rolls than a golfball."
+	icon_state = "d00"
+	sides = 10
+
+/obj/item/dice/d12
+	name = "d12"
+	desc = "A die with twelve sides. There's an air of neglect about it."
+	icon_state = "d12"
+	sides = 12
+
+/obj/item/dice/d20
+	name = "d20"
+	desc = "A die with twenty sides. The prefered die to throw at the GM."
+	icon_state = "d20"
+	sides = 20
+
+/obj/item/dice/d100
+	name = "d100"
+	desc = "A die with one hundred sides! Probably not fairly weighted..."
+	icon_state = "d100"
+	sides = 100
+
+/obj/item/dice/d100/update_icon()
+	return
+
+/obj/item/dice/eightbd20
+	name = "strange d20"
+	desc = "A weird die with raised text printed on the faces. Everything's white on white so reading it is a struggle. What poor design!"
+	icon_state = "8bd20"
+	sides = 20
+	special_faces = list("It is certain","It is decidedly so","Without a doubt","Yes, definitely","You may rely on it","As I see it, yes","Most likely","Outlook good","Yes","Signs point to yes","Reply hazy try again","Ask again later","Better not tell you now","Cannot predict now","Concentrate and ask again","Don't count on it","My reply is no","My sources say no","Outlook not so good","Very doubtful")
+
+/obj/item/dice/eightbd20/update_icon()
+	return
+
+/obj/item/dice/fourdd6
+	name = "4d d6"
+	desc = "A die that exists in four dimensional space. Properly interpreting them can only be properly done with the help of a mathematician, a physicist, and a priest."
+	icon_state = "4dd6"
+	sides = 48
+	special_faces = list("Cube-Side: 1-1","Cube-Side: 1-2","Cube-Side: 1-3","Cube-Side: 1-4","Cube-Side: 1-5","Cube-Side: 1-6","Cube-Side: 2-1","Cube-Side: 2-2","Cube-Side: 2-3","Cube-Side: 2-4","Cube-Side: 2-5","Cube-Side: 2-6","Cube-Side: 3-1","Cube-Side: 3-2","Cube-Side: 3-3","Cube-Side: 3-4","Cube-Side: 3-5","Cube-Side: 3-6","Cube-Side: 4-1","Cube-Side: 4-2","Cube-Side: 4-3","Cube-Side: 4-4","Cube-Side: 4-5","Cube-Side: 4-6","Cube-Side: 5-1","Cube-Side: 5-2","Cube-Side: 5-3","Cube-Side: 5-4","Cube-Side: 5-5","Cube-Side: 5-6","Cube-Side: 6-1","Cube-Side: 6-2","Cube-Side: 6-3","Cube-Side: 6-4","Cube-Side: 6-5","Cube-Side: 6-6","Cube-Side: 7-1","Cube-Side: 7-2","Cube-Side: 7-3","Cube-Side: 7-4","Cube-Side: 7-5","Cube-Side: 7-6","Cube-Side: 8-1","Cube-Side: 8-2","Cube-Side: 8-3","Cube-Side: 8-4","Cube-Side: 8-5","Cube-Side: 8-6")
+
+/obj/item/dice/fourdd6/update_icon()
+	return
+
+/obj/item/dice/attack_self(mob/user)
+	diceroll(user)
+
+/obj/item/dice/throw_impact(atom/target)
+	diceroll(thrownby)
+	. = ..()
+
+/obj/item/dice/proc/diceroll(mob/user)
+	result = rand(1, sides)
+	if(rigged && result != rigged)
+		if(prob(Clamp(1/(sides - 1) * 100, 25, 80)))
+			result = rigged
+	var/fake_result = rand(1, sides)//Daredevil isn't as good as he used to be
+	var/comment = ""
+	if(sides == 20 && result == 20)
+		comment = "Nat 20!"
+	else if(sides == 20 && result == 1)
+		comment = "Ouch, bad luck."
+	update_icon()
+	if(initial(icon_state) == "d00")
+		result = (result - 1)*10
+	if(special_faces.len == sides)
+		result = special_faces[result]
+	if(user != null) //Dice was rolled in someone's hand
+		user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \
+							 "<span class='notice'>You throw [src]. It lands on [result]. [comment]</span>", \
+							 "<span class='italics'>You hear [src] rolling, it sounds like a [fake_result].</span>")
+	else if(!src.throwing) //Dice was thrown and is coming to rest
+		visible_message("<span class='notice'>[src] rolls to a stop, landing on [result]. [comment]</span>")
+
+/obj/item/dice/d4/Crossed(mob/living/carbon/human/H)
+	if(istype(H) && !H.shoes)
+		if(PIERCEIMMUNE in H.dna.species.species_traits)
+			return 0
+		to_chat(H, "<span class='userdanger'>You step on the D4!</span>")
+		H.apply_damage(4,BRUTE,(pick("l_leg", "r_leg")))
+		H.Knockdown(60)
+
+/obj/item/dice/update_icon()
+	cut_overlays()
+	add_overlay("[src.icon_state][src.result]")
+
+/obj/item/dice/microwave_act(obj/machinery/microwave/M)
+	if(can_be_rigged)
+		rigged = result
+	..(M)
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index bbea363919..dc4ffe37b6 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -96,7 +96,10 @@ FLOOR SAFES
 	if(!ishuman(usr))
 		return
 	var/mob/living/carbon/human/user = usr
-
+	
+	if(!user.canUseTopic(src))
+		return
+	
 	var/canhear = 0
 	if(user.is_holding_item_of_type(/obj/item/clothing/neck/stethoscope))
 		canhear = 1
diff --git a/code/modules/uplink/uplink_item_cit.dm b/code/modules/uplink/uplink_item_cit.dm
index 68000d6d5c..c9bb091303 100644
--- a/code/modules/uplink/uplink_item_cit.dm
+++ b/code/modules/uplink/uplink_item_cit.dm
@@ -28,3 +28,15 @@
 /obj/item/storage/box/syndie_kit/holoparasite/PopulateContents()
 	new /obj/item/guardiancreator/tech/choose/traitor(src)
 	new /obj/item/paper/guides/antag/guardian(src)
+
+/datum/uplink_item/dangerous/antitank
+	name = "Anti Tank Pistol"
+	desc = "Essentially amounting to a sniper rifle with no stock and barrel (or indeed, any rifling at all),\
+			this extremely dubious pistol is guaranteed to dislocate your wrists and hit the broad side of a barn!\
+	 		Uses sniper ammo.\
+	 		Bullets tend to veer off-course. We are not responsible for any unintentional damage or injury resulting from inaacuracy."
+	item = /obj/item/gun/ballistic/automatic/pistol/antitank/syndicate
+	refundable = TRUE
+	cost = 14
+	surplus = 25
+	include_modes = list(/datum/game_mode/nuclear)
diff --git a/html/changelogs/AutoChangeLog-pr-2801.yml b/html/changelogs/AutoChangeLog-pr-2801.yml
new file mode 100644
index 0000000000..b1f3f740f7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2801.yml
@@ -0,0 +1,4 @@
+author: "Robustin"
+delete-after: True
+changes: 
+  - bugfix: "Dice will now roll when thrown"
diff --git a/html/changelogs/AutoChangeLog-pr-2817.yml b/html/changelogs/AutoChangeLog-pr-2817.yml
new file mode 100644
index 0000000000..9c545c3100
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2817.yml
@@ -0,0 +1,8 @@
+author: "Toriate"
+delete-after: True
+changes: 
+  - rscadd: "Adds the Anti Tank Pistol"
+  - bugfix: "Anti Tank Pistol now chambers bullets properly."
+  - tweak: "sprites are slightly adjusted and the magazine in the sprites is actually the sniper's magazine."
+  - rscadd: "Anti Tank pistol is now available to Nuke Ops"
+  - tweak: "Anti Tank Pistol now has 3 times the recoil of the Sniper Rifle, 10 more firing delay, and has bullet spread."
diff --git a/icons/obj/guns/cit_guns.dmi b/icons/obj/guns/cit_guns.dmi
index e1b2e8ac1a..b5a2ae8fdc 100644
Binary files a/icons/obj/guns/cit_guns.dmi and b/icons/obj/guns/cit_guns.dmi differ